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

Holger Levsen holger at layer-acht.org
Thu Mar 2 19:56:45 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 406802e80a443a942381b0670beff65c73868252
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Mar 2 20:56:30 2017 +0100

    Update Debian Edu Stretch manual from the wiki.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                                   |  3 ++
 .../debian-edu-stretch-manual.da.po                | 36 +++++++++++--------
 .../debian-edu-stretch-manual.de.po                | 40 +++++++++++++--------
 .../debian-edu-stretch-manual.es.po                | 36 +++++++++++--------
 .../debian-edu-stretch-manual.fr.po                | 36 +++++++++++--------
 .../debian-edu-stretch-manual.it.po                | 36 +++++++++++--------
 .../debian-edu-stretch-manual.ja.po                | 40 +++++++++++++--------
 .../debian-edu-stretch-manual.nb.po                | 36 +++++++++++--------
 .../debian-edu-stretch-manual.nl.po                | 42 ++++++++++++++--------
 .../debian-edu-stretch-manual.pl.po                | 27 +++++++-------
 .../debian-edu-stretch-manual.pot                  | 27 +++++++-------
 .../debian-edu-stretch-manual.xml                  |  8 ++---
 .../debian-edu-stretch-manual.zh.po                | 36 +++++++++++--------
 13 files changed, 248 insertions(+), 155 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0deac3..ffc7a05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ debian-edu-doc (1.918~20170319) UNRELEASED; urgency=medium
   [ Stretch Manual translation updates ]
   * Dutch: Frans Spiesschaert.
 
+  [ Holger Levsen ]
+  * Update Debian Edu Stretch manual from the wiki.
+
  -- Holger Levsen <holger at debian.org>  Mon, 27 Feb 2017 16:03:36 +0100
 
 debian-edu-doc (1.917~20170226) unstable; urgency=medium
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 8b58384..dd1f914 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+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"
@@ -1439,8 +1439,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"Routeren skal ikke køre en DHCP-server, den kan køre en DNS-server, dog er "
+"dette ikke krævet og vil ikke blive brugt."
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1490,18 +1500,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"Routeren skal ikke køre en DHCP-server, den kan køre en DNS-server, dog er "
-"dette ikke krævet og vil ikke blive brugt."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "Hvis du er på udkig efter en løsning med en routerbrandmur som kan køre på "
 "en gammel pc, så anbefaler vi <ulink url=\"http://www.ipcop.org\">IPCop</"
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 9571339..92f9f91 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+0000\n"
 "PO-Revision-Date: 2017-02-25 20:39+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1337,8 +1337,22 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"Auf dem Router sollte kein DHCP-Server laufen; ein DNS-Server kann laufen, "
+"ist aber nicht notwendig und wird auch nicht benutzt. "
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A system with two network interfaces could be turned into a gateway if "
+#| "the Debian Edu 'Minimal' profile is installed."
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 "Ein System mit zwei Netzwerkschnittstellen könnte in ein »Gateway« "
 "umgewandelt werden, wenn das Debian Edu »Minimal«-Profil installiert wurde."
@@ -1409,18 +1423,16 @@ msgstr ""
 " #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"Auf dem Router sollte kein DHCP-Server laufen; ein DNS-Server kann laufen, "
-"ist aber nicht notwendig und wird auch nicht benutzt. "
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "Wenn Sie einen alten Computer weiter als Router/Firewall verwenden wollen, "
 "ist <ulink url=\"http://www.ipcop.org\">IPCop</ulink> oder <ulink url="
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 6c99c7a..15299f8 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+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"
@@ -1460,8 +1460,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"El enrutador no debería ejecutar un servidor DHCP, puede ejecutar un "
+"servidor DNS, aunque no es necesario y no será usado."
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1511,18 +1521,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"El enrutador no debería ejecutar un servidor DHCP, puede ejecutar un "
-"servidor DNS, aunque no es necesario y no será usado."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "Si buscas una solución basada en i386 para poder rehusar una PC vieja, "
 "recomendamos <ulink url=\"http://www.ipcop.org\">IPCop</ulink> o <ulink url="
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 a917eff..257bf72 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+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"
@@ -1503,8 +1503,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"Le routeur ne doit pas exécuter de serveur DHCP. Il peut exécuter un serveur "
+"DNS bien que cela ne soit pas nécessaire ni utilisé."
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1554,18 +1564,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"Le routeur ne doit pas exécuter de serveur DHCP. Il peut exécuter un serveur "
-"DNS bien que cela ne soit pas nécessaire ni utilisé."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "Si vous recherchez une solution de pare-feu capable de fonctionner sur un "
 "vieux PC, nous vous recommandons <ulink url=\"http://www.ipcop.org\">IPCop</"
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 bec10ba..406ca79 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+0000\n"
 "PO-Revision-Date: 2015-05-04 19:34+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1476,8 +1476,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"Il router non dovrebbe essere un server DHCP, anche se è possibile che sia "
+"un server DNS, anche se questo non è necessario e non sarà utilizzato."
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1527,18 +1537,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"Il router non dovrebbe essere un server DHCP, anche se è possibile che sia "
-"un server DNS, anche se questo non è necessario e non sarà utilizzato."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "Se si sta cercando una soluzione per firewall su router da poter eseguire su "
 "un vecchio PC, è raccomandato l'uso di <ulink url=\"http://www.ipcop.org"
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 c510b60..0be7f7c 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+0000\n"
 "PO-Revision-Date: 2017-02-21 00:00+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -1258,8 +1258,22 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"ルータで DHCP サーバを動作させるべきではありません。DNSサーバを動作させること"
+"はできますが、これは必要なく利用されません。"
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A system with two network interfaces could be turned into a gateway if "
+#| "the Debian Edu 'Minimal' profile is installed."
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 "ネットワークを2つ備えたシステムは Debian Edu の「最小構成 (Minimal)」プロファ"
 "イルをインストールすればゲートウェイにできます。 "
@@ -1328,18 +1342,16 @@ msgstr ""
 " #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"ルータで DHCP サーバを動作させるべきではありません。DNSサーバを動作させること"
-"はできますが、これは必要なく利用されません。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "古いPCを活用したルータ兼ファイアウォールを探している場合、<ulink url="
 "\"http://www.ipcop.org\">IPCop</ulink> か <ulink url=\"http://www.zelow.no/"
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 4e8b1d4..e4c4923 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+0000\n"
 "PO-Revision-Date: 2017-02-22 09:01+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -1429,8 +1429,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"Ruteren skal ikke kjøre på en DHCP-tjener. Den kan kjøre på en DNS-tjener, "
+"selv om dette ikke er nødvendig, og den ikke brukes."
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1480,18 +1490,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"Ruteren skal ikke kjøre på en DHCP-tjener. Den kan kjøre på en DNS-tjener, "
-"selv om dette ikke er nødvendig, og den ikke brukes."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "Hvis du leter etter en ruter med brannvegg-løsning som kan kjøre på en "
 "gammel PC, vil vi anbefale <ulink url=\"http://www.ipcop.org\"> IPCop</"
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 dbd2bf3..d4b7855 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+0000\n"
 "PO-Revision-Date: 2017-02-27 15:14+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"
@@ -1352,8 +1352,22 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"De router mag niet fungeren als DHCP-server. Er mag een DNS-server op "
+"draaien, al is dit niet nodig. Hij zal trouwens niet gebruikt worden."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A system with two network interfaces could be turned into a gateway if "
+#| "the Debian Edu 'Minimal' profile is installed."
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 "Van een systeem met twee netwerkkaarten kan men een gateway maken als men er "
 "het profiel 'Minimal' van Debian Edu op installeert."
@@ -1424,18 +1438,16 @@ msgstr ""
 " #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"De router mag niet fungeren als DHCP-server. Er mag een DNS-server op "
-"draaien, al is dit niet nodig. Hij zal trouwens niet gebruikt worden."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+msgid ""
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "Indien u uitkijkt naar een softwarematige combinatie van router en firewall "
 "om die op een oude PC te installeren, dan raden we u  <ulink url=\"http://"
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 891e6f8..fd14205 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+0000\n"
 "PO-Revision-Date: 2017-02-01 08:31+0000\n"
 "Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -1487,8 +1487,16 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1539,15 +1547,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 7b08e1b..ae951b1 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+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"
@@ -977,8 +977,16 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1027,15 +1035,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 9e36a80..5c9d060 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -410,7 +410,9 @@
 </title>
 <para>A router/gateway, connected to the Internet on the external interface and running on the IP address 10.0.0.1 with netmask 255.0.0.0 on the internal interface, is needed to connect to the Internet. 
 </para>
-<para>A system with two network interfaces could be turned into a gateway if the Debian Edu 'Minimal' profile is installed. 
+<para>The router should not run a DHCP server, it can run a DNS server, though this is not needed and will not be used. 
+</para>
+<para>In case you already have a router but are unable to configure it like needed (not allowed to, technical reasons), a system with two network interfaces could be turned into a gateway if the Debian Edu 'Minimal' profile is installed. 
 </para>
 <para>After the installation: 
 </para>
@@ -445,9 +447,7 @@
  # or
  #apt install ufw
  #apt install wondershaper  ]]></screen>
-<para>The router should not run a DHCP server, it can run a DNS server, though this is not needed and will not be used. 
-</para>
-<para>If you are looking for a router firewall solution capable of running on an old PC, we recommend <ulink url="http://www.ipcop.org">IPCop</ulink> or <ulink url="http://www.zelow.no/floppyfw">floppyfw</ulink>. 
+<para>In case you are looking for a complete router firewall solution capable of running on an old PC, we recommend <ulink url="http://www.ipcop.org">IPCop</ulink> or <ulink url="http://www.zelow.no/floppyfw">floppyfw</ulink>. 
 </para>
 <para>If you need something for an embedded router or accesspoint we recommend using <ulink url="http://openwrt.org">OpenWRT</ulink>, though of course you can also use the original firmware. Using the original firmware is easier; using OpenWRT gives you more choices and control. Check the OpenWRT webpages for a list of <ulink url="http://wiki.openwrt.org/toh/start">supported hardware</ulink>.  
 </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 7959901..2e4339e 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-02-26 18:20+0000\n"
+"POT-Creation-Date: 2017-03-02 19:55+0000\n"
 "PO-Revision-Date: 2017-02-24 13:04+0000\n"
 "Last-Translator: Boyuan Yang <073plan at gmail.com>\n"
 "Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -1310,8 +1310,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A system with two network interfaces could be turned into a gateway if the "
-"Debian Edu 'Minimal' profile is installed."
+"The router should not run a DHCP server, it can run a DNS server, though "
+"this is not needed and will not be used."
+msgstr ""
+"路由将不运行 DHCP 服务器，它可以运行 DNS 服务器，但这是不需要的而且也不会被使"
+"用。"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In case you already have a router but are unable to configure it like needed "
+"(not allowed to, technical reasons), a system with two network interfaces "
+"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
+"installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1359,18 +1369,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you are looking for a router firewall solution capable of running on "
+#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used."
-msgstr ""
-"路由将不运行 DHCP 服务器，它可以运行 DNS 服务器，但这是不需要的而且也不会被使"
-"用。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are looking for a router firewall solution capable of running on an "
-"old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+"In case you are looking for a complete router firewall solution capable of "
+"running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+"\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+"ulink>."
 msgstr ""
 "如果你寻找一个能够运行在旧个人电脑上的路由防火墙方案，我们推荐 <ulink url="
 "\"http://www.ipcop.org\">IPCop</ulink> 或 <ulink url=\"http://www.zelow.no/"

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