[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Stretch manual from the wiki.

Holger Levsen holger at layer-acht.org
Fri May 26 10:55:23 UTC 2017


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 310682efbac829ec546287612f2756e18262fe8c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri May 26 12:55:14 2017 +0200

    Update Debian Edu Stretch manual from the wiki.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../debian-edu-stretch-manual.da.po                |  27 +-
 .../debian-edu-stretch-manual.de.po                |  31 +-
 .../debian-edu-stretch-manual.es.po                |  27 +-
 .../debian-edu-stretch-manual.fi.po                |  13 +-
 .../debian-edu-stretch-manual.fr.po                |  27 +-
 .../debian-edu-stretch-manual.it.po                |  27 +-
 .../debian-edu-stretch-manual.ja.po                |  21 +-
 .../debian-edu-stretch-manual.nb.po                | 359 ++++++++++-----------
 .../debian-edu-stretch-manual.nl.po                |  27 +-
 .../debian-edu-stretch-manual.pl.po                |  13 +-
 .../debian-edu-stretch-manual.pot                  |  13 +-
 .../debian-edu-stretch-manual.xml                  |   4 +-
 .../debian-edu-stretch-manual.zh.po                |  41 ++-
 13 files changed, 403 insertions(+), 227 deletions(-)

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 d30508b..f4b15e3 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-stretch-manual\n"
-"POT-Creation-Date: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+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"
@@ -1698,11 +1698,17 @@ msgid "Request a CD / DVD by mail"
 msgstr "Anmod om en cd/dvd via postvæsenet"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For those without a fast Internet connection, we can offer a CD or DVD "
+#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
+#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
+#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 "For brugere uden en hurtig internetforbindelse så kan vi tilbyde en cd eller "
 "dvd sendt via postvæsenet for prisen for forsendelse af en cd eller dvd samt "
@@ -9668,10 +9674,15 @@ msgstr ""
 "Klik på »O.k.«"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After the reboot, when you login the first time, click on the \"Options "
+#| ">>\" button and select the domain SKOLELINUX instead of the local "
+#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 "Efter genstarten, når du logger ind første gang, så klik på knappen for "
 "»Indstillinger >>« og vælg domænet SKOLELINUX i stedet for det lokale "
@@ -9738,6 +9749,16 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr "på siden for Systemegenskaber, klik på »Ændr ...«"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+"Efter genstarten, når du logger ind første gang, så klik på knappen for "
+"»Indstillinger >>« og vælg domænet SKOLELINUX i stedet for det lokale "
+"domæne (»denne computer«)"
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr "Første domænelogind"
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 0f2dd85..d28351d 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-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+0000\n"
 "PO-Revision-Date: 2017-05-24 23:33+0200\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1602,11 +1602,17 @@ msgid "Request a CD / DVD by mail"
 msgstr "Anforderung einer CD / DVD auf dem Postweg"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For those without a fast Internet connection, we can offer a CD or DVD "
+#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
+#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
+#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 "Für alle ohne eine schnelle Internetverbindung wird eine CD/DVD zum "
 "Selbstkostenpreis (CD/DVD + Transport) angeboten. Senden Sie einfach eine E-"
@@ -8985,10 +8991,15 @@ msgstr ""
 "Klicken Sie auf »OK«."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After the reboot, when you login the first time, click on the \"Options "
+#| ">>\" button and select the domain SKOLELINUX instead of the local "
+#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 "Wenn Sie sich nach dem Neustart erstmals anmelden, klicken Sie auf den "
 "Button »Optionen >>« und wählen Sie die Domäne SKOLELINUX statt der lokalen "
@@ -9056,6 +9067,16 @@ msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 "klicken Sie auf der Seite mit den Systemeigenschaften auf »Ändern...«. "
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+"Wenn Sie sich nach dem Neustart erstmals anmelden, klicken Sie auf den "
+"Button »Optionen >>« und wählen Sie die Domäne SKOLELINUX statt der lokalen "
+"Domäne (»dieser Computer«)"
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr "Erste Anmeldung an der Domäne"
@@ -10428,8 +10449,8 @@ msgstr ""
 "translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
 "Sprache anlegen und wie Übersetzungen aktualisiert werden."
 
-#. <remark>
-#. status ignore</remark>
+#.  <remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
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 c4f3e52..224d8cc 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: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+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"
@@ -1751,11 +1751,17 @@ msgid "Request a CD / DVD by mail"
 msgstr "Solicite un CD / DVD por correo"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For those without a fast Internet connection, we can offer a CD or DVD "
+#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
+#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
+#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 "Para quienes que no poseen una conexión a Internet rápida, nosotros "
 "podríamos enviarle un CD o DVD por el precio del mismo y su envío. Solamente "
@@ -8345,10 +8351,15 @@ msgstr ""
 "Haga clic en \"OK\"."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After the reboot, when you login the first time, click on the \"Options "
+#| ">>\" button and select the domain SKOLELINUX instead of the local "
+#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 "Después del reinicio, cuando ingresa por primera vez, haga clic en el botón "
 "\"Opciones >>\" y seleccione el dominio SKOLELINUX en lugar del "
@@ -8412,6 +8423,16 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+"Después del reinicio, cuando ingresa por primera vez, haga clic en el botón "
+"\"Opciones >>\" y seleccione el dominio SKOLELINUX en lugar del "
+"dominio local (\"esta computadora\"). "
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
index 38372ab..3cd985a 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+0000\n"
 "PO-Revision-Date: 2017-04-17 06:21+0000\n"
 "Last-Translator: ekeimaja <ekeimaja at gmail.com>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/debian-edu-"
@@ -1175,7 +1175,7 @@ msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6483,7 +6483,7 @@ msgstr ""
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6532,6 +6532,13 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr ""
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 2232cc8..49bb881 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: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+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"
@@ -1795,11 +1795,17 @@ msgid "Request a CD / DVD by mail"
 msgstr "Demande d'un CD ou DVD par courrier"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For those without a fast Internet connection, we can offer a CD or DVD "
+#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
+#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
+#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 "Nous proposons d'envoyer un CD ou un DVD à ceux qui ne disposent pas d'une "
 "connexion rapide à Internet pour le coût du support et de l'envoi. Envoyez "
@@ -10035,10 +10041,15 @@ msgstr ""
 "pour que les changements soient pris en compte. Appuyez sur « Ok »."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After the reboot, when you login the first time, click on the \"Options "
+#| ">>\" button and select the domain SKOLELINUX instead of the local "
+#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 "Après le redémarrage, lorsque vous vous connectez pour la première fois, "
 "cliquez sur le bouton « Options >> » et sélectionnez le domaine "
@@ -10107,6 +10118,16 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr "Sur la page « Propriétés système », cliquez sur « Modifier... »."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+"Après le redémarrage, lorsque vous vous connectez pour la première fois, "
+"cliquez sur le bouton « Options >> » et sélectionnez le domaine "
+"SKOLELINUX au lieu du domaine local (« cet ordinateur »)."
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr "Première connexion au domaine"
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 743bbea..8ad2a3f 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: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+0000\n"
 "PO-Revision-Date: 2017-05-15 20:10+0100\n"
 "Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1572,11 +1572,17 @@ msgid "Request a CD / DVD by mail"
 msgstr "Richiedere un CD/DVD per posta"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For those without a fast Internet connection, we can offer a CD or DVD "
+#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
+#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
+#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 "Per tutti quelli che non hanno una connessione veloce a Internet, possiamo "
 "inviare un CD o un DVD al costo del CD o DVD e della spedizione. Occorre "
@@ -8854,10 +8860,15 @@ msgstr ""
 "su \"OK\""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After the reboot, when you login the first time, click on the \"Options "
+#| ">>\" button and select the domain SKOLELINUX instead of the local "
+#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 "Dopo il riavvio, quando si fa il login per la prima volta, fare clic sul "
 "pulsante \"Opzioni >>\" e selezionare il dominio SKOLELINUX al posto "
@@ -8925,6 +8936,16 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr "nella pagina delle Proprietà del sistema, fare clic su \"Cambia...\""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+"Dopo il riavvio, quando si fa il login per la prima volta, fare clic sul "
+"pulsante \"Opzioni >>\" e selezionare il dominio SKOLELINUX al posto "
+"del dominio locale (\"questo computer\")"
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr "Primo accesso al dominio"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index eb6037c..ff04d5d 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+0000\n"
 "PO-Revision-Date: 2017-02-24 06:55+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -1525,7 +1525,7 @@ msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -8533,10 +8533,15 @@ msgstr ""
 "出てきます。「OK」をクリックします"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After the reboot, when you login the first time, click on the \"Options "
+#| ">>\" button and select the domain SKOLELINUX instead of the local "
+#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 "再起動後の初回ログイン時に「オプション >>」ボタンをクリックし、「ログオ"
 "ン先」にローカルドメイン (「このコンピュータ」) ではなく SKOLELINUX ドメイン"
@@ -8602,6 +8607,16 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr "「システムのプロパティ」のページで「変更(C)...」をクリックします"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+"再起動後の初回ログイン時に「オプション >>」ボタンをクリックし、「ログオ"
+"ン先」にローカルドメイン (「このコンピュータ」) ではなく SKOLELINUX ドメイン"
+"を選択します"
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr "ドメインへの最初のログオン"
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 3ce07cc..1fc6ae0 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: 2017-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+0000\n"
 "PO-Revision-Date: 2017-05-25 23:02+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -1568,11 +1568,17 @@ msgid "Request a CD / DVD by mail"
 msgstr "Be om en CD/DVD i posten"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For those without a fast Internet connection, we can offer a CD or DVD "
+#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
+#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
+#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 "For dem uten en rask Internett-tilkopling tilbyr vi å sende deg en CD eller "
 "DVD for kostnaden av CD-en eller DVD-en + porto. Det er bare å sende en e-"
@@ -4646,8 +4652,8 @@ msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press <"
 "return> to scroll down, <q> to leave the pager."
 msgstr ""
-"apt-list-changes: Vær forberedt på å lese mange NYHETER; press <return>"
-" for å rulle nedover, <q> for å forlate sideskifteren."
+"apt-list-changes: Vær forberedt på å lese mange NYHETER; press <"
+"return> for å rulle nedover, <q> for å forlate sideskifteren."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "You will see some prompts about package configurations:"
@@ -4681,8 +4687,8 @@ msgid ""
 "Configuring icinga-common: Use external commands with Icinga: Choose <"
 "Yes>."
 msgstr ""
-"Å konfigurere icinga-common: Bruk eksterne kommandoer med Icinga: Velg "
-"<Yes>."
+"Å konfigurere icinga-common: Bruk eksterne kommandoer med Icinga: Velg <"
+"Yes>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -4777,8 +4783,7 @@ msgid ""
 msgstr ""
 "apt update\n"
 "apt install education-networked-common\n"
-"apt install education-ltsp-server      # Bare hvis profilen 'LTSP-Server' er "
-"installert."
+"apt install education-ltsp-server      # Bare hvis profilen 'LTSP-Server' er installert."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Stretch artwork:"
@@ -4802,8 +4807,7 @@ msgid ""
 "rm -rm /etc/php5"
 msgstr ""
 "apt purge linux-image-3.16.0-4-amd64 \n"
-"apt purge debian-edu-artwork-lines     # Bare hvis ikke ønsket som et "
-"alternativt tema.\n"
+"apt purge debian-edu-artwork-lines     # Bare hvis ikke ønsket som et alternativt tema.\n"
 "dpkg -P php5-imagick\n"
 "rm -rm /etc/php5"
 
@@ -4897,8 +4901,8 @@ msgid ""
 "(NBD). The NBD image file size is about 4 GiB (default installation). If the "
 "image is updated, another 4 GiB for a temporary file are needed."
 msgstr ""
-"Kontroller at du har nok diskplass. LTSP bruker nå Network Block Device (NBD)"
-". NBD-bildefilen er på ca. 4 GiB (standardinstallasjon). Hvis bildet "
+"Kontroller at du har nok diskplass. LTSP bruker nå Network Block Device "
+"(NBD). NBD-bildefilen er på ca. 4 GiB (standardinstallasjon). Hvis bildet "
 "oppdateres, kreves i tillegg 4 GiB til en midlertidig fil."
 
 #. type: CDATA
@@ -4969,8 +4973,8 @@ msgid ""
 "computeroutput>."
 msgstr ""
 "For å spare diskplass, <computeroutput>ltsp-update-image -n</computeroutput> "
-"kan brukes i stedet, se  <computeroutput>man ltsp-update-"
-"image</computeroutput>."
+"kan brukes i stedet, se  <computeroutput>man ltsp-update-image</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
@@ -5001,8 +5005,8 @@ msgid ""
 "computeroutput>) as root."
 msgstr ""
 "Gjenopprett chrooten ved å kjøre <computeroutput>debian-edu-ltsp --arch "
-"i386</computeroutput> (eller <computeroutput>debian-edu-ltsp --arch "
-"amd64</computeroutput>) som rot."
+"i386</computeroutput> (eller <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) som rot."
 
 #. type: Content of: <article><section><section><title>
 msgid ""
@@ -5021,11 +5025,10 @@ msgid ""
 msgstr ""
 "For å oppgradere fra en eldre utgivelse må du først oppgradere til Jessie-"
 "baserte Debian Edu-utgivelsen før du kan følge instruksjonene ovenfor. "
-"Instruksjonene er gitt i <ulink url=\""
-"https://wiki.debian.org/DebianEdu/Documentation/Jessie#\">Manualen for "
-"Debian Edu Jessie</ulink> om hvordan du oppgraderer til Jessie fra den "
-"tidligere Wheezy. På samme  måte beskriver Wheezy-håndboken hvordan man "
-"oppgraderer fra Squeeze."
+"Instruksjonene er gitt i <ulink url=\"https://wiki.debian.org/DebianEdu/"
+"Documentation/Jessie#\">Manualen for Debian Edu Jessie</ulink> om hvordan du "
+"oppgraderer til Jessie fra den tidligere Wheezy. På samme  måte beskriver "
+"Wheezy-håndboken hvordan man oppgraderer fra Squeeze."
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -5036,8 +5039,8 @@ msgstr "Veiledning"
 msgid ""
 "HowTos for <link linkend=\"Administration\">general administration</link>"
 msgstr ""
-"Veiledninger for <link linkend=\"Administration\">generell "
-"administrasjon</link>"
+"Veiledninger for <link linkend=\"Administration\">generell administrasjon</"
+"link>"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 msgid ""
@@ -5230,10 +5233,10 @@ msgid ""
 "very large one."
 msgstr ""
 "Det er en god idé å unngå å lage svært store partisjoner (med over, for "
-"eksempel. 20 GiB), fordi tiden det tar å kjøre "
-"<computeroutput>fsck</computeroutput> på dem, eller å gjenskape dem fra "
-"sikkerhetskopier hvis dette skulle bli nødvendig. Det er bedre, hvis mulig, "
-"å lage flere mindre partisjoner enn en svært stor en."
+"eksempel. 20 GiB), fordi tiden det tar å kjøre <computeroutput>fsck</"
+"computeroutput> på dem, eller å gjenskape dem fra sikkerhetskopier hvis "
+"dette skulle bli nødvendig. Det er bedre, hvis mulig, å lage flere mindre "
+"partisjoner enn en svært stor en."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5250,14 +5253,13 @@ msgid ""
 msgstr ""
 "For å gjøre det enklere å utvide fulle partisjoner så finnes skriptet "
 "<computeroutput>debian-edu-fsautoresiz</computeroutput>. Når det blir kjørt, "
-"leser det oppsettet fra <computeroutput>/usr/share/debian-edu-"
-"config/fsautoresizetab</computeroutput>, "
-"<computeroutput>/site/etc/fsautoresizetab</computeroutput> og "
-"<computeroutput>/etc/fsautoresizetab</computeroutput>. Basert på reglene i "
-"disse filene foreslår det utvidelse av partisjoner med for lite ledig plass. "
-"Uten argument, så vil det bare skrive ut kommandoene som trengs for å utvide "
-"filsystemet. Argumentet <computeroutput>-n</computeroutput> trengs for "
-"faktisk å utvide filsystemet."
+"leser det oppsettet fra <computeroutput>/usr/share/debian-edu-config/"
+"fsautoresizetab</computeroutput>, <computeroutput>/site/etc/fsautoresizetab</"
+"computeroutput> og <computeroutput>/etc/fsautoresizetab</computeroutput>. "
+"Basert på reglene i disse filene foreslår det utvidelse av partisjoner med "
+"for lite ledig plass. Uten argument, så vil det bare skrive ut kommandoene "
+"som trengs for å utvide filsystemet. Argumentet <computeroutput>-n</"
+"computeroutput> trengs for faktisk å utvide filsystemet."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5385,9 +5387,9 @@ msgid ""
 "a vi clone as editor."
 msgstr ""
 "Merk: <computeroutput>ldapvi</computeroutput> vil bruke det som måtte være "
-"standard editor (standardredigeringsprogram). Ved å kjøre <computeroutput>"
-"export EDITOR=vim</computeroutput> i skallets kommandolinje kan man "
-"konfigurere miljøet for å få en vi-klone som editor."
+"standard editor (standardredigeringsprogram). Ved å kjøre "
+"<computeroutput>export EDITOR=vim</computeroutput> i skallets kommandolinje "
+"kan man konfigurere miljøet for å få en vi-klone som editor."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5527,8 +5529,8 @@ msgid ""
 "command will install a backported version of <emphasis>tuxtype</emphasis>:"
 msgstr ""
 "Så kan man lett installere tilbakeførte pakker (backports). Den følgende "
-"kommando vil installere en tilbakeflyttet versjon av "
-"<emphasis>tuxtype</emphasis>:"
+"kommando vil installere en tilbakeflyttet versjon av <emphasis>tuxtype</"
+"emphasis>:"
 
 #. type: CDATA
 #, no-wrap
@@ -5744,17 +5746,17 @@ msgid ""
 "fail to pass on packets to clients that are missing in the ARP table on the "
 "switch, and this blocks the WOL packets."
 msgstr ""
-"På klienter som skal slås av om natten, trykker du på:  <computeroutput>/etc"
-"/shutdown-at-night/shut down-at-night</computeroutput>, eller legger til "
-"vertsnavnet (det vil si resultatet av «<computeroutput>uname "
-"-n</computeroutput>» på tjeneren) til nettgruppen  «shutdown-at-night-hosts»"
-". Å legge til verter til nettgruppen i LDAP kan gjøres med å bruke "
-"nettverktøyet <computeroutput>GOsa²</computeroutput>. Klientene trenger "
-"kanskje å ha Wake-on-Lan satt opp i BIOS. Det er også viktig at svitsjer og "
-"rutere som brukes mellom Wake-on-Lan-tjener og klienter vil la WoL-pakker "
-"passere til klientene, selv om klientene er slått av. Noen svitsjer klarer "
-"ikke å sende pakker videre til klienter som mangler i ARP-tabellen i "
-"vekslere, og det blokkerer WoL-pakker."
+"På klienter som skal slås av om natten, trykker du på:  <computeroutput>/etc/"
+"shutdown-at-night/shut down-at-night</computeroutput>, eller legger til "
+"vertsnavnet (det vil si resultatet av «<computeroutput>uname -n</"
+"computeroutput>» på tjeneren) til nettgruppen  «shutdown-at-night-hosts». Å "
+"legge til verter til nettgruppen i LDAP kan gjøres med å bruke nettverktøyet "
+"<computeroutput>GOsa²</computeroutput>. Klientene trenger kanskje å ha Wake-"
+"on-Lan satt opp i BIOS. Det er også viktig at svitsjer og rutere som brukes "
+"mellom Wake-on-Lan-tjener og klienter vil la WoL-pakker passere til "
+"klientene, selv om klientene er slått av. Noen svitsjer klarer ikke å sende "
+"pakker videre til klienter som mangler i ARP-tabellen i vekslere, og det "
+"blokkerer WoL-pakker."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5849,10 +5851,10 @@ msgid ""
 "network, but which doesn't have any services running (yet)."
 msgstr ""
 "I standardinstallasjonen kjøres alle tjenestene på hovedtjeneren; «tjener». "
-"For å forenkle flytting til en annen maskin er det en "
-"<emphasis>minimal</emphasis> installasjonsprofil tilgjengelig. Installasjon "
-"av denne profilen vil lede til en maskin som er en del av Debian Edu-"
-"nettverket, men som ikke kjører noen tjenester (ennå)."
+"For å forenkle flytting til en annen maskin er det en <emphasis>minimal</"
+"emphasis> installasjonsprofil tilgjengelig. Installasjon av denne profilen "
+"vil lede til en maskin som er en del av Debian Edu-nettverket, men som ikke "
+"kjører noen tjenester (ennå)."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5987,8 +5989,8 @@ msgstr ""
 "Hovedmenyen: Gå til «Directory structure», klikk på «Students» department. "
 "«Basis»-feltet skulle vise «/Students». Fra nedtrekksmenyen  «Actions», velg "
 "«Create»/«Department». Fyll inn verdiene for navn (2014) og "
-"beskrivelsefeltene (students graduating in 2014), la Base field stå urørt ("
-"should be «/Students»). Lagre ved å klikke «Ok». Nå vil det nye department "
+"beskrivelsefeltene (students graduating in 2014), la Base field stå urørt "
+"(should be «/Students»). Lagre ved å klikke «Ok». Nå vil det nye department "
 "(2014) vises nedenfor under /Students. Klikk på det."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6115,8 +6117,7 @@ msgstr ""
 "        chown $user:$group $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 " else\n"
-"  . echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n"
-"\"\n"
+"  . echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 " . fi\n"
 "done\n"
 "echo \"$created_dir folders has been created\""
@@ -6193,14 +6194,12 @@ msgid ""
 " done\n"
 " echo \"$created_dir folders has been created\""
 msgstr ""
-"home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; permissions=\""
-"775\"; created_dir=0;\n"
+"home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; permissions=\"775\"; created_dir=0;\n"
 "for home in $(ls $home_path); do\n"
 "  if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
 "    ln -s /media/$home $home_path/$home/$shared_folder ((created_dir+=1))\n"
 "  else\n"
-"    echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n"
-"\"\n"
+"    echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "  fi\n"
 "done\n"
 "echo \"$created_dir folders has been created\""
@@ -6343,8 +6342,7 @@ msgstr ""
 "add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: automount\n"
 "    cn: nas-server\n"
-"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-"
-"server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "\n"
 "    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: top\n"
@@ -6354,8 +6352,7 @@ msgstr ""
 "    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: automount\n"
 "    cn: /\n"
-"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize="
-"32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6371,10 +6368,9 @@ msgid ""
 "computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
 "-a</computeroutput> to mount the new resources."
 msgstr ""
-"Lag monteringspunktkataloger ved å bruke "
-"<computeroutput>mkdir</computeroutput>, rediger «/etc/fstab» som passende, "
-"og kjør  <computeroutput>mount -a</computeroutput> for å montere de nye "
-"ressursene."
+"Lag monteringspunktkataloger ved å bruke <computeroutput>mkdir</"
+"computeroutput>, rediger «/etc/fstab» som passende, og kjør  "
+"<computeroutput>mount -a</computeroutput> for å montere de nye ressursene."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6568,8 +6564,7 @@ msgid ""
 " apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
 msgstr ""
 "apt update\n"
-" apt install education-desktop-gnome education-desktop-lxde education-"
-"desktop-xfce education-desktop-mate"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -6634,11 +6629,11 @@ msgstr ""
 "For å få (non-free) Adobe Flash Player til nettleser, installer "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian-pakke fra "
 "<computeroutput>contrib</computeroutput>. Dette krever "
-"<computeroutput>contrib</computeroutput> aktivert i "
-"<computeroutput>/etc/apt/sources.list</computeroutput>. Bruk <computeroutput"
-">update-flashplugin-nonfree --status</computeroutput> for å sjekke etter en "
-"nyere versjon, og <computeroutput>update-flashplugin-nonfree "
-"--install</computeroutput> for å installere det."
+"<computeroutput>contrib</computeroutput> aktivert i <computeroutput>/etc/apt/"
+"sources.list</computeroutput>. Bruk <computeroutput>update-flashplugin-"
+"nonfree --status</computeroutput> for å sjekke etter en nyere versjon, og "
+"<computeroutput>update-flashplugin-nonfree --install</computeroutput> for å "
+"installere det."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6687,8 +6682,8 @@ msgstr ""
 "juridiske årsaker er den ikke inkludert i Debian (Edu).  Hvis du har lov til "
 "å bruke den, kan du bygge dine egne lokale pakker ved hjelp av "
 "<computeroutput>libdvd-pkg</computeroutput> Debian-pakken. Kontroller at "
-"<computeroutput>contrib</computeroutput> er aktivert i "
-"<computeroutput>/etc/apt/sources.list</computeroutput>."
+"<computeroutput>contrib</computeroutput> er aktivert i <computeroutput>/etc/"
+"apt/sources.list</computeroutput>."
 
 #. type: CDATA
 #, no-wrap
@@ -6753,10 +6748,10 @@ msgid ""
 "boots from a diskette or directly from the server using network-PROM (or "
 "PXE) without using a local client hard drive."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett, eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten."
+"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett, eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten."
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -6849,8 +6844,7 @@ msgstr ""
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory and update the NBD "
-"image.\n"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
 "ltsp-update-kernels\n"
 "ltsp-update-image"
 
@@ -6917,8 +6911,7 @@ msgid ""
 "(3)Execute 'ltsp-update-kernels'\n"
 "(4)Execute 'ltsp-update-image'"
 msgstr ""
-"(1) Åpne filen /opt/ltsp/i386/etc/ltsp/update-kernels.conf  med en "
-"redigerer\n"
+"(1) Åpne filen /opt/ltsp/i386/etc/ltsp/update-kernels.conf  med en redigerer\n"
 " og erstatt linjen\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
 "med \n"
@@ -6940,8 +6933,8 @@ msgid ""
 msgstr ""
 "PXE-konfigurasjonen er generert ved å bruke  <computeroutput>debian-edu-"
 "pxeinstall</computeroutput>-skriptet. Det tillater at noen innstillinger "
-"blir overstyrt ved å legge til en fil <computeroutput>/etc/debian-"
-"edu/pxeinstall.conf</computeroutput> med erstatningsverdier."
+"blir overstyrt ved å legge til en fil <computeroutput>/etc/debian-edu/"
+"pxeinstall.conf</computeroutput> med erstatningsverdier."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Configuring the PXE installation"
@@ -6994,14 +6987,14 @@ msgstr ""
 "innstillinger fra innstillingene som er brukt når man installerte "
 "hovedtjener. Andre spørsmål som stilles under installasjonen; popcon "
 "deltagelse, partisjonering og root passord. For å unngå disse spørsmålene "
-"kan filen  <computeroutput>/etc/debian-edu/www/debian-edu-"
-"install.dat</computeroutput> bli laget med DebConf-verdiene for å utføre de "
-"forvalgte svarene. Noen eksempler på DebConf-verdier er tilgjengelig i "
+"kan filen  <computeroutput>/etc/debian-edu/www/debian-edu-install.dat</"
+"computeroutput> bli laget med DebConf-verdiene for å utføre de forvalgte "
+"svarene. Noen eksempler på DebConf-verdier er tilgjengelig i "
 "<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput>. "
 "Endringene dine vil forsvinne hver gang <computeroutput>debian-edu-"
 "pxeinstall</computeroutput> brukes til å lage PXE-installasjonsomgivelsen på "
-"nytt.  For å legge til debconf-verdier på slutten av <computeroutput>/etc"
-"/debian-edu/www/debian-edu-install.dat</computeroutput> når den gjenskapes "
+"nytt.  For å legge til debconf-verdier på slutten av <computeroutput>/etc/"
+"debian-edu/www/debian-edu-install.dat</computeroutput> når den gjenskapes "
 "med <computeroutput>debian-edu-pxeinstall</computeroutput> kan du legge inn "
 "dine ekstra debconf-verdier i <computeroutput>/etc/debian-edu/www/debian-edu-"
 "install.dat.local</computeroutput>."
@@ -7038,8 +7031,7 @@ msgid ""
 "d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 "#add the skole projects local repository\n"
-"d-i     apt-setup/local1/repository string      http://example.org/debian "
-"stable main contrib non-free\n"
+"d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
 "d-i     apt-setup/local1/key    string          http://example.org/key.asc"
@@ -7066,11 +7058,11 @@ msgid ""
 "computeroutput>."
 msgstr ""
 "PXE-menyen tillater nettverkssstart av LTSP-klienter,  "
-"installasjonsprogrammet og andre alternativer. Filen "
-"<computeroutput>/var/lib/tftpboot/pxelinux.cfg/default</computeroutput> er "
-"brukt som standard hvis ingen annen fil i den mappen passer med klienten, og "
-"er som standard satt til å lenke til <computeroutput>/var/lib/tftpboot"
-"/debian-edu/default-menu.cfg</computeroutput>."
+"installasjonsprogrammet og andre alternativer. Filen <computeroutput>/var/"
+"lib/tftpboot/pxelinux.cfg/default</computeroutput> er brukt som standard "
+"hvis ingen annen fil i den mappen passer med klienten, og er som standard "
+"satt til å lenke til <computeroutput>/var/lib/tftpboot/debian-edu/default-"
+"menu.cfg</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7104,8 +7096,8 @@ msgid ""
 "See also the PXELINUX documentation at <ulink url=\"http://syslinux.zytor."
 "com/wiki/index.php/PXELINUX\"/> ."
 msgstr ""
-"Se også PXE Linux-dokumentasjonen hos <ulink url=\""
-"http://syslinux.zytor.com/wiki/index.php/PXELINUX\"/> ."
+"Se også PXE Linux-dokumentasjonen hos <ulink url=\"http://syslinux.zytor.com/"
+"wiki/index.php/PXELINUX\"/> ."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Separate main and LTSP server"
@@ -7152,9 +7144,9 @@ msgid ""
 "computeroutput> to use the IP address of ltspserver00; the following example "
 "uses 10.0.2.10 for the IP address of ltspserver00 on the main network:"
 msgstr ""
-"Rediger <computeroutput>/var/lib/tftpboot/debian-edu/default-"
-"diskless.cfg</computeroutput> for å bruke IP-adressen til ltspserver00; Det "
-"følgende eksemplet bruker 10.0.2.10 som  IP-adressen til ltspserver00 på "
+"Rediger <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+"computeroutput> for å bruke IP-adressen til ltspserver00; Det følgende "
+"eksemplet bruker 10.0.2.10 som  IP-adressen til ltspserver00 på "
 "hovednettverket:"
 
 #. type: CDATA
@@ -7198,11 +7190,10 @@ msgstr ""
 "192.168.0.0/24 er standard LTSP-tjenernettverk hvis maskinen er installert "
 "med LTSP-profilen. Hvis mange LTSP-klienter brukes, eller hvis forskjellige "
 "LTSP-tjenere skal betjene både i386 og AMD64 chroot-miljø, kan det andre "
-"nettoppsettet også brukes: 192.168.1.0/24. Rediger filen "
-"<computeroutput>/etc/network/interfaces</computeroutput>, og juster eth1-"
-"innstillingene i tråd med dette. Bruk  "
-"<computeroutput>ldapvi</computeroutput>, eller en annen  LDAP-tekstredigerer "
-"for å se igjennom DNS- og DHCP-oppsettet."
+"nettoppsettet også brukes: 192.168.1.0/24. Rediger filen <computeroutput>/"
+"etc/network/interfaces</computeroutput>, og juster eth1-innstillingene i "
+"tråd med dette. Bruk  <computeroutput>ldapvi</computeroutput>, eller en "
+"annen  LDAP-tekstredigerer for å se igjennom DNS- og DHCP-oppsettet."
 
 #. type: Content of: <article><section><section><title>
 msgid "Changing network settings"
@@ -7265,8 +7256,8 @@ msgid ""
 "conf</computeroutput>."
 msgstr ""
 "For å sette opp spesifikke tynne klienter med bestemte egenskaper så kan du "
-"legge til oppsett i LDAP eller redigere filen "
-"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>."
+"legge til oppsett i LDAP eller redigere filen <computeroutput>/opt/ltsp/i386/"
+"etc/lts.conf</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7280,10 +7271,9 @@ msgstr ""
 "Vi anbefaler å konfigurere klienter i LDAP (og ikke redigere "
 "<computeroutput>lts.conf</computeroutput> direkte, da webformer/webskjemaer "
 "til konfigurasjon for LTSP for tiden ikke er tilgjengelig i GOsa². Du må "
-"bruke en vanlig LDAP-browser/explorer eller "
-"<computeroutput>ldapvi</computeroutput>), da dette gjør det mulig å legge "
-"til og/eller erstatte LTSP-tjenere uten å miste (eller å måtte gjøre om) "
-"konfigurasjon."
+"bruke en vanlig LDAP-browser/explorer eller <computeroutput>ldapvi</"
+"computeroutput>), da dette gjør det mulig å legge til og/eller erstatte LTSP-"
+"tjenere uten å miste (eller å måtte gjøre om) konfigurasjon."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7304,9 +7294,8 @@ msgid ""
 "LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 "Kjør <computeroutput>man lts.conf</computeroutput> for å se tilgjengelige "
-"konfigurasjonsalternativer (se "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detaljert informasjon om LTSP)."
+"konfigurasjonsalternativer (se <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detaljert informasjon om LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7582,9 +7571,8 @@ msgstr ""
 "lastbalanseres. Lagre denne filen som <computeroutput>/etc/ltsp/"
 "ssh_known_hosts.extra </computeroutput> på alle lastbalanseringsserverne. "
 "Dette siste steget er veldig viktig siden ltsp-update-sshkeys kjører hver "
-"gang en tjener restartes, og "
-"<computeroutput>/etc/ltsp/ssh_known_hosts.extra</computeroutput> legges inn "
-"hvis filen eksisterer."
+"gang en tjener restartes, og <computeroutput>/etc/ltsp/ssh_known_hosts."
+"extra</computeroutput> legges inn hvis filen eksisterer."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -7592,9 +7580,9 @@ msgid ""
 "ssh_known_hosts</computeroutput>, it will be erased when you reboot the "
 "server."
 msgstr ""
-"Hvis du lagrer din nye vertsfil som "
-"<computeroutput>/opt/ltsp/i386/etc/ssh/ssh_known_hosts</computeroutput>, vil "
-"den bli slettet hver gang serveren restartes."
+"Hvis du lagrer din nye vertsfil som <computeroutput>/opt/ltsp/i386/etc/ssh/"
+"ssh_known_hosts</computeroutput>, vil den bli slettet hver gang serveren "
+"restartes."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -7635,10 +7623,10 @@ msgstr ""
 "PulseAudio og ALSA. ESD og PulseAudio støtter nettverkslyd, og brukes for å "
 "sende lyd fra tjeneren til klientene. ALSA er satt opp for å omdirigere sin "
 "lyd via PulseAudi. For utvalgte programmer som kun støtter OSS lydsystem, er "
-"en «wrapper» laget av <computeroutput>/usr/sbin/debian-edu-ltsp-"
-"audiodivert</computeroutput> for å omdirigere lyden til PulseAudio. Kjør "
-"dette skriptet uten argumenter for å få en liste over programmer med slik "
-"omdirigering påslått."
+"en «wrapper» laget av <computeroutput>/usr/sbin/debian-edu-ltsp-audiodivert</"
+"computeroutput> for å omdirigere lyden til PulseAudio. Kjør dette skriptet "
+"uten argumenter for å få en liste over programmer med slik omdirigering "
+"påslått."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7680,12 +7668,11 @@ msgid ""
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
 msgstr ""
-"Konfigurer skriveren med nettgrensesnittet "
-"<computeroutput>https://www:631</computeroutput> på hovedtjeneren; velg type "
-"nettverkskriver; <computeroutput>AppSocket/HP JetDirect</computeroutput> ("
-"for alle skrivere uavhengig av merke eller modell), og sett "
-"<computeroutput>socket://<LTSP client ip>:9100</computeroutput> som "
-"URI-forbindelse."
+"Konfigurer skriveren med nettgrensesnittet <computeroutput>https://www:631</"
+"computeroutput> på hovedtjeneren; velg type nettverkskriver; "
+"<computeroutput>AppSocket/HP JetDirect</computeroutput> (for alle skrivere "
+"uavhengig av merke eller modell), og sett <computeroutput>socket://<LTSP "
+"client ip>:9100</computeroutput> som URI-forbindelse."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Upgrading the LTSP environment"
@@ -7712,8 +7699,7 @@ msgid ""
 "exit\n"
 "ltsp-update-image"
 msgstr ""
-"ltsp-chroot -a i386  # dette kjører \"chroot /opt/ltsp/i386\" med mer, "
-"f.eks. hindrer det at nisser startes opp\n"
+"ltsp-chroot -a i386  # dette kjører \"chroot /opt/ltsp/i386\" med mer, f.eks. hindrer det at nisser startes opp\n"
 "apt update\n"
 "apt upgrade\n"
 "apt full-upgrade\n"
@@ -7913,8 +7899,8 @@ msgstr ""
 "Brukere som tar med sin egen bærbare XP-laptop, kan likevel koble til "
 "hovedtjeneren med sitt Skolelinux brukernavn og passord så lenge "
 "arbeidsgruppen/workgroup settes til SKOLELINUX, men de må kanskje slå av "
-"brannmuren i Windows før hovedtjeneren vil dukke opp i Nettverksnabolaget ("
-"eller hva det nå kalles)."
+"brannmuren i Windows før hovedtjeneren vil dukke opp i Nettverksnabolaget "
+"(eller hva det nå kalles)."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Managing roaming profiles"
@@ -8049,8 +8035,8 @@ msgid ""
 "directories to exclude are:"
 msgstr ""
 "Under valget «Brukerinnstillinger» -> «Administrative maler»  -> "
-"«System» -> «Brukeprofiler» ->  «Ekskluder kataloger i roaming profil»"
-", kan du skrive inn en semikolonbasert liste med kataloger som skal "
+"«System» -> «Brukeprofiler» ->  «Ekskluder kataloger i roaming "
+"profil», kan du skrive inn en semikolonbasert liste med kataloger som skal "
 "ekskluderes fra profilen. Katalogene er internasjonaliserte, så du må skrive "
 "inn navnet på installasjonsspråket slik de er i profilen. Eksempel på "
 "kataloger som kan ekskluderes er:"
@@ -8284,11 +8270,11 @@ msgid ""
 "Documents\"."
 msgstr ""
 "Alt under instruksjonene ovenfor om maskinbruk gjelder også her. Du "
-"redigerer disse reglene ved bruk av "
-"<computeroutput>gpedit.msc</computeroutput>, og kopierer reglene til alle "
-"maskiner. Omadresseringen skal være tilgjengelig under «User Configuration» "
-"-> «Windows Settings» -> «Folder Redirection». Mapper det kan være "
-"greit å omadressere inkluderer «Desktop» og «My Documents»."
+"redigerer disse reglene ved bruk av <computeroutput>gpedit.msc</"
+"computeroutput>, og kopierer reglene til alle maskiner. Omadresseringen skal "
+"være tilgjengelig under «User Configuration» -> «Windows Settings» -> "
+"«Folder Redirection». Mapper det kan være greit å omadressere inkluderer "
+"«Desktop» og «My Documents»."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -8523,10 +8509,10 @@ msgstr ""
 "Samba Wiki om støttede Windows-versjoner, om registeroppdateringer som "
 "trengs, og andre prosedyrer. Sannsynligvis trengs en linje som inneholder "
 "<computeroutput>server max protocol = NT1</computeroutput> å bli lagt til "
-"<computeroutput>[global]</computeroutput>-seksjonen til "
-"<computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> på "
-"hovedtjeneren. Vennligst vurder å oppdatere dette kapittelet hvis du vet "
-"hvordan man konfigurerer Samba for Debian Edu."
+"<computeroutput>[global]</computeroutput>-seksjonen til <computeroutput>/etc/"
+"samba/smb-debian-edu.conf</computeroutput> på hovedtjeneren. Vennligst "
+"vurder å oppdatere dette kapittelet hvis du vet hvordan man konfigurerer "
+"Samba for Debian Edu."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -8585,8 +8571,8 @@ msgid ""
 msgstr ""
 "Etter installering av Debian Edu-hovedserver Samba, skulle tjeneren bli "
 "synlig i nettverket til Windows «Neighbourhood». Debian Edus Windows-domene "
-"er SKOLELINUX. Bruk en Windows-maskin (eller et Linux-system med SMBclient ("
-"SMB - Server Message Block)) for å bla gjennom ditt Windows/Samba-"
+"er SKOLELINUX. Bruk en Windows-maskin (eller et Linux-system med SMBclient "
+"(SMB - Server Message Block)) for å bla gjennom ditt Windows/Samba-"
 "nettverksmiljø."
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -8620,10 +8606,10 @@ msgid ""
 "domain."
 msgstr ""
 "Student-  og lærerkontoer som er konfigurert via GOsa², skulle ha muligheten "
-"til å bekrefte identitet (autentisere) mot \\\\TJENER\\HJEM eller \\\\"
-"TJENER\\< brukernavn> , og få tilgang til sine hjemmemapper med "
-"Windows-maskiner <emphasis role=\"strong\">not</emphasis>  som er "
-"sammenføyet med Windows SKOLELINUX-domain (domenet)."
+"til å bekrefte identitet (autentisere) mot \\\\TJENER\\HJEM eller \\\\TJENER"
+"\\< brukernavn> , og få tilgang til sine hjemmemapper med Windows-"
+"maskiner <emphasis role=\"strong\">not</emphasis>  som er sammenføyet med "
+"Windows SKOLELINUX-domain (domenet)."
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
@@ -8785,8 +8771,8 @@ msgid ""
 "password, click \"OK\""
 msgstr ""
 "En pop-up-boks vil be om å få oppgitt legitimasjon av en konto med "
-"rettigheter til å bli med i domenet. Skriv inn brukernavn SKOLELINUX\\"
-"Administrator og rot-passordet, klikk på «OK»"
+"rettigheter til å bli med i domenet. Skriv inn brukernavn SKOLELINUX"
+"\\Administrator og rot-passordet, klikk på «OK»"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
@@ -8800,10 +8786,15 @@ msgstr ""
 "«OK»"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After the reboot, when you login the first time, click on the \"Options "
+#| ">>\" button and select the domain SKOLELINUX instead of the local "
+#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 "Etter omstart, når du har logget inn første gang, klikk på «Alternativer»-"
 "knappen, og velg domenet SKOLELINUX i stedet for det lokale domenet («denne "
@@ -8875,6 +8866,16 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr "På siden Systemegenskaper, klikk på «Endre ...»"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+"Etter omstart, når du har logget inn første gang, klikk på «Alternativer»-"
+"knappen, og velg domenet SKOLELINUX i stedet for det lokale domenet («denne "
+"datamaskinen»)."
+
 #. type: Content of: <article><section><section><title>
 #, fuzzy
 msgid "First Domain Logon"
@@ -8922,9 +8923,8 @@ msgid ""
 "your Debian Edu main server."
 msgstr ""
 "Andre oppgaver kjøres på hver pålogging. For ytterligere informasjon om "
-"dette, kan du referere til "
-"<computeroutput>etc/samba/netlogon</computeroutput> mappe på Debian Edu-"
-"hovedserver."
+"dette, kan du referere til <computeroutput>etc/samba/netlogon</"
+"computeroutput> mappe på Debian Edu-hovedserver."
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for teaching and learning"
@@ -9008,12 +9008,11 @@ msgid ""
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
-"Noen skoler benytter styringsverktøy som <ulink url=\""
-"https://packages.debian.org/stable/controlaula#\">Controlaula</ulink> eller <"
-"ulink url=\" http://packages.debian.org /stabilt/italc-master#\"> iTALC "
-"</ulink> for å føre tilsyn med sine studenter. Se også <ulink url=\""
-"http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page\">"
-"iTALC Wiki</ulink>."
+"Noen skoler benytter styringsverktøy som <ulink url=\"https://packages."
+"debian.org/stable/controlaula#\">Controlaula</ulink> eller <ulink url=\" "
+"http://packages.debian.org /stabilt/italc-master#\"> iTALC </ulink> for å "
+"føre tilsyn med sine studenter. Se også <ulink url=\"http://sourceforge.net/"
+"apps/mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9034,10 +9033,10 @@ msgid ""
 "\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
-"Noen skoler bruker <ulink url=\""
-"https://packages.debian.org/stable/squidguard#\">Squidguard</ulink> eller <"
-"ulink url=\"https://packages.debian.org/stable/dansguardian#\""
-">Dansguardian</ulink> for å begrense Internett-tilgangen."
+"Noen skoler bruker <ulink url=\"https://packages.debian.org/stable/"
+"squidguard#\">Squidguard</ulink> eller <ulink url=\"https://packages.debian."
+"org/stable/dansguardian#\">Dansguardian</ulink> for å begrense Internett-"
+"tilgangen."
 
 #. type: Content of: <article><section><section><title>
 msgid "Smart-Board integration"
@@ -9089,8 +9088,7 @@ msgid ""
 "# extract the file\n"
 "root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
-"# Flytte tar.gz fil til en depotkatalog på skolens nettverkets webroot (som "
-"standard plassert på tjener):\n"
+"# Flytte tar.gz fil til en depotkatalog på skolens nettverkets webroot (som standard plassert på tjener):\n"
 "root at tjener:~# \n"
 "mkdir /etc/debian-edu/www/debian\n"
 "mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -9122,9 +9120,7 @@ msgstr ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup"
-",smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-"
-"drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Update the preseed file:"
@@ -9140,9 +9136,8 @@ msgid ""
 "After this, new installations via PXE will have the <ulink url=\"https://"
 "wiki.debian.org/SmartBoard#\">SmartBoard</ulink> software installed."
 msgstr ""
-"Etter dette, vil nye installasjoner via PXE ha <ulink url=\""
-"https://wiki.debian.org/Smart-Board#\">Smart Board</ulink> -programvare "
-"installert."
+"Etter dette, vil nye installasjoner via PXE ha <ulink url=\"https://wiki."
+"debian.org/Smart-Board#\">Smart Board</ulink> -programvare installert."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Adding the SmartBoard software manually after installation"
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 6128802..ca06a9a 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: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+0000\n"
 "PO-Revision-Date: 2017-04-28 21:49+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"
@@ -1621,11 +1621,17 @@ msgid "Request a CD / DVD by mail"
 msgstr "Een cd / dvd per e-mail aanvragen"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For those without a fast Internet connection, we can offer a CD or DVD "
+#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
+#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
+#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 "Aan wie niet de beschikking heeft over een snelle internetverbinding bieden "
 "we de mogelijkheid om een cd of dvd per post te ontvangen voor de prijs van "
@@ -9157,10 +9163,15 @@ msgstr ""
 "wijzigingen te doen ingaan. Klik op \"OK\""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After the reboot, when you login the first time, click on the \"Options "
+#| ">>\" button and select the domain SKOLELINUX instead of the local "
+#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 "Nadat de computer opnieuw opgestart werd, klikt u bij de eerstvolgende "
 "aanmelding op de knop \"Opties >>\" en vervolgens kiest u het domein "
@@ -9229,6 +9240,16 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr "op de pagina Systeemeigenschappen, klikt u op \"Wijzigen...\""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+"Nadat de computer opnieuw opgestart werd, klikt u bij de eerstvolgende "
+"aanmelding op de knop \"Opties >>\" en vervolgens kiest u het domein "
+"SKOLELINUX in plaats van het lokale domein (\"deze computer\")"
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr "De eerste aanmelding op het domein"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index 6194fdb..9a245a0 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+0000\n"
 "PO-Revision-Date: 2017-05-09 07:23+0000\n"
 "Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -1673,7 +1673,7 @@ msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6997,7 +6997,7 @@ msgstr ""
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7046,6 +7046,13 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 4e5ece8..9085919 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: 2017-05-24 11:42+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+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"
@@ -1173,7 +1173,7 @@ msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6481,7 +6481,7 @@ msgstr ""
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6530,6 +6530,13 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index a7652fc..4b47af1 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -511,7 +511,7 @@
 <section id="Installation--Request_a_CD_.2BAC8_DVD_by_mail">
 <title>Request a CD / DVD by mail
 </title>
-<para>For those without a fast Internet connection, we can offer a CD or DVD sent for the cost of the CD or DVD and shipping. Just send an email to <ulink url="mailto:cd at skolelinux.no">cd at skolelinux.no</ulink> and we will discuss the payment details (for shipping and media) <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:)</phrase></textobject></inlinemediaobject> Remember to include the address you want the CD or DVD to be sent [...]
+<para>For those without a fast Internet connection, we can offer a CD or DVD sent for the cost of the CD or DVD and shipping. Just send an email to <ulink url="mailto:cd at skolelinux.no">cd at skolelinux.no</ulink> and we will discuss the payment details (for shipping and media). <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:)</phrase></textobject></inlinemediaobject> Remember to include the address you want the CD or DVD to be sen [...]
 </para>
 </section>
 
@@ -2878,7 +2878,7 @@ logon home = ""]]></screen>
 <listitem>
 <para>a confirmation pop up box will welcome you to the SKOLELINUX domain. Clicking on "OK", will result in having another message informing that a reboot for the machine is required to apply the changes. Click on "OK" 
 </para></listitem></orderedlist>
-<para>After the reboot, when you login the first time, click on the "Options >>" button and select the domain SKOLELINUX instead of the local domain ("this computer") 
+<para>After the reboot, when you login the first time, click on the "Options >>" button and select the domain SKOLELINUX instead of the local domain ("this computer"). 
 </para>
 <para>If joining the domain has been successful you should then be able to view the host details within GOsa² (under the menu section "Systems").  
 </para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
index 0987301..522fb08 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-26 10:54+0000\n"
 "PO-Revision-Date: 2017-05-20 09:44+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -1476,11 +1476,17 @@ msgid "Request a CD / DVD by mail"
 msgstr "以邮件请求 CD / DVD"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For those without a fast Internet connection, we can offer a CD or DVD "
+#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
+#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
+#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
-"payment details (for shipping and media)"
+"payment details (for shipping and media)."
 msgstr ""
 "对于没有快速互联网连接,我们能以 CD 或 DVD 及运输费用发送 CD 或 DVD。直接发送"
 "电子邮件 <ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> 而我"
@@ -3163,21 +3169,26 @@ msgstr "组管理与用户管理非常相似。"
 msgid ""
 "You can enter a name and a description per group. Make sure that you choose "
 "the right level in the LDAP tree when creating a new group."
-msgstr "你可以输入每个组的名称和描述。确定在创建新组时选择 LADP 树中右侧水平位置。"
+msgstr ""
+"你可以输入每个组的名称和描述。确定在创建新组时选择 LADP 树中右侧水平位置。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "By default, the appropriate Samba group isn't created. If you forgot to "
 "check the Samba group option during group creation, you can modify the group "
 "later on."
-msgstr "默认下,不能创建合适的 Samba 组。如果你在组创建时忽略了检查 Samba 组选项,可以在之后修改该组。"
+msgstr ""
+"默认下,不能创建合适的 Samba 组。如果你在组创建时忽略了检查 Samba 组选项,可"
+"以在之后修改该组。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Adding users to a newly created group takes you back to the user list, where "
 "you most probably would like to use the filter box to find users. Check the "
 "LDAP tree level, too."
-msgstr "添加用户到新创建的组会带你返回用户列表,你最有可能使用过滤器框来查找用户。也会检查 LDAP 树层。"
+msgstr ""
+"添加用户到新创建的组会带你返回用户列表,你最有可能使用过滤器框来查找用户。也"
+"会检查 LDAP 树层。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3213,8 +3224,8 @@ msgid ""
 "\">HowTo/NetworkClients</link> chapter of this manual."
 msgstr ""
 "更详细的解释在本手册的 <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration\""
-">HowTo/NetworkClients</link> 一章中。"
+"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+"\">HowTo/NetworkClients</link> 一章中。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Machine Management with GOsa²"
@@ -3229,9 +3240,10 @@ msgid ""
 "architecture see the <link linkend=\"Architecture\">architecture</link> "
 "chapter of this manual."
 msgstr ""
-"机器管理基本上允许你管理 Debian Edu 网络中的所有联网设备。使用 GOsa² 添加到 LDAP 目录的每台机器有一个主机名,一个 IP 地址,"
-"一个 MAC 地址和一个域名(通常是“内部”)。完整的 Debian Edu 结构的描述参阅本手册的<link linkend=\""
-"Architecture\">结构</link>一章。"
+"机器管理基本上允许你管理 Debian Edu 网络中的所有联网设备。使用 GOsa² 添加到 "
+"LDAP 目录的每台机器有一个主机名,一个 IP 地址,一个 MAC 地址和一个域名(通常"
+"是“内部”)。完整的 Debian Edu 结构的描述参阅本手册的<link linkend="
+"\"Architecture\">结构</link>一章。"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -7138,7 +7150,7 @@ msgstr ""
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options >"
 ">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
+"(\"this computer\")."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7187,6 +7199,13 @@ msgstr ""
 msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
 msgstr ""

-- 
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