[debian-edu-commits] debian-edu/debian-edu-doc.git (#1468) - master (branch) updated: 1.5_20130228_7.0-4-g06c91ae
David Prévot
taffit at alioth.debian.org
Thu May 9 16:21:31 UTC 2013
The branch, master has been updated
via 06c91ae203d822f2053e193cd89e7d98bbca9df1 (commit)
from a81d8398a5c3dbfa6fa4bc0c67014cb0a292f730 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 06c91ae203d822f2053e193cd89e7d98bbca9df1
Author: David Prévot <taffit at debian.org>
Date: Thu May 9 12:20:42 2013 -0400
Update manuals and images from wiki; PO files +2f
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386808 -> 386732 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386913 -> 386838 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386850 -> 386773 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386843 -> 386766 bytes
.../debian-edu-wheezy-manual.da.po | 20 +++++----
.../debian-edu-wheezy-manual.de.po | 43 +++++++++++++-------
.../debian-edu-wheezy-manual.es.po | 20 +++++----
.../debian-edu-wheezy-manual.fr.po | 20 +++++----
.../debian-edu-wheezy-manual.it.po | 20 +++++----
.../debian-edu-wheezy-manual.nb.po | 24 ++++++-----
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 20 +++++----
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 8 ++-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386808 -> 386732 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386913 -> 386838 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386850 -> 386773 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386843 -> 386766 bytes
16 files changed, 102 insertions(+), 73 deletions(-)
The diff of changes is:
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 9df4e2e..f05f2c5 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index a5a33d6..1b67525 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index f9b0494..facd526 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 09aade3..0dc9e52 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 3f1ff59..1aedb38 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-05-07 16:03-0400\n"
+"POT-Creation-Date: 2013-05-09 12:17-0400\n"
"PO-Revision-Date: 2013-02-15 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2014,11 +2014,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The ordering of the network cards after installation can differ from the "
-"ordering during installation. The wanted ordering could be achieved by "
-"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
-"needed for the changes to take effect."
+"The ordering of the network cards after installation might differ from the "
+"ordering during installation. The wanted ordering can be achieved by editing "
+"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
+"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
+"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
+"effect."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2306,8 +2307,9 @@ msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
#| "GOsa² just like normal workstations or thin client servers."
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
-"on the main network. Unlike workstations, diskless workstations don't need "
-"to be added with GOsa² (but could be)."
+"on the main network. Unlike workstations, diskless workstations don't have "
+"to be added to LDAP with GOsa², but can be, for example if you want to force "
+"the hostname."
msgstr ""
"Denne opsætning tillader at diskløse arbejdsstationer og tynde klienter kan "
"startes op fra hovednetværket. Diskløse arbejdsstationer skal tilføjes med "
@@ -5759,7 +5761,7 @@ msgstr ""
"serveren. Diskløse arbejdsstationer er en glimrende måde at genbruge nyere "
"udstyr med den same lave vedligeholdelsesomkostning som tynde klienter."
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"LTSP defines 320MB as the default minimum amount of RAM for diskless "
"workstations. If the amount of RAM is less, the machine will boot as thin "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 2fdd65d..7818633 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-07 16:03-0400\n"
+"POT-Creation-Date: 2013-05-09 12:17-0400\n"
"PO-Revision-Date: 2013-05-08 23:09+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2011,12 +2011,20 @@ msgstr ""
"damit sie dem Zweck entsprechend genutzt werden kann."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The ordering of the network cards after installation can differ from the "
+#| "ordering during installation. The wanted ordering could be achieved by "
+#| "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#| "computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
+#| "needed for the changes to take effect."
msgid ""
-"The ordering of the network cards after installation can differ from the "
-"ordering during installation. The wanted ordering could be achieved by "
-"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
-"needed for the changes to take effect."
+"The ordering of the network cards after installation might differ from the "
+"ordering during installation. The wanted ordering can be achieved by editing "
+"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
+"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
+"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
+"effect."
msgstr ""
"Nach der Installation kann die Reihenfolge der Netzwerkkarten anders sein "
"als während der Installation. Die gewünschte Reihenfolge kan durch Editieren "
@@ -2309,10 +2317,16 @@ msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This setup also allows diskless workstations and thin clients to be "
+#| "booted on the main network. Unlike workstations, diskless workstations "
+#| "don't need to be added with GOsa² (but could be)."
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
-"on the main network. Unlike workstations, diskless workstations don't need "
-"to be added with GOsa² (but could be)."
+"on the main network. Unlike workstations, diskless workstations don't have "
+"to be added to LDAP with GOsa², but can be, for example if you want to force "
+"the hostname."
msgstr ""
"Dieses Setup erlaubt es, Diskless Workstations und Thin Clients aus dem "
"Hauptnetzwerk zu booten. Im Unterschied zu normalen Arbeitsplatzrechner "
@@ -4916,13 +4930,12 @@ msgid "Using backports is simple:"
msgstr "Die Nutzung von backports ist einfach:"
#. type: CDATA
+#, no-wrap
msgid ""
-"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
"apt-get update"
msgstr ""
-"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
"apt-get update"
#. type: Content of: <article><section><section><para>
@@ -5805,7 +5818,7 @@ msgstr ""
"Möglichkeit, neuere Hardware mit ebenso geringem Wartungsaufwand wie Thin "
"Clients verwenden zu können."
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"LTSP defines 320MB as the default minimum amount of RAM for diskless "
"workstations. If the amount of RAM is less, the machine will boot as thin "
@@ -9054,8 +9067,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 "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 28ad9aa..959c579 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-07 16:03-0400\n"
+"POT-Creation-Date: 2013-05-09 12:17-0400\n"
"PO-Revision-Date: 2012-06-16 18:34-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -2490,11 +2490,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The ordering of the network cards after installation can differ from the "
-"ordering during installation. The wanted ordering could be achieved by "
-"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
-"needed for the changes to take effect."
+"The ordering of the network cards after installation might differ from the "
+"ordering during installation. The wanted ordering can be achieved by editing "
+"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
+"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
+"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
+"effect."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2844,8 +2845,9 @@ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
#| "normal workstations or thin client servers."
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
-"on the main network. Unlike workstations, diskless workstations don't need "
-"to be added with GOsa² (but could be)."
+"on the main network. Unlike workstations, diskless workstations don't have "
+"to be added to LDAP with GOsa², but can be, for example if you want to force "
+"the hostname."
msgstr ""
"Esta opción permite iniciar a las estaciones sin disco y clientes delgados a "
"través de la red principal. Las estaciones sin disco deben de ser agregadas "
@@ -6033,7 +6035,7 @@ msgstr ""
"sin necesidad de instalaciones en los clientes. Los directorios home y las "
"configuraciones de sistema son guardadas en el servidor."
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"LTSP defines 320MB as the default minimum amount of RAM for diskless "
"workstations. If the amount of RAM is less, the machine will boot as thin "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 6978179..7584787 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-05-07 16:03-0400\n"
+"POT-Creation-Date: 2013-05-09 12:17-0400\n"
"PO-Revision-Date: 2013-01-20 22:51+0100\n"
"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2069,11 +2069,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The ordering of the network cards after installation can differ from the "
-"ordering during installation. The wanted ordering could be achieved by "
-"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
-"needed for the changes to take effect."
+"The ordering of the network cards after installation might differ from the "
+"ordering during installation. The wanted ordering can be achieved by editing "
+"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
+"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
+"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
+"effect."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2369,8 +2370,9 @@ msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
#| "GOsa² just like normal workstations or thin client servers."
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
-"on the main network. Unlike workstations, diskless workstations don't need "
-"to be added with GOsa² (but could be)."
+"on the main network. Unlike workstations, diskless workstations don't have "
+"to be added to LDAP with GOsa², but can be, for example if you want to force "
+"the hostname."
msgstr ""
"Cette configuration permet également d'amorcer des stations de travail sans "
"disque et des clients légers à partir du réseau principal. Les stations de "
@@ -5916,7 +5918,7 @@ msgstr ""
"façon de réutiliser du matériel plus récent avec le même coût réduit de "
"maintenance que les clients légers."
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"LTSP defines 320MB as the default minimum amount of RAM for diskless "
"workstations. If the amount of RAM is less, the machine will boot as thin "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 99b1f39..9b3473e 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-05-07 16:03-0400\n"
+"POT-Creation-Date: 2013-05-09 12:17-0400\n"
"PO-Revision-Date: 2013-01-23 19:02+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -2026,11 +2026,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The ordering of the network cards after installation can differ from the "
-"ordering during installation. The wanted ordering could be achieved by "
-"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
-"needed for the changes to take effect."
+"The ordering of the network cards after installation might differ from the "
+"ordering during installation. The wanted ordering can be achieved by editing "
+"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
+"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
+"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
+"effect."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2315,8 +2316,9 @@ msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
#| "GOsa² just like normal workstations or thin client servers."
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
-"on the main network. Unlike workstations, diskless workstations don't need "
-"to be added with GOsa² (but could be)."
+"on the main network. Unlike workstations, diskless workstations don't have "
+"to be added to LDAP with GOsa², but can be, for example if you want to force "
+"the hostname."
msgstr ""
"Questa configurazione permette anche di avviare diskless workstation e thin "
"client sulla rete principale. Le diskless workstation devono essere aggiunte "
@@ -5783,7 +5785,7 @@ msgstr ""
"riusare hardware più nuovo con gli stessi bassi costi di manutenzione dei "
"thin clients."
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"LTSP defines 320MB as the default minimum amount of RAM for diskless "
"workstations. If the amount of RAM is less, the machine will boot as thin "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index c38cfc3..64922a9 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-05-07 16:03-0400\n"
+"POT-Creation-Date: 2013-05-09 12:17-0400\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -2357,11 +2357,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The ordering of the network cards after installation can differ from the "
-"ordering during installation. The wanted ordering could be achieved by "
-"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
-"needed for the changes to take effect."
+"The ordering of the network cards after installation might differ from the "
+"ordering during installation. The wanted ordering can be achieved by editing "
+"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
+"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
+"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
+"effect."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2684,8 +2685,9 @@ msgstr ""
#| "normal workstations or thin client servers."
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
-"on the main network. Unlike workstations, diskless workstations don't need "
-"to be added with GOsa² (but could be)."
+"on the main network. Unlike workstations, diskless workstations don't have "
+"to be added to LDAP with GOsa², but can be, for example if you want to force "
+"the hostname."
msgstr ""
"Dette oppsettet gjør at man også kan starte diskløse arbeidsstasjoener og "
"tynnklienter på hovednettet. Diskløse arbeidsstasjoener må legges til i LWAT "
@@ -6281,7 +6283,7 @@ msgstr ""
"maskinvare med det samme lave vedlikeholdsbehovet som tynne klienter. "
"Hjemmeområder og systeminnstillinger lagres også på serveren."
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"LTSP defines 320MB as the default minimum amount of RAM for diskless "
"workstations. If the amount of RAM is less, the machine will boot as thin "
@@ -11703,7 +11705,9 @@ msgstr ""
#, fuzzy
#~ msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-#~ msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+#~ msgstr ""
+#~ "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/"
+#~ "pxelinux.cfg/default"
#, fuzzy
#~ msgid ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index f49e24a..58f863b 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-05-07 16:03-0400\n"
+"POT-Creation-Date: 2013-05-09 12:17-0400\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"
@@ -1473,11 +1473,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The ordering of the network cards after installation can differ from the "
-"ordering during installation. The wanted ordering could be achieved by "
-"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
-"needed for the changes to take effect."
+"The ordering of the network cards after installation might differ from the "
+"ordering during installation. The wanted ordering can be achieved by editing "
+"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
+"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
+"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
+"effect."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1692,8 +1693,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
-"on the main network. Unlike workstations, diskless workstations don't need "
-"to be added with GOsa² (but could be)."
+"on the main network. Unlike workstations, diskless workstations don't have "
+"to be added to LDAP with GOsa², but can be, for example if you want to force "
+"the hostname."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -4207,7 +4209,7 @@ msgid ""
"with the same low maintenance cost as with thin clients."
msgstr ""
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"LTSP defines 320MB as the default minimum amount of RAM for diskless "
"workstations. If the amount of RAM is less, the machine will boot as thin "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 0f519ec..e222676 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -626,7 +626,7 @@ FIXME: the DVD and source DVD download URLs need to be adapted for wheezy still.
</para></listitem></itemizedlist></listitem></itemizedlist>
<para>The <emphasis role="strong">Main Server</emphasis>, <emphasis role="strong">Workstation</emphasis> and <emphasis role="strong">Thin Client Server</emphasis> profiles are preselected. These profiles can be installed on one machine together if you want to install a so called <emphasis>combined main server</emphasis>. This means the main server will be a thin client server and also be used as a workstation. This is the default choice, since we assume most people will install <link linkend="Installation--Installation_over_the_network_.28PXE.29_and_booting_diskless_clients">via PXE</link> afterwards. Please note that you must have 2 network cards installed in a machine which is going to be installed as a combined main server or as a thin client server to become usefull after the installation.
</para></listitem></itemizedlist>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The ordering of the network cards after installation can differ from the ordering during installation. The wanted ordering could be achieved by editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is needed for the changes to take effect.
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The ordering of the network cards after installation might differ from the ordering during installation. The wanted ordering can be achieved by editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for the changes to take effect.
</para>
<itemizedlist>
<listitem>
@@ -735,7 +735,7 @@ FIXME Check these numbers for Wheezy. They are 2012-01-22 for Lenny.
</para>
<para>[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]
</para>
-<para>This setup also allows diskless workstations and thin clients to be booted on the main network. Unlike workstations, diskless workstations don't need to be added with GOsa² (but could be).
+<para>This setup also allows diskless workstations and thin clients to be booted on the main network. Unlike workstations, diskless workstations don't have to be added to LDAP with GOsa², but can be, for example if you want to force the hostname.
</para>
<para>More information about network clients can be found in the <link linkend="NetworkClients">Network clients HowTo</link> chapter.
</para>
@@ -1901,8 +1901,10 @@ apt-get update]]></screen>
<para><emphasis role="strong">Diskless workstation</emphasis>
</para>
<itemizedlist><listitem override="none">
-<para>A diskless workstation runs all software locally. The client machines boot directly from the LTSP server without a local hard drive. Software is administered and maintained on the LTSP server, but it runs on the diskless workstation. Home directories and system settings are stored on the server too. Diskless workstations are an excellent way of reusing newer hardware with the same low maintenance cost as with thin clients. <inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. Unlike workstations, diskless workstations run without any need to add them with GOsa².
+<para>A diskless workstation runs all software locally. The client machines boot directly from the LTSP server without a local hard drive. Software is administered and maintained on the LTSP server, but it runs on the diskless workstation. Home directories and system settings are stored on the server too. Diskless workstations are an excellent way of reusing newer hardware with the same low maintenance cost as with thin clients.
</para></listitem></itemizedlist>
+<para>LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. Unlike workstations, diskless workstations run without any need to add them with GOsa².
+</para>
<para>LTSP client boot will fail if the client's network card requires a non-free firmware. A PXE installation can be used for troubleshooting problems with netbooting a machine; if the Debian Installer complains about a missing XXX.bin file then non-free firmware has to be added to the initrd used by LTSP clients.
</para>
<para>In this case execute the following commands on an LTSP server.
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 9df4e2e..f05f2c5 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index a5a33d6..1b67525 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index f9b0494..facd526 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 09aade3..0dc9e52 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list