[debian-edu-commits] debian-edu/ 01/01: updated from the wiki
Holger Levsen
holger at moszumanska.debian.org
Sun Feb 8 10:47:31 UTC 2015
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 85953bc2d8d12b367cc39bb480e65707dd802c13
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Feb 8 11:47:02 2015 +0100
updated from the wiki
---
.../debian-edu-jessie-manual.da.po | 50 +++++++++++---------
.../debian-edu-jessie-manual.de.po | 43 +++++++++++------
.../debian-edu-jessie-manual.es.po | 37 ++++++++-------
.../debian-edu-jessie-manual.fr.po | 52 ++++++++++++++-------
.../debian-edu-jessie-manual.it.po | 51 +++++++++++++-------
.../debian-edu-jessie-manual.nb.po | 39 +++++++++++-----
.../debian-edu-jessie-manual.nl.po | 52 ++++++++++++++-------
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 20 ++++----
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 4 +-
.../debian-edu-jessie/images/de/worldmap.png | Bin 387002 -> 387010 bytes
.../debian-edu-jessie/images/es/worldmap.png | Bin 387106 -> 387116 bytes
.../debian-edu-jessie/images/fr/worldmap.png | Bin 387040 -> 387050 bytes
.../debian-edu-jessie/images/worldmap.png | Bin 387034 -> 387043 bytes
13 files changed, 219 insertions(+), 129 deletions(-)
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index 0e19465..76cbb5e 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2015-02-07 15:48+0000\n"
+"POT-Creation-Date: 2015-02-08 10:45+0000\n"
"PO-Revision-Date: 2014-10-21 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1178,16 +1178,11 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
msgstr "eth0 er forbundet til hovednetværket (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-#| "192.168.1.0/24)."
msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
+"possible</link>."
msgstr ""
-"eth1 bruges for betjening af tynde klienter (192.168.0.0/24 eller "
-"192.168.1.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1451,8 +1446,8 @@ msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
@@ -1492,8 +1487,8 @@ msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "Source image"
@@ -1525,8 +1520,9 @@ msgid ""
"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
"computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -6961,13 +6957,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
-"if different LTSP servers should serve both i386 and amd64 chroot "
-"environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file <computeroutput>/etc/network/interfaces</"
-"computeroutput> and adjust the eth1 settings accordingly. Use "
-"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
-"DNS and DHCP configuration."
+"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
+"different LTSP servers should serve both i386 and amd64 chroot environments "
+"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
+"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
+"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
+"or any other LDAP editor to inspect DNS and DHCP configuration."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -12332,6 +12327,17 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, fuzzy
+#~| msgid ""
+#~| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#~| "192.168.1.0/24)."
+#~ msgid ""
+#~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+#~ "192.168.1.0/24)."
+#~ msgstr ""
+#~ "eth1 bruges for betjening af tynde klienter (192.168.0.0/24 eller "
+#~ "192.168.1.0/24)."
+
#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
#~ msgstr "Regn med 2 GB RAM for 30 klienter og 4 GB RAM for 50-60 klienter."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index d548613..2a9da18 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-07 15:48+0000\n"
+"POT-Creation-Date: 2015-02-08 10:45+0000\n"
"PO-Revision-Date: 2015-02-07 18:20+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1192,11 +1192,10 @@ msgstr "eth0 ist verbunden mit dem Hauptnetzwerk (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
+"possible</link>."
msgstr ""
-"eth1 bedient LTSP Clients (192.168.0.0/24 per Voreinstellung oder "
-"192.168.1.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -7051,15 +7050,24 @@ msgid "Use a different LTSP client network"
msgstr "Ein anderes LTSP-Client-Netzwerk verwenden"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If loads of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
msgid ""
"192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
-"if different LTSP servers should serve both i386 and amd64 chroot "
-"environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file <computeroutput>/etc/network/interfaces</"
-"computeroutput> and adjust the eth1 settings accordingly. Use "
-"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
-"DNS and DHCP configuration."
+"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
+"different LTSP servers should serve both i386 and amd64 chroot environments "
+"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
+"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
+"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
+"or any other LDAP editor to inspect DNS and DHCP configuration."
msgstr ""
"192.168.0.0/24 ist das voreingestellte LTSP-Client-Netzwerk, wenn für die "
"Installation einer Maschine das Profil »Thin-Client-Server« gewählt wird. "
@@ -10104,8 +10112,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -12457,6 +12465,13 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid ""
+#~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+#~ "192.168.1.0/24)."
+#~ msgstr ""
+#~ "eth1 bedient LTSP Clients (192.168.0.0/24 per Voreinstellung oder "
+#~ "192.168.1.0/24)."
+
#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
#~ msgstr ""
#~ "Rechnen Sie mit ca. 2 GB RAM für 30 Clients oder 4 GB RAM für 50-60 "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index f672307..86942ff 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-07 15:48+0000\n"
+"POT-Creation-Date: 2015-02-08 10:45+0000\n"
"PO-Revision-Date: 2013-12-02 00:31-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1198,16 +1198,11 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
msgstr "eth0 conectada a la red principal (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-#| "192.168.1.0/24)."
msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
+"possible</link>."
msgstr ""
-"eth1 es usada para servir la red de clientes ligeros (192.168.0.0/24 o "
-"192.168.1.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -6613,13 +6608,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
-"if different LTSP servers should serve both i386 and amd64 chroot "
-"environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file <computeroutput>/etc/network/interfaces</"
-"computeroutput> and adjust the eth1 settings accordingly. Use "
-"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
-"DNS and DHCP configuration."
+"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
+"different LTSP servers should serve both i386 and amd64 chroot environments "
+"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
+"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
+"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
+"or any other LDAP editor to inspect DNS and DHCP configuration."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -11180,6 +11174,17 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, fuzzy
+#~| msgid ""
+#~| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#~| "192.168.1.0/24)."
+#~ msgid ""
+#~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+#~ "192.168.1.0/24)."
+#~ msgstr ""
+#~ "eth1 es usada para servir la red de clientes ligeros (192.168.0.0/24 o "
+#~ "192.168.1.0/24)."
+
#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
#~ msgstr ""
#~ "Considere al menos 2Gb de memoria RAM para 30 clientes, y 4GB para 50-60 "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index 1cd6266..ca9d87e 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-02-07 15:48+0000\n"
+"POT-Creation-Date: 2015-02-08 10:45+0000\n"
"PO-Revision-Date: 2014-12-23 23:13+0100\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1203,11 +1203,10 @@ msgstr "eth0 reliée au réseau principal (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
+"possible</link>."
msgstr ""
-"eth1 est utilisée pour servir les clients légers (192.168.0.0/24 par défaut "
-"ou 192.168.1.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1476,8 +1475,8 @@ msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
@@ -1518,8 +1517,8 @@ msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "Source image"
@@ -1551,8 +1550,9 @@ msgid ""
"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
"computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -7100,15 +7100,24 @@ msgid "Use a different LTSP client network"
msgstr "Utiliser un réseau différent pour les clients légers"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If loads of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
msgid ""
"192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
-"if different LTSP servers should serve both i386 and amd64 chroot "
-"environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file <computeroutput>/etc/network/interfaces</"
-"computeroutput> and adjust the eth1 settings accordingly. Use "
-"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
-"DNS and DHCP configuration."
+"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
+"different LTSP servers should serve both i386 and amd64 chroot environments "
+"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
+"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
+"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
+"or any other LDAP editor to inspect DNS and DHCP configuration."
msgstr ""
"192.168.0.0/24 est par défaut le réseau des clients légers si une machine "
"est installée en utilisant le profil serveur client léger. Si une quantité "
@@ -12589,6 +12598,13 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid ""
+#~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+#~ "192.168.1.0/24)."
+#~ msgstr ""
+#~ "eth1 est utilisée pour servir les clients légers (192.168.0.0/24 par "
+#~ "défaut ou 192.168.1.0/24)."
+
#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
#~ msgstr ""
#~ "Considérer 2 Gio de mémoire RAM pour 30 clients et 4 Gio pour "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index 86c31f8..8170b83 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-02-07 15:48+0000\n"
+"POT-Creation-Date: 2015-02-08 10:45+0000\n"
"PO-Revision-Date: 2014-12-19 20:45+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1182,10 +1182,10 @@ msgstr "eth0 connessa alla rete principale (10.0.0.0/8)"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
+"possible</link>."
msgstr ""
-"eth1 è usata per i client LTSP (192.168.0.0/24 di default o 192.168.1.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1448,8 +1448,8 @@ msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
@@ -1489,8 +1489,8 @@ msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "Source image"
@@ -1522,8 +1522,9 @@ msgid ""
"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
"computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -6964,15 +6965,24 @@ msgid "Use a different LTSP client network"
msgstr "Utilizzare una diversa rete per client LTSP"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If loads of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
msgid ""
"192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
-"if different LTSP servers should serve both i386 and amd64 chroot "
-"environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file <computeroutput>/etc/network/interfaces</"
-"computeroutput> and adjust the eth1 settings accordingly. Use "
-"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
-"DNS and DHCP configuration."
+"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
+"different LTSP servers should serve both i386 and amd64 chroot environments "
+"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
+"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
+"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
+"or any other LDAP editor to inspect DNS and DHCP configuration."
msgstr ""
"Se una macchina è installata usando il profilo Thin-Client-Server la rete "
"predefinita per i client LTSP è 192.168.0.0/24. Se sono usati molti client "
@@ -12364,6 +12374,13 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+#~ "192.168.1.0/24)."
+#~ msgstr ""
+#~ "eth1 è usata per i client LTSP (192.168.0.0/24 di default o "
+#~ "192.168.1.0/24)."
+
#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
#~ msgstr "occorrono 2 GB di RAM per 30 client e 4 GB di RAM per 50-60 client."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index 9893d79..9c21257 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-02-07 15:48+0000\n"
+"POT-Creation-Date: 2015-02-08 10:45+0000\n"
"PO-Revision-Date: 2015-01-31 17:45+0000\n"
"Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -1165,11 +1165,10 @@ msgstr "eth0 koblet til hovednettverket (10.0.2.0/23)"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
+"possible</link>."
msgstr ""
-"eth1 brukes til å betjene LTSP klienter (92.168.0.0/24 som standard eller "
-"192.168.1.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -6849,15 +6848,24 @@ msgid "Use a different LTSP client network"
msgstr "Bruk et annet nettverksoppsett for LTSP tynnklienter"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If loads of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
msgid ""
"192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
-"if different LTSP servers should serve both i386 and amd64 chroot "
-"environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file <computeroutput>/etc/network/interfaces</"
-"computeroutput> and adjust the eth1 settings accordingly. Use "
-"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
-"DNS and DHCP configuration."
+"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
+"different LTSP servers should serve both i386 and amd64 chroot environments "
+"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
+"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
+"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
+"or any other LDAP editor to inspect DNS and DHCP configuration."
msgstr ""
"192.168.0.0/24 er standard nettverksangivelse for LTSP tynnklienter når en "
"maskin installeres med tynnklient-tjener-profilen. Hvis et stort antall "
@@ -12165,6 +12173,13 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid ""
+#~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+#~ "192.168.1.0/24)."
+#~ msgstr ""
+#~ "eth1 brukes til å betjene LTSP klienter (92.168.0.0/24 som standard eller "
+#~ "192.168.1.0/24)."
+
#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
#~ msgstr ""
#~ "Vurder å ha 2 GB RAM for 30 klienter og 4 GB RAM for 50-60 klienter."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 333e42b..b29a0a5 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-02-07 15:48+0000\n"
+"POT-Creation-Date: 2015-02-08 10:45+0000\n"
"PO-Revision-Date: 2015-01-26 18:20+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"
@@ -1215,11 +1215,10 @@ msgstr "eth0 is verbonden met het hoofdnetwerk (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
+"possible</link>."
msgstr ""
-"eth1 wordt gebruikt om de LTSP clients (192.168.0.0/24 als standaardnetwerk "
-"of 192.168.1.0/24) te bedienen."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1489,8 +1488,8 @@ msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
@@ -1530,8 +1529,8 @@ msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "Source image"
@@ -1563,8 +1562,9 @@ msgid ""
"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
"computeroutput>"
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -7202,15 +7202,24 @@ msgid "Use a different LTSP client network"
msgstr "Gebruik een verschillend LTSP clientnetwerk"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If loads of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
msgid ""
"192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
-"if different LTSP servers should serve both i386 and amd64 chroot "
-"environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file <computeroutput>/etc/network/interfaces</"
-"computeroutput> and adjust the eth1 settings accordingly. Use "
-"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
-"DNS and DHCP configuration."
+"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
+"different LTSP servers should serve both i386 and amd64 chroot environments "
+"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
+"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
+"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
+"or any other LDAP editor to inspect DNS and DHCP configuration."
msgstr ""
"Indien een computer geïnstalleerd wordt met behulp van het profiel Thin-"
"Client-Server, is het standaard LTSP clientnetwerk 192.168.0.0/24. Indien er "
@@ -12757,6 +12766,13 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+#~ "192.168.1.0/24)."
+#~ msgstr ""
+#~ "eth1 wordt gebruikt om de LTSP clients (192.168.0.0/24 als "
+#~ "standaardnetwerk of 192.168.1.0/24) te bedienen."
+
#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
#~ msgstr ""
#~ "Voorzie 2 GB RAM in het geval van 30 clients en 4 GB RAM bij 50-60 "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index af297c2..d2e4094 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-07 15:48+0000\n"
+"POT-Creation-Date: 2015-02-08 10:45+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"
@@ -866,8 +866,9 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
+"possible</link>."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -5107,13 +5108,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
-"if different LTSP servers should serve both i386 and amd64 chroot "
-"environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file <computeroutput>/etc/network/interfaces</"
-"computeroutput> and adjust the eth1 settings accordingly. Use "
-"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
-"DNS and DHCP configuration."
+"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
+"different LTSP servers should serve both i386 and amd64 chroot environments "
+"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
+"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
+"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
+"or any other LDAP editor to inspect DNS and DHCP configuration."
msgstr ""
#. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 6bab82e..42f22da 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -350,7 +350,7 @@
<para>eth0 is connected to the main network (10.0.0.0/8),
</para></listitem>
<listitem>
-<para>eth1 is used for serving LTSP clients (192.168.0.0/24 as default or 192.168.1.0/24).
+<para>eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link linkend="NetworkClients--Use_a_different_LTSP_client_network">others are possible</link>.
</para></listitem></itemizedlist></listitem>
<listitem>
<para>Laptops are movable workstations, so they have the same requirements as workstations.
@@ -2200,7 +2200,7 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
<section id="NetworkClients--Use_a_different_LTSP_client_network">
<title>Use a different LTSP client network
</title>
-<para>192.168.0.0/24 is the default LTSP client network if a machine is installed using the Thin-Client-Server profile. If loads of LTSP clients are used or if different LTSP servers should serve both i386 and amd64 chroot environments the second preconfigured network 192.168.1.0/24 could be used as well. Edit the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any other LDAP editor to [...]
+<para>192.168.0.0/24 is the default LTSP client network if a machine is installed using the Thin-Client-Server profile. If lots of LTSP clients are used or if different LTSP servers should serve both i386 and amd64 chroot environments the second preconfigured network 192.168.1.0/24 could be used as well. Edit the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any other LDAP editor to i [...]
</para>
</section>
</section>
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index 1e83e01..f3a9281 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index 61daf4d..bb399c4 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index 21e5bc5..eeb9b80 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index 41946b0..ab0292d 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ
--
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