[debian-edu-commits] debian-edu/debian-edu-doc.git (#1592) - master (branch) updated: 1.5_20130915_7.1-1-ge747d10
Holger Levsen
holger at alioth.debian.org
Tue Sep 17 12:17:44 UTC 2013
The branch, master has been updated
via e747d10ae5b43dc9b2b084185d6ac0db30d164bd (commit)
from 82cff05e98b64371a8fae71a2d22a61cf3dee8b4 (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 e747d10ae5b43dc9b2b084185d6ac0db30d164bd
Author: Holger Levsen <holger at layer-acht.org>
Date: Tue Sep 17 14:17:38 2013 +0200
Update manual and images from the wiki
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 +
documentation/audacity/audacity-manual.pot | 2 +-
.../debian-edu-squeeze-manual.pot | 2 +-
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386841 -> 386842 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386949 -> 386950 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386891 -> 386892 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386892 -> 386893 bytes
.../debian-edu-wheezy-manual.da.po | 46 +++--
.../debian-edu-wheezy-manual.de.po | 50 ++++--
.../debian-edu-wheezy-manual.es.po | 41 +++--
.../debian-edu-wheezy-manual.fr.po | 46 +++--
.../debian-edu-wheezy-manual.it.po | 74 +++++---
.../debian-edu-wheezy-manual.nb.po | 185 +++++++++++---------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 27 +--
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 9 +-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386841 -> 386842 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386949 -> 386950 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386891 -> 386892 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386892 -> 386893 bytes
documentation/rosegarden/rosegarden-manual.pot | 2 +-
20 files changed, 326 insertions(+), 164 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 82dc6b4..15bc495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu-doc (1.5~20130921~7.1) UNRELEASED; urgency=low
+
+ * Update manual and images from the wiki
+
+ -- Holger Levsen <holger at debian.org> Tue, 17 Sep 2013 14:16:54 +0200
+
debian-edu-doc (1.5~20130915~7.1) unstable; urgency=low
* Update manual and images from the wiki
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index 40e329f..7a174d0 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-14 15:57+0300\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\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"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index 25a3782..5a383ab 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-14 15:56+0300\n"
+"POT-Creation-Date: 2013-09-17 14:15+0300\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"
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 45ba13b..d16377d 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 40741d8..f8aabe5 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 0a23804..156ecc5 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 fe0c920..854a3ec 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 8f0db6c..45a2950 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-09-14 21:45-0400\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\n"
"PO-Revision-Date: 2013-09-14 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -185,15 +185,25 @@ msgid "The Debian Edu network topology"
msgstr "Debian Edu's netværkstopologi"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients). The number of workstations "
+#| "can be as large or small as you want (starting from none to a lot). The "
+#| "same goes for the thin-client servers, each of which is on a separate "
+#| "network so that the traffic between the thin-clients and the thin-client "
+#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients). The number of workstations can be as "
-"large or small as you want (starting from none to a lot). The same goes for "
-"the thin-client servers, each of which is on a separate network so that the "
-"traffic between the thin-clients and the thin-client server doesn't affect "
-"the rest of the network services."
+"servers (with associated thin-clients and/or diskless workstations). The "
+"number of workstations can be as large or small as you want (starting from "
+"none to a lot). The same goes for the thin-client servers, each of which is "
+"on a separate network so that the traffic between the clients and the thin-"
+"client server doesn't affect the rest of the network services."
msgstr ""
"Figuren er en tegning af den forventede netværkstopologi. "
"Standardopsætningen for et Skolelinuxnetværk antager, at der er en (og kun "
@@ -727,9 +737,13 @@ msgid "LTSP server(s) (Thin client server(s))"
msgstr "LTSP-servere (servere for tynde klienter)"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the LTSP server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the LTSP server profile."
+"servers), which are installed by selecting the Thin client server profile."
msgstr ""
"Et netværk for Skolelinux kan have mange LTSP-servere (også kaldt for "
"servere for tynde klienter), som installeres ved at vælge LTSP-"
@@ -889,10 +903,15 @@ msgid "Installation"
msgstr "Installation"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Currently there are three kinds of installation media images: netinstall "
+#| "(CD) and i386-only DVD and multi-arch USB flash drive. All of these "
+#| "images can also be booted from USB sticks."
msgid ""
-"Currently there are three kinds of installation media images: netinstall "
-"(CD) and i386-only DVD and multi-arch USB flash drive. All of these images "
-"can also be booted from USB sticks."
+"Currently there are two kinds of installation media images: netinstall (CD) "
+"and multi-arch USB flash drive. Both images can also be booted from USB "
+"sticks."
msgstr ""
"Aktuelt er der tre typer af installationsmedier: netinstall (cd) og i386-kun "
"dvd og og flerarkitektur USB-drev. Alle disse aftryk kan også indlæses fra "
@@ -9025,6 +9044,13 @@ msgstr "LTSP-diskløse arbejdsstationer kører uden nogen konfiguration."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"On the dedicated client network of thin client servers (default "
+"192.168.0.0/24), machines run by default as diskless workstations if they "
+"are powerful enough."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"GOsa gui: Now some options that seemed to be available, but are non "
"functional, are greyed out (or are not clickable). Some tabs are completely "
"hidden to the end user, others even to the GOsa admin."
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 a99c48d..3660f72 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-09-14 21:45-0400\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\n"
"PO-Revision-Date: 2013-09-14 22:31+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -201,15 +201,25 @@ msgid "The Debian Edu network topology"
msgstr "Die Struktur des Debian-Edu -Netzwerks"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients). The number of workstations "
+#| "can be as large or small as you want (starting from none to a lot). The "
+#| "same goes for the thin-client servers, each of which is on a separate "
+#| "network so that the traffic between the thin-clients and the thin-client "
+#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients). The number of workstations can be as "
-"large or small as you want (starting from none to a lot). The same goes for "
-"the thin-client servers, each of which is on a separate network so that the "
-"traffic between the thin-clients and the thin-client server doesn't affect "
-"the rest of the network services."
+"servers (with associated thin-clients and/or diskless workstations). The "
+"number of workstations can be as large or small as you want (starting from "
+"none to a lot). The same goes for the thin-client servers, each of which is "
+"on a separate network so that the traffic between the clients and the thin-"
+"client server doesn't affect the rest of the network services."
msgstr ""
"Die Abbildung skizziert die angenommene Netzwerkstruktur. Die "
"Standardeinstellung von Skolelinux setzt genau einen Hauptserver »Tjener« "
@@ -751,9 +761,13 @@ msgid "LTSP server(s) (Thin client server(s))"
msgstr "LTSP-Server (Terminal-Server)"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the LTSP server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the LTSP server profile."
+"servers), which are installed by selecting the Thin client server profile."
msgstr ""
"Ein Skolelinux-Netzwerk kann mehrere LTSP-Server (auch Terminal-Server "
"genannt) enthalten. Die Installation erfolgt durch Auswahl des Profils "
@@ -779,8 +793,8 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
-"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
+"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
"Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
"Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
"Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -914,10 +928,15 @@ msgid "Installation"
msgstr "Installation"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Currently there are three kinds of installation media images: netinstall "
+#| "(CD) and i386-only DVD and multi-arch USB flash drive. All of these "
+#| "images can also be booted from USB sticks."
msgid ""
-"Currently there are three kinds of installation media images: netinstall "
-"(CD) and i386-only DVD and multi-arch USB flash drive. All of these images "
-"can also be booted from USB sticks."
+"Currently there are two kinds of installation media images: netinstall (CD) "
+"and multi-arch USB flash drive. Both images can also be booted from USB "
+"sticks."
msgstr ""
"Gegenwärtig gibt es drei Arten von Installationsmedien: »Netinst-CD«, DVD "
"(ausschließlich für i386) »Multiarch-USB-Stick«. Alle können auch von einem "
@@ -9251,6 +9270,13 @@ msgstr "LTSP Diskless Workstations benötigen keine Konfiguration."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"On the dedicated client network of thin client servers (default "
+"192.168.0.0/24), machines run by default as diskless workstations if they "
+"are powerful enough."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"GOsa gui: Now some options that seemed to be available, but are non "
"functional, are greyed out (or are not clickable). Some tabs are completely "
"hidden to the end user, others even to the GOsa admin."
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 f2acfd9..b4c3931 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-09-14 21:45-0400\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\n"
"PO-Revision-Date: 2013-09-09 16:37-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -194,15 +194,25 @@ msgid "The Debian Edu network topology"
msgstr "La Topología de red de Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients). The number of workstations "
+#| "can be as large or small as you want (starting from none to a lot). The "
+#| "same goes for the thin-client servers, each of which is on a separate "
+#| "network so that the traffic between the thin-clients and the thin-client "
+#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients). The number of workstations can be as "
-"large or small as you want (starting from none to a lot). The same goes for "
-"the thin-client servers, each of which is on a separate network so that the "
-"traffic between the thin-clients and the thin-client server doesn't affect "
-"the rest of the network services."
+"servers (with associated thin-clients and/or diskless workstations). The "
+"number of workstations can be as large or small as you want (starting from "
+"none to a lot). The same goes for the thin-client servers, each of which is "
+"on a separate network so that the traffic between the clients and the thin-"
+"client server doesn't affect the rest of the network services."
msgstr ""
"La figura es un esquema propuesto de la topología de red. La configuración "
"predeterminada de Skolelinux asume que hay un (y sólo uno) servidor "
@@ -817,9 +827,13 @@ msgid "LTSP server(s) (Thin client server(s))"
msgstr "Servidor(es) LTSP (Thin client server(s))"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the LTSP server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the LTSP server profile."
+"servers), which are installed by selecting the Thin client server profile."
msgstr ""
"Una red Skolinux puede tener muchos servidores LTSP (tambin llamado servidor "
"de clientes ligeros), que pueden ser instalados seleccionadoel perfil "
@@ -1032,9 +1046,9 @@ msgstr "Instalación"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
-"Currently there are three kinds of installation media images: netinstall "
-"(CD) and i386-only DVD and multi-arch USB flash drive. All of these images "
-"can also be booted from USB sticks."
+"Currently there are two kinds of installation media images: netinstall (CD) "
+"and multi-arch USB flash drive. Both images can also be booted from USB "
+"sticks."
msgstr ""
"Actualmente hay dos medios de instalación: instalación por red desde un CD e "
"instalación multi arquitectura desde un DVD. Ambos medios pueden ser "
@@ -8898,6 +8912,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"On the dedicated client network of thin client servers (default "
+"192.168.0.0/24), machines run by default as diskless workstations if they "
+"are powerful enough."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"GOsa gui: Now some options that seemed to be available, but are non "
"functional, are greyed out (or are not clickable). Some tabs are completely "
"hidden to the end user, others even to the GOsa admin."
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 51e3556..0a6aa9b 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: debian-edu-doc\n"
-"POT-Creation-Date: 2013-09-14 21:45-0400\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\n"
"PO-Revision-Date: 2013-09-14 23:42+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -190,15 +190,25 @@ msgid "The Debian Edu network topology"
msgstr "Topologie du réseau Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients). The number of workstations "
+#| "can be as large or small as you want (starting from none to a lot). The "
+#| "same goes for the thin-client servers, each of which is on a separate "
+#| "network so that the traffic between the thin-clients and the thin-client "
+#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients). The number of workstations can be as "
-"large or small as you want (starting from none to a lot). The same goes for "
-"the thin-client servers, each of which is on a separate network so that the "
-"traffic between the thin-clients and the thin-client server doesn't affect "
-"the rest of the network services."
+"servers (with associated thin-clients and/or diskless workstations). The "
+"number of workstations can be as large or small as you want (starting from "
+"none to a lot). The same goes for the thin-client servers, each of which is "
+"on a separate network so that the traffic between the clients and the thin-"
+"client server doesn't affect the rest of the network services."
msgstr ""
"Le diagramme est un schéma de la topologie supposée du réseau. La "
"configuration par défaut d'un réseau Skolelinux suppose qu'il y a un (et un "
@@ -744,9 +754,13 @@ msgid "LTSP server(s) (Thin client server(s))"
msgstr "Serveurs LTSP (serveurs de clients légers)"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the LTSP server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the LTSP server profile."
+"servers), which are installed by selecting the Thin client server profile."
msgstr ""
"Un réseau Skolelinux peut avoir plusieurs serveurs LTSP (aussi appelés "
"serveurs de clients légers) qui sont installés en sélectionnant le profil de "
@@ -910,10 +924,15 @@ msgid "Installation"
msgstr "Installation"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Currently there are three kinds of installation media images: netinstall "
+#| "(CD) and i386-only DVD and multi-arch USB flash drive. All of these "
+#| "images can also be booted from USB sticks."
msgid ""
-"Currently there are three kinds of installation media images: netinstall "
-"(CD) and i386-only DVD and multi-arch USB flash drive. All of these images "
-"can also be booted from USB sticks."
+"Currently there are two kinds of installation media images: netinstall (CD) "
+"and multi-arch USB flash drive. Both images can also be booted from USB "
+"sticks."
msgstr ""
"Trois types de supports d'installation sont actuellement disponibles : le CD "
"d'installation par le réseau, le DVD pour l'architecture i386 et la clé USB "
@@ -9304,6 +9323,13 @@ msgstr "Les stations de travail sans disque fonctionnent sans configuration."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"On the dedicated client network of thin client servers (default "
+"192.168.0.0/24), machines run by default as diskless workstations if they "
+"are powerful enough."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"GOsa gui: Now some options that seemed to be available, but are non "
"functional, are greyed out (or are not clickable). Some tabs are completely "
"hidden to the end user, others even to the GOsa admin."
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 a28d62d..dba5975 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-09-14 21:45-0400\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\n"
"PO-Revision-Date: 2013-09-03 18:15+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -199,15 +199,25 @@ msgid "The Debian Edu network topology"
msgstr "La topologia della rete Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients). The number of workstations "
+#| "can be as large or small as you want (starting from none to a lot). The "
+#| "same goes for the thin-client servers, each of which is on a separate "
+#| "network so that the traffic between the thin-clients and the thin-client "
+#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients). The number of workstations can be as "
-"large or small as you want (starting from none to a lot). The same goes for "
-"the thin-client servers, each of which is on a separate network so that the "
-"traffic between the thin-clients and the thin-client server doesn't affect "
-"the rest of the network services."
+"servers (with associated thin-clients and/or diskless workstations). The "
+"number of workstations can be as large or small as you want (starting from "
+"none to a lot). The same goes for the thin-client servers, each of which is "
+"on a separate network so that the traffic between the clients and the thin-"
+"client server doesn't affect the rest of the network services."
msgstr ""
"elta per la figura rappresenta uno chema della topologia scdi rete. La "
"configurazione predefinita di una rete Skolelinux presuppone uno e un solo "
@@ -749,9 +759,13 @@ msgid "LTSP server(s) (Thin client server(s))"
msgstr "Server LTSP (server di thin-client)"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the LTSP server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the LTSP server profile."
+"servers), which are installed by selecting the Thin client server profile."
msgstr ""
"Una rete Skolelinux può avere diversi server LTSP (chiamati anche server di "
"thin-client), che sono installati selezionando il profilo LTSP server."
@@ -908,10 +922,15 @@ msgid "Installation"
msgstr "Installazione"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Currently there are three kinds of installation media images: netinstall "
+#| "(CD) and i386-only DVD and multi-arch USB flash drive. All of these "
+#| "images can also be booted from USB sticks."
msgid ""
-"Currently there are three kinds of installation media images: netinstall "
-"(CD) and i386-only DVD and multi-arch USB flash drive. All of these images "
-"can also be booted from USB sticks."
+"Currently there are two kinds of installation media images: netinstall (CD) "
+"and multi-arch USB flash drive. Both images can also be booted from USB "
+"sticks."
msgstr ""
"Attualmente ci sono due tipi di supporti di installazione: installazione da "
"rete (CD netinst), DVD solo con architettura i386 e flash drive USB per "
@@ -6604,8 +6623,8 @@ msgid ""
msgstr ""
"I valori predefiniti sono definiti in <computeroutput>[default]</"
"computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
+"</computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -9118,6 +9137,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"On the dedicated client network of thin client servers (default "
+"192.168.0.0/24), machines run by default as diskless workstations if they "
+"are powerful enough."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"GOsa gui: Now some options that seemed to be available, but are non "
"functional, are greyed out (or are not clickable). Some tabs are completely "
"hidden to the end user, others even to the GOsa admin."
@@ -15800,13 +15826,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -15818,8 +15844,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15827,8 +15853,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15845,8 +15871,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15854,8 +15880,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
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 1d3b523..2981e90 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-09-14 21:45-0400\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\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"
@@ -172,15 +172,25 @@ msgid "The Debian Edu network topology"
msgstr "Krav for nettverksoppsett"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients). The number of workstations "
+#| "can be as large or small as you want (starting from none to a lot). The "
+#| "same goes for the thin-client servers, each of which is on a separate "
+#| "network so that the traffic between the thin-clients and the thin-client "
+#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients). The number of workstations can be as "
-"large or small as you want (starting from none to a lot). The same goes for "
-"the thin-client servers, each of which is on a separate network so that the "
-"traffic between the thin-clients and the thin-client server doesn't affect "
-"the rest of the network services."
+"servers (with associated thin-clients and/or diskless workstations). The "
+"number of workstations can be as large or small as you want (starting from "
+"none to a lot). The same goes for the thin-client servers, each of which is "
+"on a separate network so that the traffic between the clients and the thin-"
+"client server doesn't affect the rest of the network services."
msgstr ""
"Figuren er en skisse over den forventede nettverkstopologien. "
"Standardoppsettet til et skolelinuxnettverk forventer at det er en (og bare "
@@ -727,9 +737,13 @@ msgid "LTSP server(s) (Thin client server(s))"
msgstr "LTSP tjenere (tynnklienttjener(e))"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the LTSP server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the LTSP server profile."
+"servers), which are installed by selecting the Thin client server profile."
msgstr ""
"Et Skolelinuxnett kan ha mange LTSP-tjenere (tynnklienttjenere), som "
"installeres ved å velge profilen tynnklienttjener."
@@ -754,10 +768,10 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
"Terminal Server Project (LTSP)."
#. type: Content of: <article><section><section><section><para>
@@ -891,9 +905,9 @@ msgstr "Installasjon"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Currently there are three kinds of installation media images: netinstall "
-"(CD) and i386-only DVD and multi-arch USB flash drive. All of these images "
-"can also be booted from USB sticks."
+"Currently there are two kinds of installation media images: netinstall (CD) "
+"and multi-arch USB flash drive. Both images can also be booted from USB "
+"sticks."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -1764,8 +1778,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
#, fuzzy
msgid "./images/Installer_help.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -2577,57 +2591,57 @@ msgstr ""
#, fuzzy
msgid "./images/08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -2692,43 +2706,43 @@ msgstr ""
#, fuzzy
msgid "./images/13-Install+the+base+system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "13-Install the base system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -2759,29 +2773,29 @@ msgstr ""
#, fuzzy
msgid "./images/20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/22-Tjener_GRUB_boot_menu.png"
@@ -3565,8 +3579,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_list.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "GOsa² systems listing"
@@ -3576,8 +3590,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_host_details.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Host details"
@@ -3598,8 +3612,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_add_netgroup.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Add netgroup"
@@ -4121,8 +4135,8 @@ msgstr ""
#, fuzzy
msgid "./images/slbackup-php_maintenance.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -5958,10 +5972,10 @@ msgid ""
"boots from a diskette or directly from the server using network-PROM (or "
"PXE) without using a local client hard drive."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. "
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -8827,6 +8841,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"On the dedicated client network of thin client servers (default "
+"192.168.0.0/24), machines run by default as diskless workstations if they "
+"are powerful enough."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"GOsa gui: Now some options that seemed to be available, but are non "
"functional, are greyed out (or are not clickable). Some tabs are completely "
"hidden to the end user, others even to the GOsa admin."
@@ -11206,8 +11227,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "getting-]started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+#~ "started.png\"/></imageobject>"
#, fuzzy
#~ msgid "FIXME: add wheezy kde desktop screenshot here"
@@ -11230,8 +11251,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+#~ "edituser_squeeze.png\"/></imageobject>"
#, fuzzy
#~| msgid "Set passwords"
@@ -12494,8 +12515,8 @@ msgstr ""
#~ "workstation server(s):"
#~ msgstr ""
#~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på "
-#~ "arbeidsstasjonstjener(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
+#~ "(ne):"
#~ msgid ""
#~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -14822,13 +14843,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -14840,8 +14861,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14849,8 +14870,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14866,8 +14887,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14875,8 +14896,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index cf9b184..32e707e 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-09-15 10:20-0400\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\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"
@@ -147,11 +147,11 @@ msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients). The number of workstations can be as "
-"large or small as you want (starting from none to a lot). The same goes for "
-"the thin-client servers, each of which is on a separate network so that the "
-"traffic between the thin-clients and the thin-client server doesn't affect "
-"the rest of the network services."
+"servers (with associated thin-clients and/or diskless workstations). The "
+"number of workstations can be as large or small as you want (starting from "
+"none to a lot). The same goes for the thin-client servers, each of which is "
+"on a separate network so that the traffic between the clients and the thin-"
+"client server doesn't affect the rest of the network services."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -571,7 +571,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the LTSP server profile."
+"servers), which are installed by selecting the Thin client server profile."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -683,9 +683,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Currently there are three kinds of installation media images: netinstall "
-"(CD) and i386-only DVD and multi-arch USB flash drive. All of these images "
-"can also be booted from USB sticks."
+"Currently there are two kinds of installation media images: netinstall (CD) "
+"and multi-arch USB flash drive. Both images can also be booted from USB "
+"sticks."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -6739,6 +6739,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"On the dedicated client network of thin client servers (default "
+"192.168.0.0/24), machines run by default as diskless workstations if they "
+"are powerful enough."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"GOsa gui: Now some options that seemed to be available, but are non "
"functional, are greyed out (or are not clickable). Some tabs are completely "
"hidden to the end user, others even to the GOsa admin."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index ade6386..a7a8519 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -49,7 +49,7 @@
</title>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/Debian_Edu_Network_Wheezy.png"/></imageobject><textobject><phrase>The Debian Edu network topology</phrase></textobject></inlinemediaobject>
</para>
-<para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux network assumes that there is one (and only one) main-server, while allowing the inclusion of both normal workstations and thin-client-servers (with associated thin-clients). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the thin-client servers, each of which is on a separate network so that the traffic between the thin-clients and the thin-client server doesn't affect the rest of the network services.
+<para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux network assumes that there is one (and only one) main-server, while allowing the inclusion of both normal workstations and thin-client-servers (with associated thin-clients and/or diskless workstations). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the thin-client servers, each of which is on a separate network so that the traffic between the clients and the thin-client server doesn't affect the rest of the network services.
</para>
<para>The reason that there can only be one main server in each school network is that the main server provides DHCP, and there can be only one machine doing so in each network. It is possible to move services from the main server to other machines by setting up the service on another machine, and subsequently updating the DNS-configuration, pointing the DNS alias for that service to the right computer.
</para>
@@ -218,7 +218,7 @@
<section id="Architecture--LTSP_server.28s.29_.28Thin_client_server.28s.29.29">
<title>LTSP server(s) (Thin client server(s))
</title>
-<para>A Skolelinux network can have many LTSP servers (also called thin client servers), which are installed by selecting the LTSP server profile.
+<para>A Skolelinux network can have many LTSP servers (also called thin client servers), which are installed by selecting the Thin client server profile.
</para>
<para>The thin client servers are set up to receive syslog from the thin clients, and forward these messages to the central syslog recipient.
</para>
@@ -267,7 +267,7 @@
<section id="Architecture--Installation">
<title>Installation
</title>
-<para>Currently there are three kinds of installation media images: netinstall (CD) and i386-only DVD and multi-arch USB flash drive. All of these images can also be booted from USB sticks.
+<para>Currently there are two kinds of installation media images: netinstall (CD) and multi-arch USB flash drive. Both images can also be booted from USB sticks.
</para>
<para>The aim is to be able to install a server from any type medium once, and install all other clients over the network by booting from the network.
</para>
@@ -3079,6 +3079,9 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
<para>LTSP diskless workstations run without any configuration.
</para></listitem>
<listitem>
+<para>On the dedicated client network of thin client servers (default 192.168.0.0/24), machines run by default as diskless workstations if they are powerful enough.
+</para></listitem>
+<listitem>
<para>GOsa gui: Now some options that seemed to be available, but are non functional, are greyed out (or are not clickable). Some tabs are completely hidden to the end user, others even to the GOsa admin.
</para></listitem></itemizedlist>
</section>
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 45ba13b..d16377d 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 40741d8..f8aabe5 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 0a23804..156ecc5 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 fe0c920..854a3ec 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 7774ddd..2da5ee5 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-14 15:57+0300\n"
+"POT-Creation-Date: 2013-09-17 14:16+0300\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"
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