[debian-edu-commits] debian-edu/ 01/01: updated from the wiki, thanks Wolfgang for the edits there
Holger Levsen
holger at layer-acht.org
Sun Oct 9 11:57:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-doc.
commit a11726bd866f6eab6eb3bc305740a8a41396b701
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Oct 9 13:57:46 2016 +0200
updated from the wiki, thanks Wolfgang for the edits there
---
.../debian-edu-stretch-manual.da.po | 422 +++++++++++----------
.../debian-edu-stretch-manual.de.po | 352 ++++++++---------
.../debian-edu-stretch-manual.es.po | 244 +++++-------
.../debian-edu-stretch-manual.fr.po | 334 ++++++++--------
.../debian-edu-stretch-manual.it.po | 327 ++++++++--------
.../debian-edu-stretch-manual.ja.po | 312 +++++++--------
.../debian-edu-stretch-manual.nb.po | 322 ++++++++--------
.../debian-edu-stretch-manual.nl.po | 356 +++++++++--------
.../debian-edu-stretch-manual.pot | 146 +------
.../debian-edu-stretch-manual.xml | 51 +--
10 files changed, 1298 insertions(+), 1568 deletions(-)
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index 1ea86d0..367b924 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\n"
"PO-Revision-Date: 2016-10-06 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1046,10 +1046,16 @@ msgstr ""
"\"Architecture\">netværksarkitektur</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
+#| "(Debian architecture 'i386', oldest supported processors are Intel "
+#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
+#| "processors."
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"Computerne der kører Debian Edu / Skolelinux skal have enten 32-bit "
"(Debianstruktur »i386«, ældste understøttede processorer er Intel Pentium og "
@@ -1117,15 +1123,21 @@ msgid ""
msgstr "Kravet for minimal diskplads afhænger af profilen som installeres:"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 60 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
"hovedserver + tynd klient-server: 60 GiB. Som sædvanlig med diskplads på en "
"hovedserver, »jo større jo bedre«."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+#, fuzzy
+#| msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr "Server for tynde klienter: 40 GiB"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1178,7 +1190,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr "./images/smile.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ":)"
@@ -1333,8 +1345,8 @@ msgid ""
"use. Please give Debian Edu/Skolelinux a try, it should just work."
msgstr ""
"Vi anbefaler, at du læser eller i det mindste tager et kig på <ulink url="
-"\"http://www.debian.org/releases/stretch/releasenotes\">udgivelsesnoterne for "
-"Debian Jessie</ulink> før du begynder installation af et system for "
+"\"http://www.debian.org/releases/stretch/releasenotes\">udgivelsesnoterne "
+"for Debian Jessie</ulink> før du begynder installation af et system for "
"produktionsbrug. Giv Debian Edu/Skolelinux et forsøg, det bør bare virke ud "
"af posen."
@@ -1366,8 +1378,8 @@ msgid ""
"\">installation manual</ulink>."
msgstr ""
"Yderligere information om Debian Jessie er tilgængelig i Debians <ulink url="
-"\"http://www.debian.org/releases/stretch/installmanual\">installationsmanual</"
-"ulink>."
+"\"http://www.debian.org/releases/stretch/installmanual"
+"\">installationsmanual</ulink>."
#. type: Content of: <article><section><section><title>
msgid "Download the installation media for Debian Edu 9+edu0 Codename Stretch"
@@ -1424,10 +1436,10 @@ msgid ""
"be downloaded over FTP, HTTP or rsync via:"
msgstr ""
"ISO-aftrykket for flere arkitekturer er på 5,2 GiB og kan bruges for "
-"installation på amd64- og i386-maskiner. Som aftrykket netinstall kan "
-"det installeres på USB-flashdrev eller diskmedier med tilstrækkelig "
-"størrelse. Bemærk venligst at internetadgang under installatonen er krævet. "
-"Som de andre kan aftrykket hentes over FTP, HTTP eller rsync via:"
+"installation på amd64- og i386-maskiner. Som aftrykket netinstall kan det "
+"installeres på USB-flashdrev eller diskmedier med tilstrækkelig størrelse. "
+"Bemærk venligst at internetadgang under installatonen er krævet. Som de "
+"andre kan aftrykket hentes over FTP, HTTP eller rsync via:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1459,7 +1471,8 @@ msgstr "Kilder"
#. type: Content of: <article><section><section><section><para>
msgid "Sources are available from the Debian archive at the usual locations."
-msgstr "Kilder er tilgængelige fra Debianarkivet på det sædvanlige placeringer."
+msgstr ""
+"Kilder er tilgængelige fra Debianarkivet på det sædvanlige placeringer."
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -2604,10 +2617,10 @@ msgid ""
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
"Der er tilgængelig information tilgængelig andre steder i denne manual: "
-"Kapitlet <link linkend=\"Features\">Nye funktioner i Stretch</link> kan læses "
-"af alle som er bekendt med tidligere udgivelser. Og for dem som opgraderer "
-"fra en tidligere udgivelse, så husk at læse kapitlet <link linkend=\"Upgrades"
-"\">Opgraderinger</link>."
+"Kapitlet <link linkend=\"Features\">Nye funktioner i Stretch</link> kan "
+"læses af alle som er bekendt med tidligere udgivelser. Og for dem som "
+"opgraderer fra en tidligere udgivelse, så husk at læse kapitlet <link "
+"linkend=\"Upgrades\">Opgraderinger</link>."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -2703,8 +2716,8 @@ msgid ""
"If you are using a new Debian Edu Stretch machine, the site certificate will "
"be known by the browser."
msgstr ""
-"Hvis du bruger en ny Debian Edu Stretch-maskine, så vil sidecertifikatet være "
-"kendt af browseren."
+"Hvis du bruger en ny Debian Edu Stretch-maskine, så vil sidecertifikatet "
+"være kendt af browseren."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4582,8 +4595,8 @@ msgstr ""
"DebianEdu/Documentation/Jessie#\">manualen for Debian Edu Jessie</ulink> for "
"hvordan der opgraderes til Jessie fra en tidligere udgivelse, Wheezy. På "
"samme måde beskriver manualen for Wheezy hvordan du opgraderer fra Squeeze "
-"og manualen for Squeeze dækker den forrige! (Lenny var dens navn og før "
-"den var der endnu en, baseret på Etch)."
+"og manualen for Squeeze dækker den forrige! (Lenny var dens navn og før den "
+"var der endnu en, baseret på Etch)."
#. type: Content of: <article><section><title>
msgid "HowTo"
@@ -6085,45 +6098,6 @@ msgid "HowTos for the desktop"
msgstr "Hjælp for skrivebordet"
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr "Ændring af KDM-logindskærmen"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-"Tilpasninger til KDM-logindskærmen udføres af en fil i <computeroutput>/etc/"
-"default/kdm.d/</computeroutput> der angiver variabler, der skal overskrive "
-"standarden."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-"Her er et eksempel brugt til at aktivere temaet i pakken "
-"<computeroutput>desktop-base</computeroutput>:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-"Se koden i <computeroutput>/etc/init.d/kdm</computeroutput> for information "
-"om hvordan disse varibaler bruges."
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr "Brug af KDE »Plasma«, GNOME, LXDE, Xfce og/eller MATE sammen"
@@ -6278,14 +6252,25 @@ msgstr "For at bruge www.deb-multimedia.org så udfør følgende:"
# Engelsk fejl= manglende 0 foran kode
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6485,25 +6470,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr "<emphasis role=\"strong\">LTSP-klientkerne</emphasis>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-"For at understøtte ældre udstyr installeres pakken <computeroutput>linux-"
-"image-586</computeroutput> som standard. Hvis alle LTSP-klientmaskiner "
-"understøtter 686-processorarkitekturen kan pakken <computeroutput>linux-"
-"image-686</computeroutput> installeres i chroot'en. Sikr dig at køre "
-"<computeroutput>ltsp-update-kernels</computeroutput> efter installationen."
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr "LTSP-klienttypemarkering"
@@ -7267,10 +7233,11 @@ msgstr ""
"ESD, PulseAudio og ALSA. ESD og PulseAudio understøtter netværkslyd og "
"bruges til at videresende lyd fra serveren til klienterne. ALSA konfigureres "
"til at videresende sin lyd via PulseAudio. For valgte programmer som kun "
-"understøtter OSS-lydsystemet oprettes et omslag af <computeroutput>/usr/share/"
-"debian-edu-config/tools/debian-edu-ltsp-audiodivert</computeroutput> til at "
-"videresende deres lyd til PulseAudio. Kør dette skript uden argumenter for at "
-"få en liste over programmer med denne videresendelse aktiveret."
+"understøtter OSS-lydsystemet oprettes et omslag af <computeroutput>/usr/"
+"share/debian-edu-config/tools/debian-edu-ltsp-audiodivert</computeroutput> "
+"til at videresende deres lyd til PulseAudio. Kør dette skript uden "
+"argumenter for at få en liste over programmer med denne videresendelse "
+"aktiveret."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -7426,109 +7393,10 @@ msgid ""
"diskless workstations."
msgstr ""
"Bemærk: Da sådanne ti år gamle tynde klienter også kan have problemer med at "
-"afvikle nyere versioner af LibreOffice og Firefox på grund af "
-"pixmap-mellemlagring, kan du overveje kun at køre tynde klienter med mindst "
-"128 MB RAM eller opgradere udstyret, hvilket også vil give dig fordelene ved "
-"at kunne bruge dem som diskløse arbejdsstationer."
-
-#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr "Erstatte LDM med KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-"Siden version 3.0 har Skolelinux kørt LDM som sin Logindhåndtering, der "
-"bruger en sikker SSH-tunnel til at logge ind med. Et skifte til KDM kræver "
-"også et skifte til XDMCP, som bruger færre CPU-ressourcer på klienter og på "
-"serveren."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-"<emphasis role=\"strong\">Advarsel</emphasis>: XDMCP bruger ikke kryptering. "
-"Adgangskoder vil rejse i klartekst over netværket, sammen med alt andet."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-"Bemærk: Lokale enheder med <computeroutput>ltspfs</computeroutput> vil ikke "
-"fungere uden LDM."
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-"For at kontrollere om XDMCP kører, så kør denne kommando fra en "
-"arbejdsstation:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr "X -query ltspserverXX"
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr "Hvis du er på netværket med tynde klienter, så kør denne kommando:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr "X -query 192.168.0.254"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-"Formålet er at lade din »reelle« tynde klient kontakte xdmcp-serveren på "
-"192.168.0.254 (ved en standardkonfiguration af Skolelinux)."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-"Hvis XDMCP ikke kan tilgås på din server, som kører KDM, så tilføj det "
-"følgende til <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr "* # enhver vært kan få et logindvindue"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr ""
-"Stjernen før kommentaren »#« er vigtig; resten er selvfølgelig en kommentar"
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr "Tænd så XDMCP i KDM med kommandoen:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr "Endelig, genstart KDM ved at køre:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr "sudo service kdm restart"
+"afvikle nyere versioner af LibreOffice og Firefox på grund af pixmap-"
+"mellemlagring, kan du overveje kun at køre tynde klienter med mindst 128 MB "
+"RAM eller opgradere udstyret, hvilket også vil give dig fordelene ved at "
+"kunne bruge dem som diskløse arbejdsstationer."
#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
@@ -8922,9 +8790,15 @@ msgstr ""
"sambaLMPassword) er de samme."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
+#| "but this will only update the Kerberos password, and not the Samba and "
+#| "GOsa² (LDAP) password. So after you changed your password at the login "
+#| "prompt, you really should also change it using GOsa²."
msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
@@ -9490,10 +9364,9 @@ msgid ""
"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
msgstr ""
-"Dette er en <emphasis role=\"strong\">meget tidlig ALFA</emphasis> "
-"udgivelse af Debian Edu 9+edu0. Giv venligst tilbagemeldinger til "
-"<ulink url=\"mailto:debian-edu at lists.debian.org"
-"\">debian-edu at lists.debian.org</ulink>!"
+"Dette er en <emphasis role=\"strong\">meget tidlig ALFA</emphasis> udgivelse "
+"af Debian Edu 9+edu0. Giv venligst tilbagemeldinger til <ulink url=\"mailto:"
+"debian-edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
#. type: Content of: <article><section><section><section><title>
msgid "Known issues"
@@ -9504,8 +9377,8 @@ msgid ""
"see <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Stretch#\">the "
"Debian Edu Stretch status page</ulink>."
msgstr ""
-"Se <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Stretch#\">"
-"Statussiden for Debian Edu Stretch</ulink>."
+"Se <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Stretch#"
+"\">Statussiden for Debian Edu Stretch</ulink>."
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
@@ -9616,9 +9489,9 @@ msgid ""
"Italian, Danish, Dutch and Norwegian Bokmål. A partly translated version "
"exists for Spanish."
msgstr ""
-"Manualen for Debian Edu Stretch er fuldt oversat til tysk, fransk, italiensk, "
-"dansk, hollandsk og norsk bokmål. En delvist oversat version findes for "
-"spansk."
+"Manualen for Debian Edu Stretch er fuldt oversat til tysk, fransk, "
+"italiensk, dansk, hollandsk og norsk bokmål. En delvist oversat version "
+"findes for spansk."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "New translations in Stretch: Japanese."
@@ -9666,8 +9539,7 @@ msgstr ""
"(2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel "
"(2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, "
"2013, 2014, 2015, 2016), Bernhard Hammes (2012) og Joe Hansen (2015). "
-"Dokumentet er udgivet under GPL2 eller enhver senere version. God "
-"fornøjelse!"
+"Dokumentet er udgivet under GPL2 eller enhver senere version. God fornøjelse!"
#. type: Content of: <article><section><para>
msgid ""
@@ -9727,8 +9599,8 @@ msgstr ""
"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
"Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
"Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) og "
-"Wolfgang Schweer (2012, 2013, 2014, 2015, 2016) og udgives under GPL version 2 "
-"eller enhver senere version."
+"Wolfgang Schweer (2012, 2013, 2014, 2015, 2016) og udgives under GPL version "
+"2 eller enhver senere version."
#. type: Content of: <article><section><para>
msgid ""
@@ -9768,15 +9640,16 @@ msgid ""
"2016) and is released under the GPL v2 or any later version."
msgstr ""
"Den hollandske oversættelse er underlagt ophavsretten af Frans Spiesschaert "
-"(2014, 2015, 2016) og er udgivet under GPL version 2 eller enhver senere version."
+"(2014, 2015, 2016) og er udgivet under GPL version 2 eller enhver senere "
+"version."
#. type: Content of: <article><section><para>
msgid ""
"The Japanese translation is copyrighted by victory (2016) and is released "
"under the GPL v2 or any later version."
msgstr ""
-"Den japanske oversættelse er underlagt ophavsretten af victory (2016) "
-"og er udgivet under GPL version 2 eller enhver senere version."
+"Den japanske oversættelse er underlagt ophavsretten af victory (2016) og er "
+"udgivet under GPL version 2 eller enhver senere version."
#. type: Content of: <article><section><title>
msgid "Translations of this document"
@@ -10760,8 +10633,8 @@ msgid ""
"debian.org/News/2016/20160702.en.html\">Debian Edu / Skolelinux Jessie — a "
"complete Linux solution for your school</ulink>."
msgstr ""
-"læs udgivelsesmeddelelsen på www.debian.org: <ulink url=\"https://www."
-"debian.org/News/2016/20160702.en.html\">Debian Edu / Skolelinux Jessie — en "
+"læs udgivelsesmeddelelsen på www.debian.org: <ulink url=\"https://www.debian."
+"org/News/2016/20160702.en.html\">Debian Edu / Skolelinux Jessie — en "
"fuldstændig Linuxløsning for din skole</ulink>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12393,3 +12266,132 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Modifying the KDM login screen"
+#~ msgstr "Ændring af KDM-logindskærmen"
+
+#~ msgid ""
+#~ "Customisations to the KDM login screen are made by adding a file in "
+#~ "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables "
+#~ "to override the default."
+#~ msgstr ""
+#~ "Tilpasninger til KDM-logindskærmen udføres af en fil i <computeroutput>/"
+#~ "etc/default/kdm.d/</computeroutput> der angiver variabler, der skal "
+#~ "overskrive standarden."
+
+#~ msgid ""
+#~ "Here is one example used to activate the theme in the "
+#~ "<computeroutput>desktop-base</computeroutput> package:"
+#~ msgstr ""
+#~ "Her er et eksempel brugt til at aktivere temaet i pakken "
+#~ "<computeroutput>desktop-base</computeroutput>:"
+
+#~ msgid ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+#~ msgstr ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+
+#~ msgid ""
+#~ "See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
+#~ "information on how these variables are used."
+#~ msgstr ""
+#~ "Se koden i <computeroutput>/etc/init.d/kdm</computeroutput> for "
+#~ "information om hvordan disse varibaler bruges."
+
+#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">LTSP-klientkerne</emphasis>"
+
+#~ msgid ""
+#~ "In order to support older hardware the package <computeroutput>linux-"
+#~ "image-586</computeroutput> is installed by default. If all LTSP client "
+#~ "machines support the 686 processor architecture the <computeroutput>linux-"
+#~ "image-686</computeroutput> package could be installed in the chroot. Make "
+#~ "sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "For at understøtte ældre udstyr installeres pakken <computeroutput>linux-"
+#~ "image-586</computeroutput> som standard. Hvis alle LTSP-klientmaskiner "
+#~ "understøtter 686-processorarkitekturen kan pakken <computeroutput>linux-"
+#~ "image-686</computeroutput> installeres i chroot'en. Sikr dig at køre "
+#~ "<computeroutput>ltsp-update-kernels</computeroutput> efter installationen."
+
+#~ msgid "Replacing LDM with KDM"
+#~ msgstr "Erstatte LDM med KDM"
+
+#~ msgid ""
+#~ "Since version 3.0 Skolelinux has been running LDM as its login manager, "
+#~ "which uses a secure SSH tunnel to log in. Switching to KDM also requires "
+#~ "a switch to XDMCP, which uses lower CPU resources on the clients and on "
+#~ "the server."
+#~ msgstr ""
+#~ "Siden version 3.0 har Skolelinux kørt LDM som sin Logindhåndtering, der "
+#~ "bruger en sikker SSH-tunnel til at logge ind med. Et skifte til KDM "
+#~ "kræver også et skifte til XDMCP, som bruger færre CPU-ressourcer på "
+#~ "klienter og på serveren."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use "
+#~ "encryption. Passwords will travel in cleartext over the network, as well "
+#~ "as anything else."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Advarsel</emphasis>: XDMCP bruger ikke "
+#~ "kryptering. Adgangskoder vil rejse i klartekst over netværket, sammen med "
+#~ "alt andet."
+
+#~ msgid ""
+#~ "Note: local devices with <computeroutput>ltspfs</computeroutput> will "
+#~ "stop working without LDM."
+#~ msgstr ""
+#~ "Bemærk: Lokale enheder med <computeroutput>ltspfs</computeroutput> vil "
+#~ "ikke fungere uden LDM."
+
+#~ msgid "To check if XDMCP is running, run this command from a workstation:"
+#~ msgstr ""
+#~ "For at kontrollere om XDMCP kører, så kør denne kommando fra en "
+#~ "arbejdsstation:"
+
+#~ msgid "X -query ltspserverXX"
+#~ msgstr "X -query ltspserverXX"
+
+#~ msgid "If you are on the thin client network, run this command:"
+#~ msgstr "Hvis du er på netværket med tynde klienter, så kør denne kommando:"
+
+#~ msgid "X -query 192.168.0.254"
+#~ msgstr "X -query 192.168.0.254"
+
+#~ msgid ""
+#~ "The goal is to let your \"real\" thin client contact the xdmcp-server on "
+#~ "192.168.0.254 (given a standard Skolelinux configuration)."
+#~ msgstr ""
+#~ "Formålet er at lade din »reelle« tynde klient kontakte xdmcp-serveren på "
+#~ "192.168.0.254 (ved en standardkonfiguration af Skolelinux)."
+
+#~ msgid ""
+#~ "If XDMCP is not accessible on your server which runs KDM, add the "
+#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+#~ msgstr ""
+#~ "Hvis XDMCP ikke kan tilgås på din server, som kører KDM, så tilføj det "
+#~ "følgende til <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+
+#~ msgid "* # any host can get a login window"
+#~ msgstr "* # enhver vært kan få et logindvindue"
+
+#~ msgid ""
+#~ "The star before the comment '#' is important; the rest is a comment, of "
+#~ "course"
+#~ msgstr ""
+#~ "Stjernen før kommentaren »#« er vigtig; resten er selvfølgelig en "
+#~ "kommentar"
+
+#~ msgid "Then turn on XDMCP in KDM with the command:"
+#~ msgstr "Tænd så XDMCP i KDM med kommandoen:"
+
+#~ msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+#~ msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+
+#~ msgid "Finally, restart KDM by running:"
+#~ msgstr "Endelig, genstart KDM ved at køre:"
+
+#~ msgid "sudo service kdm restart"
+#~ msgstr "sudo service kdm restart"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index 4d443d8..8a148fd 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\n"
"PO-Revision-Date: 2016-09-28 09:55+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1082,10 +1082,16 @@ msgstr ""
"\"Architecture\">Netzwerk-Architektur</link> erläutert."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
+#| "(Debian architecture 'i386', oldest supported processors are Intel "
+#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
+#| "processors."
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"Rechner, auf denen Debian Edu / Skolelinux installiert werden soll, müssen "
"entweder 32-Bit (Debian-Architektur 'i386', die ältesten unterstützten "
@@ -1161,15 +1167,21 @@ msgstr ""
"ab."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 60 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
"main server + thin client server: 60 GiB. Wie üblich gilt für den "
"Plattenplatz eines Main-Servers: »Je mehr, umso besser«."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+#, fuzzy
+#| msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr "thin client server: 40 GiB."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1223,7 +1235,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr "./images/smile.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ":)"
@@ -6260,45 +6272,6 @@ msgid "HowTos for the desktop"
msgstr "HowTos für die graphische Arbeitsumgebung"
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr "Bearbeiten des KDM-Anmeldebildschirms"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-"Änderungen des KDM-Anmeldebildschirms erfolgen durch Erstellen einer Datei "
-"in <computeroutput>/etc/default/kdm.d/</computeroutput>, deren Einträge die "
-"voreingestellten Werte von Variablen überschreiben."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-"Hier ein Beispiel, wie sich ein Thema im Paket <computeroutput>desktop-base</"
-"computeroutput> aktivieren lässt:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-"Sehen Sie sich den Code in <computeroutput>/etc/init.d/kdm</computeroutput> "
-"an, um zu erfahren, wie diese Variablen benutzt werden."
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr "KDE »Plasma«, GNOME, LXDE, Xfce und/oder MATE nebeneinander benutzen"
@@ -6456,14 +6429,25 @@ msgid "To use www.deb-multimedia.org do the following:"
msgstr "Um www.deb-multimedia.org zu verwenden, führen Sie das Folgende aus:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6670,26 +6654,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr "<emphasis role=\"strong\">Kernel der LTSP-Clients</emphasis>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-"Um auch ältere Hardware zu unterstützen, wird voreingestellt das Paket "
-"<computeroutput>linux-image-586</computeroutput> installiert. Falls alle "
-"LTSP-Client-Rechner 686-Prozessoren besitzen, dann könnte im Chroot das "
-"Paket <computeroutput>linux-image-686</computeroutput> installiert werden. "
-"Führen Sie nach der Installation unbedingt <computeroutput>ltsp-update-"
-"kernels</computeroutput> aus."
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr "Typ des LTSP-Client auswählen"
@@ -7635,111 +7599,6 @@ msgstr ""
"verwenden zu können."
#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr "LDM durch KDM ersetzen"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-"Seit Skolelinux 3.0 wird LDM als Anmeldemanager verwendet; LDM verwendet "
-"einen sicheren SSH-Tunnel für die Anmeldung. Soll KDM verwendet werden, ist "
-"ein Wechsel auf XDMCP notwendig. XDMCP benötigt auf Server wie Client "
-"weniger CPU-Ressourcen."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-"<emphasis role=\"strong\">Achtung</emphasis>: XDMCP verwendet keine "
-"Verschlüsselung. Passwörter werden - wie alles andere auch - im Klartext "
-"über das Netzwerk geschickt."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-"Anmerkung: Lokale Geräte mit <computeroutput>ltspfs</computeroutput> werden "
-"ohne LDM nicht funktionieren."
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-"Um nachzuprüfen, ob XDMCP läuft, geben Sie den folgenden Befehl auf einem "
-"Arbeitsplatzrechner ein:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr "X -query ltspserverXX"
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr ""
-"Falls Sie sich in einem Netzwerk für Thin Clients befinden, führen Sie bitte "
-"das folgende Kommando aus:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr "X -query 192.168.0.254"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-"Das Ziel ist, Ihrem »echten« Thin Client zu erlauben, sich mit dem XDMCP-"
-"Server im 192.168.0.254 Netz zu verbinden (in einer Skolelinux Standard-"
-"Konfiguration)."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-"Falls XDMCP auf Ihrem Server, auf dem KDM läuft, nicht erreichbar sein "
-"sollte, fügen Sie bitte Folgendes zu der Datei <computeroutput>/etc/kde4/kdm/"
-"Xaccess</computeroutput> hinzu:"
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr "* # any host can get a login window"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr ""
-"Der Stern vor dem Kommentarzeichen # ist wichtig, der Rest ist natürlich "
-"ein Kommentar."
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr "Aktivieren Sie dann XDMCP in KDM mit dem Kommando:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr "Abschließend starten Sie KDM mit dem folgenden Kommando neu:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr "sudo service kdm restart"
-
-#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "Windows-Rechner mit dem Netzwerk verbinden / Integration von Windows"
@@ -9163,9 +9022,15 @@ msgstr ""
"(sambaNTPassword und sambaLMPassword) identisch sind."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
+#| "but this will only update the Kerberos password, and not the Samba and "
+#| "GOsa² (LDAP) password. So after you changed your password at the login "
+#| "prompt, you really should also change it using GOsa²."
msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
@@ -10206,8 +10071,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 "
@@ -12720,6 +12585,141 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid "Modifying the KDM login screen"
+#~ msgstr "Bearbeiten des KDM-Anmeldebildschirms"
+
+#~ msgid ""
+#~ "Customisations to the KDM login screen are made by adding a file in "
+#~ "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables "
+#~ "to override the default."
+#~ msgstr ""
+#~ "Änderungen des KDM-Anmeldebildschirms erfolgen durch Erstellen einer "
+#~ "Datei in <computeroutput>/etc/default/kdm.d/</computeroutput>, deren "
+#~ "Einträge die voreingestellten Werte von Variablen überschreiben."
+
+#~ msgid ""
+#~ "Here is one example used to activate the theme in the "
+#~ "<computeroutput>desktop-base</computeroutput> package:"
+#~ msgstr ""
+#~ "Hier ein Beispiel, wie sich ein Thema im Paket <computeroutput>desktop-"
+#~ "base</computeroutput> aktivieren lässt:"
+
+#~ msgid ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+#~ msgstr ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+
+#~ msgid ""
+#~ "See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
+#~ "information on how these variables are used."
+#~ msgstr ""
+#~ "Sehen Sie sich den Code in <computeroutput>/etc/init.d/kdm</"
+#~ "computeroutput> an, um zu erfahren, wie diese Variablen benutzt werden."
+
+#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">Kernel der LTSP-Clients</emphasis>"
+
+#~ msgid ""
+#~ "In order to support older hardware the package <computeroutput>linux-"
+#~ "image-586</computeroutput> is installed by default. If all LTSP client "
+#~ "machines support the 686 processor architecture the <computeroutput>linux-"
+#~ "image-686</computeroutput> package could be installed in the chroot. Make "
+#~ "sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Um auch ältere Hardware zu unterstützen, wird voreingestellt das Paket "
+#~ "<computeroutput>linux-image-586</computeroutput> installiert. Falls alle "
+#~ "LTSP-Client-Rechner 686-Prozessoren besitzen, dann könnte im Chroot das "
+#~ "Paket <computeroutput>linux-image-686</computeroutput> installiert "
+#~ "werden. Führen Sie nach der Installation unbedingt <computeroutput>ltsp-"
+#~ "update-kernels</computeroutput> aus."
+
+#~ msgid "Replacing LDM with KDM"
+#~ msgstr "LDM durch KDM ersetzen"
+
+#~ msgid ""
+#~ "Since version 3.0 Skolelinux has been running LDM as its login manager, "
+#~ "which uses a secure SSH tunnel to log in. Switching to KDM also requires "
+#~ "a switch to XDMCP, which uses lower CPU resources on the clients and on "
+#~ "the server."
+#~ msgstr ""
+#~ "Seit Skolelinux 3.0 wird LDM als Anmeldemanager verwendet; LDM verwendet "
+#~ "einen sicheren SSH-Tunnel für die Anmeldung. Soll KDM verwendet werden, "
+#~ "ist ein Wechsel auf XDMCP notwendig. XDMCP benötigt auf Server wie Client "
+#~ "weniger CPU-Ressourcen."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use "
+#~ "encryption. Passwords will travel in cleartext over the network, as well "
+#~ "as anything else."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Achtung</emphasis>: XDMCP verwendet keine "
+#~ "Verschlüsselung. Passwörter werden - wie alles andere auch - im Klartext "
+#~ "über das Netzwerk geschickt."
+
+#~ msgid ""
+#~ "Note: local devices with <computeroutput>ltspfs</computeroutput> will "
+#~ "stop working without LDM."
+#~ msgstr ""
+#~ "Anmerkung: Lokale Geräte mit <computeroutput>ltspfs</computeroutput> "
+#~ "werden ohne LDM nicht funktionieren."
+
+#~ msgid "To check if XDMCP is running, run this command from a workstation:"
+#~ msgstr ""
+#~ "Um nachzuprüfen, ob XDMCP läuft, geben Sie den folgenden Befehl auf einem "
+#~ "Arbeitsplatzrechner ein:"
+
+#~ msgid "X -query ltspserverXX"
+#~ msgstr "X -query ltspserverXX"
+
+#~ msgid "If you are on the thin client network, run this command:"
+#~ msgstr ""
+#~ "Falls Sie sich in einem Netzwerk für Thin Clients befinden, führen Sie "
+#~ "bitte das folgende Kommando aus:"
+
+#~ msgid "X -query 192.168.0.254"
+#~ msgstr "X -query 192.168.0.254"
+
+#~ msgid ""
+#~ "The goal is to let your \"real\" thin client contact the xdmcp-server on "
+#~ "192.168.0.254 (given a standard Skolelinux configuration)."
+#~ msgstr ""
+#~ "Das Ziel ist, Ihrem »echten« Thin Client zu erlauben, sich mit dem XDMCP-"
+#~ "Server im 192.168.0.254 Netz zu verbinden (in einer Skolelinux Standard-"
+#~ "Konfiguration)."
+
+#~ msgid ""
+#~ "If XDMCP is not accessible on your server which runs KDM, add the "
+#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+#~ msgstr ""
+#~ "Falls XDMCP auf Ihrem Server, auf dem KDM läuft, nicht erreichbar sein "
+#~ "sollte, fügen Sie bitte Folgendes zu der Datei <computeroutput>/etc/kde4/"
+#~ "kdm/Xaccess</computeroutput> hinzu:"
+
+#~ msgid "* # any host can get a login window"
+#~ msgstr "* # any host can get a login window"
+
+#~ msgid ""
+#~ "The star before the comment '#' is important; the rest is a comment, of "
+#~ "course"
+#~ msgstr ""
+#~ "Der Stern vor dem Kommentarzeichen # ist wichtig, der Rest ist natürlich "
+#~ "ein Kommentar."
+
+#~ msgid "Then turn on XDMCP in KDM with the command:"
+#~ msgstr "Aktivieren Sie dann XDMCP in KDM mit dem Kommando:"
+
+#~ msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+#~ msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+
+#~ msgid "Finally, restart KDM by running:"
+#~ msgstr "Abschließend starten Sie KDM mit dem folgenden Kommando neu:"
+
+#~ msgid "sudo service kdm restart"
+#~ msgstr "sudo service kdm restart"
+
#~ msgid "{{attachment:gosa2_overview.png}}"
#~ msgstr "{{attachment:gosa2_overview.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index e1db3d6..ca7e994 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\n"
"PO-Revision-Date: 2015-03-30 22:30+0000\n"
"Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1080,10 +1080,16 @@ msgstr ""
"linkend=\"Architecture\">Arquitecturas de red</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
+#| "(Debian architecture 'i386', oldest supported processors are Intel "
+#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
+#| "processors."
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"Las computadoras ejecutando Debian Edu / Skolelinux deben tener "
"procesadores, ya sea de 32 bits (Debian arquitectura 'i386', procesadores "
@@ -1154,15 +1160,21 @@ msgstr ""
"El requerimiento mínimo de espacio depende del perfil que sea instalado."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 60 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
"Servidor principal + servidor de clientes delgados: 60Gb. Como siempre, con "
"espacio de disco en el servidor principal, \"entre más , mejor\"."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+#, fuzzy
+#| msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr "servidor para clientes delgados: 40Gb"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1215,7 +1227,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr "./images/smile.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ":)"
@@ -5742,43 +5754,6 @@ msgid "HowTos for the desktop"
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr "Modificar la pantalla de inicio de KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-"Personalizaciones a la pantalla de inicio de KDM se pueden hacer agregando "
-"un archivo en <computeroutput>/etc/default/kdm.d/</computeroutput> "
-"especificando las variables que desea sobrescribir."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-"Aquí tiene un ejemplo para activar el tema en el paquete "
-"<computeroutput>desktop-base</computeroutput>:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr ""
@@ -5910,7 +5885,7 @@ msgid ""
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6092,20 +6067,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr ""
@@ -6800,96 +6761,6 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr "Reemplazar LDM con KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-"Para revisar si XDMCP está corriendo, ejecute este comando desde una "
-"estación de trabajo:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr "X -query ltspserverXX"
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr "Si está en la red de clientes ligeros, ejecute este comando:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr "X -query 192.168.0.254"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-"El objetivo es permitir que el cliente ligero real, contacte al servidor "
-"xdmcp en 192.168.0.254 (en una configuración estándar de Skolelinux). "
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-"Si XDMCP no es accesible en su servidor, que correo KDM, agregue lo "
-"siguiente al archivo <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr "* # any host can get a login window"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr "Luego habilite XDMCP en KDM con el comando:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr "Finalmente, reinicia KDM ejecutando:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr ""
@@ -7983,8 +7854,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
@@ -10822,6 +10693,79 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Modifying the KDM login screen"
+#~ msgstr "Modificar la pantalla de inicio de KDM"
+
+#~ msgid ""
+#~ "Customisations to the KDM login screen are made by adding a file in "
+#~ "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables "
+#~ "to override the default."
+#~ msgstr ""
+#~ "Personalizaciones a la pantalla de inicio de KDM se pueden hacer "
+#~ "agregando un archivo en <computeroutput>/etc/default/kdm.d/</"
+#~ "computeroutput> especificando las variables que desea sobrescribir."
+
+#~ msgid ""
+#~ "Here is one example used to activate the theme in the "
+#~ "<computeroutput>desktop-base</computeroutput> package:"
+#~ msgstr ""
+#~ "Aquí tiene un ejemplo para activar el tema en el paquete "
+#~ "<computeroutput>desktop-base</computeroutput>:"
+
+#~ msgid ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+#~ msgstr ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+
+#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+
+#~ msgid "Replacing LDM with KDM"
+#~ msgstr "Reemplazar LDM con KDM"
+
+#~ msgid "To check if XDMCP is running, run this command from a workstation:"
+#~ msgstr ""
+#~ "Para revisar si XDMCP está corriendo, ejecute este comando desde una "
+#~ "estación de trabajo:"
+
+#~ msgid "X -query ltspserverXX"
+#~ msgstr "X -query ltspserverXX"
+
+#~ msgid "If you are on the thin client network, run this command:"
+#~ msgstr "Si está en la red de clientes ligeros, ejecute este comando:"
+
+#~ msgid "X -query 192.168.0.254"
+#~ msgstr "X -query 192.168.0.254"
+
+#~ msgid ""
+#~ "The goal is to let your \"real\" thin client contact the xdmcp-server on "
+#~ "192.168.0.254 (given a standard Skolelinux configuration)."
+#~ msgstr ""
+#~ "El objetivo es permitir que el cliente ligero real, contacte al servidor "
+#~ "xdmcp en 192.168.0.254 (en una configuración estándar de Skolelinux). "
+
+#~ msgid ""
+#~ "If XDMCP is not accessible on your server which runs KDM, add the "
+#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+#~ msgstr ""
+#~ "Si XDMCP no es accesible en su servidor, que correo KDM, agregue lo "
+#~ "siguiente al archivo <computeroutput>/etc/kde4/kdm/Xaccess</"
+#~ "computeroutput>:"
+
+#~ msgid "* # any host can get a login window"
+#~ msgstr "* # any host can get a login window"
+
+#~ msgid "Then turn on XDMCP in KDM with the command:"
+#~ msgstr "Luego habilite XDMCP en KDM con el comando:"
+
+#~ msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+#~ msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+
+#~ msgid "Finally, restart KDM by running:"
+#~ msgstr "Finalmente, reinicia KDM ejecutando:"
+
#, fuzzy
#~| msgid "./images/gosa2_overview.png"
#~ msgid "{{attachment:gosa2_overview.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index 34c4657..b7884cc 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\n"
"PO-Revision-Date: 2015-06-22 10:34+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1096,10 +1096,16 @@ msgstr ""
"linkend=\"Architecture\">architecture réseau</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
+#| "(Debian architecture 'i386', oldest supported processors are Intel "
+#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
+#| "processors."
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"Les ordinateurs exécutant Debian Edu / Skolelinux doivent avoir des "
"processeurs x86 à 32 bits (architecture Debian « i386 », les processeurs les "
@@ -1174,8 +1180,12 @@ msgid ""
msgstr "L'espace disque minimal nécessaire dépend du profil installé :"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 60 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
"serveur principal + serveur de clients léger : 60 Gio. Comme d'habiture pour "
@@ -1183,7 +1193,9 @@ msgstr ""
"c'est »."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+#, fuzzy
+#| msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr "serveur de clients légers : 40 Gio."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1236,7 +1248,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr "./images/smile.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ":)"
@@ -6526,45 +6538,6 @@ msgid "HowTos for the desktop"
msgstr "Manuels pour le bureau"
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr "Modification de l'écran de connexion de KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-"La personnalisation de l'écran de connexion de KDM se fait en ajoutant dans "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> un fichier qui indique "
-"les valeur des variables à surcharger."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-"Voici un exemple utilisé pour activer le thème du paquet "
-"<computeroutput>desktop-base</computeroutput> :"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-"Consulter le code de <computeroutput>/etc/init.d/kdm</computeroutput> pour "
-"des informations concernant l'utilisation de ces variables."
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr "Utiliser KDE « Plasma », GNOME, LXDE, Xfce et/ou MATE ensemble"
@@ -6735,7 +6708,7 @@ msgid ""
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6943,26 +6916,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr "<emphasis role=\"strong\">Noyau des clients légers</emphasis>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-"Afin de pouvoir prendre en charge du matériel plus ancien, le paquet "
-"<computeroutput>linux-image-486</computeroutput> est installé par défaut. Si "
-"tous les clients légers prennent en charge l'architecture de processeur 686, "
-"le paquet <computeroutput>linux-image-686</computeroutput> peut être "
-"installé dans le chroot. Assurez-vous d'exécuter <computeroutput>ltsp-update-"
-"kernels</computeroutput> après l'installation."
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr "Sélection du type de client léger"
@@ -7936,110 +7889,6 @@ msgstr ""
"dur."
#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr "Remplacer LDM par KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-"Depuis la version 3.0, Skolelinux utilise LDM comme gestionnaire de "
-"connexions. Il utilise un tunnel SSH sécurisé pour la connexion. Si vous "
-"utilisez KDM vous devez également utiliser XDMCP. Celui-ci utilise moins de "
-"ressources processeur sur les clients et le serveur."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-"<emphasis role=\"strong\">Attention</emphasis> : XDMCP n'utilise pas de "
-"chiffrement. Les mots de passe transiteront en clair sur le réseau, comme "
-"tout le reste."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-"Remarque : les périphériques locaux avec <computeroutput>ltspfs</"
-"computeroutput> cesseront de fonctionner sans LDM."
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-"Pour vérifier si XDMCP est en cours d'exécution, tapez cette commande depuis "
-"une station de travail :"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr "X -query ltspserverXX"
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr ""
-"Si vous êtes sur le réseau de clients légers, veuillez lancer la commande "
-"suivante :"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr "X -query 192.168.0.254"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-"L'objectif est de permettre à votre client léger « réel » de contacter le "
-"serveur XDMCP sur le réseau 192.168.0.254 (dans le cas d'une configuration "
-"standard de Skolelinux)."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-"Si XDMCP n’est pas accessible sur le serveur qui exécute KDM, veuillez "
-"ajouter ceci à <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput> :"
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr "* # any host can get a login window"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr ""
-"L'astérisque précédant le caractère de mise en commentaire « # » est "
-"important. Le reste est un commentaire bien entendu."
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr "Ensuite, lancez XDMCP dans KDM grâce à la commande :"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr "Finalement, veuillez redémarrer KDM en lançant :"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr "sudo service kdm restart"
-
-#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "Connexion de machines Windows au réseau / intégration de Windows"
@@ -9489,9 +9338,15 @@ msgstr ""
"sambaLMPassword) sont identiques."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
+#| "but this will only update the Kerberos password, and not the Samba and "
+#| "GOsa² (LDAP) password. So after you changed your password at the login "
+#| "prompt, you really should also change it using GOsa²."
msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
@@ -13180,6 +13035,141 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid "Modifying the KDM login screen"
+#~ msgstr "Modification de l'écran de connexion de KDM"
+
+#~ msgid ""
+#~ "Customisations to the KDM login screen are made by adding a file in "
+#~ "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables "
+#~ "to override the default."
+#~ msgstr ""
+#~ "La personnalisation de l'écran de connexion de KDM se fait en ajoutant "
+#~ "dans <computeroutput>/etc/default/kdm.d/</computeroutput> un fichier qui "
+#~ "indique les valeur des variables à surcharger."
+
+#~ msgid ""
+#~ "Here is one example used to activate the theme in the "
+#~ "<computeroutput>desktop-base</computeroutput> package:"
+#~ msgstr ""
+#~ "Voici un exemple utilisé pour activer le thème du paquet "
+#~ "<computeroutput>desktop-base</computeroutput> :"
+
+#~ msgid ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+#~ msgstr ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+
+#~ msgid ""
+#~ "See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
+#~ "information on how these variables are used."
+#~ msgstr ""
+#~ "Consulter le code de <computeroutput>/etc/init.d/kdm</computeroutput> "
+#~ "pour des informations concernant l'utilisation de ces variables."
+
+#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">Noyau des clients légers</emphasis>"
+
+#~ msgid ""
+#~ "In order to support older hardware the package <computeroutput>linux-"
+#~ "image-586</computeroutput> is installed by default. If all LTSP client "
+#~ "machines support the 686 processor architecture the <computeroutput>linux-"
+#~ "image-686</computeroutput> package could be installed in the chroot. Make "
+#~ "sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Afin de pouvoir prendre en charge du matériel plus ancien, le paquet "
+#~ "<computeroutput>linux-image-486</computeroutput> est installé par défaut. "
+#~ "Si tous les clients légers prennent en charge l'architecture de "
+#~ "processeur 686, le paquet <computeroutput>linux-image-686</"
+#~ "computeroutput> peut être installé dans le chroot. Assurez-vous "
+#~ "d'exécuter <computeroutput>ltsp-update-kernels</computeroutput> après "
+#~ "l'installation."
+
+#~ msgid "Replacing LDM with KDM"
+#~ msgstr "Remplacer LDM par KDM"
+
+#~ msgid ""
+#~ "Since version 3.0 Skolelinux has been running LDM as its login manager, "
+#~ "which uses a secure SSH tunnel to log in. Switching to KDM also requires "
+#~ "a switch to XDMCP, which uses lower CPU resources on the clients and on "
+#~ "the server."
+#~ msgstr ""
+#~ "Depuis la version 3.0, Skolelinux utilise LDM comme gestionnaire de "
+#~ "connexions. Il utilise un tunnel SSH sécurisé pour la connexion. Si vous "
+#~ "utilisez KDM vous devez également utiliser XDMCP. Celui-ci utilise moins "
+#~ "de ressources processeur sur les clients et le serveur."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use "
+#~ "encryption. Passwords will travel in cleartext over the network, as well "
+#~ "as anything else."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Attention</emphasis> : XDMCP n'utilise pas de "
+#~ "chiffrement. Les mots de passe transiteront en clair sur le réseau, comme "
+#~ "tout le reste."
+
+#~ msgid ""
+#~ "Note: local devices with <computeroutput>ltspfs</computeroutput> will "
+#~ "stop working without LDM."
+#~ msgstr ""
+#~ "Remarque : les périphériques locaux avec <computeroutput>ltspfs</"
+#~ "computeroutput> cesseront de fonctionner sans LDM."
+
+#~ msgid "To check if XDMCP is running, run this command from a workstation:"
+#~ msgstr ""
+#~ "Pour vérifier si XDMCP est en cours d'exécution, tapez cette commande "
+#~ "depuis une station de travail :"
+
+#~ msgid "X -query ltspserverXX"
+#~ msgstr "X -query ltspserverXX"
+
+#~ msgid "If you are on the thin client network, run this command:"
+#~ msgstr ""
+#~ "Si vous êtes sur le réseau de clients légers, veuillez lancer la commande "
+#~ "suivante :"
+
+#~ msgid "X -query 192.168.0.254"
+#~ msgstr "X -query 192.168.0.254"
+
+#~ msgid ""
+#~ "The goal is to let your \"real\" thin client contact the xdmcp-server on "
+#~ "192.168.0.254 (given a standard Skolelinux configuration)."
+#~ msgstr ""
+#~ "L'objectif est de permettre à votre client léger « réel » de contacter le "
+#~ "serveur XDMCP sur le réseau 192.168.0.254 (dans le cas d'une "
+#~ "configuration standard de Skolelinux)."
+
+#~ msgid ""
+#~ "If XDMCP is not accessible on your server which runs KDM, add the "
+#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+#~ msgstr ""
+#~ "Si XDMCP n’est pas accessible sur le serveur qui exécute KDM, veuillez "
+#~ "ajouter ceci à <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput> :"
+
+#~ msgid "* # any host can get a login window"
+#~ msgstr "* # any host can get a login window"
+
+#~ msgid ""
+#~ "The star before the comment '#' is important; the rest is a comment, of "
+#~ "course"
+#~ msgstr ""
+#~ "L'astérisque précédant le caractère de mise en commentaire « # » est "
+#~ "important. Le reste est un commentaire bien entendu."
+
+#~ msgid "Then turn on XDMCP in KDM with the command:"
+#~ msgstr "Ensuite, lancez XDMCP dans KDM grâce à la commande :"
+
+#~ msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+#~ msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+
+#~ msgid "Finally, restart KDM by running:"
+#~ msgstr "Finalement, veuillez redémarrer KDM en lançant :"
+
+#~ msgid "sudo service kdm restart"
+#~ msgstr "sudo service kdm restart"
+
#, fuzzy
#~| msgid "./images/gosa2_overview.png"
#~ msgid "{{attachment:gosa2_overview.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index e004cea..33c3b22 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\n"
"PO-Revision-Date: 2015-05-04 19:34+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1077,10 +1077,16 @@ msgstr ""
"\"Architecture\">architettura della rete</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
+#| "(Debian architecture 'i386', oldest supported processors are Intel "
+#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
+#| "processors."
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"I computer su cui eseguire Debian Edu / Skolelinux devono aver processori a "
"32 bit (Architettura Debian 'i386', i processori più vecchi supportati sono "
@@ -1152,15 +1158,21 @@ msgstr ""
"installato:"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 60 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
"main server + thin client server: 60 GiB. Come al solito con lo spazio disco "
"sul server principale, \"più grande è meglio\"."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+#, fuzzy
+#| msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr "thin client server: 40 GiB."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1213,7 +1225,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr "./images/smile.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ":)"
@@ -6397,45 +6409,6 @@ msgid "HowTos for the desktop"
msgstr "HowTo per il desktop"
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr "Modificare la schermata di login di KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-"Per personalizzare la schermata di login di KDM occorre aggiungere un file "
-"in <computeroutput>/etc/default/kdm.d/</computeroutput> specificando le "
-"variabili che sostituiscano quelle predefinite."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-"Questo è un esempio usato per attivare il tema nel pacchetto "
-"<computeroutput>desktop-base</computeroutput>:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-"Vedere il codice in <computeroutput>/etc/init.d/kdm</computeroutput> per "
-"avere informazioni su come queste variabili vanno usate."
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr "Usare insieme KDE \"Plasma\", GNOME, LXDE, Xfce e MATE"
@@ -6603,7 +6576,7 @@ msgid ""
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6806,26 +6779,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr "<emphasis role=\"strong\">Kernel del client LTSP</emphasis>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-"Per supportare l'hardware più vecchio il pacchetto <computeroutput>linux-"
-"image-586</computeroutput> è installato in modo predefinito. Se tutti i "
-"client LTSP supportano l'architettura 686 il pacchetto <computeroutput>linux-"
-"image-686</computeroutput> potrebbe essere installato in chroot. Assicurarsi "
-"di eseguire <computeroutput>ltsp-update-kernels</computeroutput> dopo "
-"l'installazione."
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr "Selezione del tipo di client LTSP"
@@ -7781,106 +7734,6 @@ msgstr ""
"workstation senza dischi."
#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr "Sostituire LDM con KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-"Dalla versione Skolelinux 3.0, LDM è usato come login manager. Usa un tunnel "
-"sicuro SSH per fare i login. Il passaggio a KDM richiede anche il passaggio "
-"a XDMCP. che usa meno risorse CPU sui client e sui server."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-"<emphasis role=\"strong\">Attenzione</emphasis>: XDMCP non usa la cifratura. "
-"Le password viaggiano in chiaro nella rete così come ogni altra cosa."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-"Nota: i dispositivi locali con <computeroutput>ltspfs</computeroutput> non "
-"funzioneranno senza LDM."
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-"Per verificare se XDMCP è in funzione, occorre eseguire questo comando da "
-"una workstation:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr "X -query ltspserverXX"
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr "Se si è nella rete dei thin-client, occorre eseguire questo comando:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr "X -query 192.168.0.254"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-"L'obiettivo è di permettere al thin-client \"reale\" di contattare il server "
-"xdmcp sulla rete 192.168.0.254 (se in una configurazione standard di "
-"Skolelinux)."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-"Se XDMCP non è accessibile sul proprio server che esegue KDM , aggiungere a "
-"<computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr "* # any host can get a login window"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr ""
-"La stella prima del commento \"#\" è importante, quello che segue "
-"naturalmente è un commento"
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr "Quindi avviare XDMCP in KDM con il comando:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr "Da ultimo, riavviare KDM eseguendo:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr "sudo service kdm restart"
-
-#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "Connettere macchine Windows alla rete / Integrazione con Windows"
@@ -9303,9 +9156,15 @@ msgstr ""
"e smbaLMPassword) siano le stesse."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
+#| "but this will only update the Kerberos password, and not the Samba and "
+#| "GOsa² (LDAP) password. So after you changed your password at the login "
+#| "prompt, you really should also change it using GOsa²."
msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
@@ -12921,6 +12780,138 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Modifying the KDM login screen"
+#~ msgstr "Modificare la schermata di login di KDM"
+
+#~ msgid ""
+#~ "Customisations to the KDM login screen are made by adding a file in "
+#~ "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables "
+#~ "to override the default."
+#~ msgstr ""
+#~ "Per personalizzare la schermata di login di KDM occorre aggiungere un "
+#~ "file in <computeroutput>/etc/default/kdm.d/</computeroutput> specificando "
+#~ "le variabili che sostituiscano quelle predefinite."
+
+#~ msgid ""
+#~ "Here is one example used to activate the theme in the "
+#~ "<computeroutput>desktop-base</computeroutput> package:"
+#~ msgstr ""
+#~ "Questo è un esempio usato per attivare il tema nel pacchetto "
+#~ "<computeroutput>desktop-base</computeroutput>:"
+
+#~ msgid ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+#~ msgstr ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+
+#~ msgid ""
+#~ "See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
+#~ "information on how these variables are used."
+#~ msgstr ""
+#~ "Vedere il codice in <computeroutput>/etc/init.d/kdm</computeroutput> per "
+#~ "avere informazioni su come queste variabili vanno usate."
+
+#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">Kernel del client LTSP</emphasis>"
+
+#~ msgid ""
+#~ "In order to support older hardware the package <computeroutput>linux-"
+#~ "image-586</computeroutput> is installed by default. If all LTSP client "
+#~ "machines support the 686 processor architecture the <computeroutput>linux-"
+#~ "image-686</computeroutput> package could be installed in the chroot. Make "
+#~ "sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Per supportare l'hardware più vecchio il pacchetto <computeroutput>linux-"
+#~ "image-586</computeroutput> è installato in modo predefinito. Se tutti i "
+#~ "client LTSP supportano l'architettura 686 il pacchetto "
+#~ "<computeroutput>linux-image-686</computeroutput> potrebbe essere "
+#~ "installato in chroot. Assicurarsi di eseguire <computeroutput>ltsp-update-"
+#~ "kernels</computeroutput> dopo l'installazione."
+
+#~ msgid "Replacing LDM with KDM"
+#~ msgstr "Sostituire LDM con KDM"
+
+#~ msgid ""
+#~ "Since version 3.0 Skolelinux has been running LDM as its login manager, "
+#~ "which uses a secure SSH tunnel to log in. Switching to KDM also requires "
+#~ "a switch to XDMCP, which uses lower CPU resources on the clients and on "
+#~ "the server."
+#~ msgstr ""
+#~ "Dalla versione Skolelinux 3.0, LDM è usato come login manager. Usa un "
+#~ "tunnel sicuro SSH per fare i login. Il passaggio a KDM richiede anche il "
+#~ "passaggio a XDMCP. che usa meno risorse CPU sui client e sui server."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use "
+#~ "encryption. Passwords will travel in cleartext over the network, as well "
+#~ "as anything else."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Attenzione</emphasis>: XDMCP non usa la "
+#~ "cifratura. Le password viaggiano in chiaro nella rete così come ogni "
+#~ "altra cosa."
+
+#~ msgid ""
+#~ "Note: local devices with <computeroutput>ltspfs</computeroutput> will "
+#~ "stop working without LDM."
+#~ msgstr ""
+#~ "Nota: i dispositivi locali con <computeroutput>ltspfs</computeroutput> "
+#~ "non funzioneranno senza LDM."
+
+#~ msgid "To check if XDMCP is running, run this command from a workstation:"
+#~ msgstr ""
+#~ "Per verificare se XDMCP è in funzione, occorre eseguire questo comando da "
+#~ "una workstation:"
+
+#~ msgid "X -query ltspserverXX"
+#~ msgstr "X -query ltspserverXX"
+
+#~ msgid "If you are on the thin client network, run this command:"
+#~ msgstr ""
+#~ "Se si è nella rete dei thin-client, occorre eseguire questo comando:"
+
+#~ msgid "X -query 192.168.0.254"
+#~ msgstr "X -query 192.168.0.254"
+
+#~ msgid ""
+#~ "The goal is to let your \"real\" thin client contact the xdmcp-server on "
+#~ "192.168.0.254 (given a standard Skolelinux configuration)."
+#~ msgstr ""
+#~ "L'obiettivo è di permettere al thin-client \"reale\" di contattare il "
+#~ "server xdmcp sulla rete 192.168.0.254 (se in una configurazione standard "
+#~ "di Skolelinux)."
+
+#~ msgid ""
+#~ "If XDMCP is not accessible on your server which runs KDM, add the "
+#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+#~ msgstr ""
+#~ "Se XDMCP non è accessibile sul proprio server che esegue KDM , aggiungere "
+#~ "a <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+
+#~ msgid "* # any host can get a login window"
+#~ msgstr "* # any host can get a login window"
+
+#~ msgid ""
+#~ "The star before the comment '#' is important; the rest is a comment, of "
+#~ "course"
+#~ msgstr ""
+#~ "La stella prima del commento \"#\" è importante, quello che segue "
+#~ "naturalmente è un commento"
+
+#~ msgid "Then turn on XDMCP in KDM with the command:"
+#~ msgstr "Quindi avviare XDMCP in KDM con il comando:"
+
+#~ msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+#~ msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+
+#~ msgid "Finally, restart KDM by running:"
+#~ msgstr "Da ultimo, riavviare KDM eseguendo:"
+
+#~ msgid "sudo service kdm restart"
+#~ msgstr "sudo service kdm restart"
+
#, fuzzy
#~| msgid "./images/gosa2_overview.png"
#~ msgid "{{attachment:gosa2_overview.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index 83fe5ac..4a377e2 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\n"
"PO-Revision-Date: 2016-07-20 23:17+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -1029,10 +1029,16 @@ msgstr ""
"構成</link>の章で説明しています。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
+#| "(Debian architecture 'i386', oldest supported processors are Intel "
+#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
+#| "processors."
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"Debian Edu / Skolelinux を実行するコンピュータには32ビット (Debian アーキテク"
"チャ「i386」、Intel Pentium 及び AMD K5 以降のプロセッサをサポート) または64"
@@ -1102,15 +1108,21 @@ msgstr ""
"要求される最小ディスク容量はインストールしたプロファイルにより異なります:"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 60 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
"中心サーバ + シンクライアントサーバ: 60GiB。中心サーバのディスク容量について"
"は例によって「多ければ多いほどよい」ということになります。"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+#, fuzzy
+#| msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr "シンクライアントサーバ: 40GiB"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1163,7 +1175,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr "./images/smile.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ":)"
@@ -5993,45 +6005,6 @@ msgid "HowTos for the desktop"
msgstr "デスクトップ HowTo"
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr "KDM ログイン画面の変更"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-"KDM ログイン画面の独自化は <computeroutput>/etc/default/kdm.d/</"
-"computeroutput> にファイルを追加し、変数を指定してデフォルトを上書きすること"
-"で行います。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-"<computeroutput>desktop-base</computeroutput> パッケージでテーマを有効にする"
-"例です:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-"上記の変数の使い方に関するさらなる情報については <computeroutput>/etc/init.d/"
-"kdm</computeroutput> のコードを見てください。"
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr "KDE「Plasma」、GNOME、LXDE、Xfce と MATE の平行利用"
@@ -6201,7 +6174,7 @@ msgid ""
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6403,26 +6376,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr "<emphasis role=\"strong\">LTSP クライアントのカーネル</emphasis>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-"より古いハードウェアをサポートするためにパッケージ <computeroutput>linux-"
-"image-586</computeroutput> がデフォルトでインストールされます。全 LTSP クライ"
-"アントマシンで686プロセッサアーキテクチャをサポートしていれば "
-"<computeroutput>linux-image-686</computeroutput> パッケージを chroot にインス"
-"トールすることもできます。インストール後に必ず <computeroutput>ltsp-update-"
-"kernels</computeroutput> を実行してください。"
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr "LTSP クライアントの種類の選択"
@@ -7346,103 +7299,6 @@ msgstr ""
"クステーションとしても利用できるという利点があります。"
#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-"Skolelinux ではバージョン 3.0 から LDM をログインマネージャーとして利用してい"
-"ます。これはログインにSSHトンネルを使います。KDM に切り替えるためには XDMCP "
-"への切り替えも必要となり、これが利用するクライアントとサーバのCPUリソースは少"
-"なくなります。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-"<emphasis role=\"strong\">警告</emphasis>: XDMCP は暗号化を行いません。パス"
-"ワードも (最初だけ例外ですが) 他の全てと同様に平文のままネットワークを流れま"
-"す。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-"XDMCP が実行されているか確認するにはワークステーションからこのコマンドを実行"
-"します:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr "X -query ltspserverXX"
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr "そのシンクライアントのネットワークからの場合は:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr "X -query 192.168.0.254"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-"目的は「実際の」シンクライアントに (標準的な Skolelinux 設定だとして) "
-"192.168.0.254 にある xdmcp-server と通信させることです。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-"KDM を実行しているサーバに XDMCP でアクセスできない場合は <computeroutput>/"
-"etc/kde4/kdm/Xaccess</computeroutput> に以下を追加します:"
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr "* # 任意のホストでログインウィンドウを得られることになります"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr "コメント記号「#」の前の「*」が重要です。残りはもちろんコメントです。"
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr "それから XDMCP を KDM で有効化します:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr "最後に、実行中の KDM を再起動します:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr "sudo service kdm restart"
-
-#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "ネットワークへの Windows マシンの接続 / Windows との統合"
@@ -8780,9 +8636,15 @@ msgstr ""
"貫性を確保できます。"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
+#| "but this will only update the Kerberos password, and not the Samba and "
+#| "GOsa² (LDAP) password. So after you changed your password at the login "
+#| "prompt, you really should also change it using GOsa²."
msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
@@ -11921,6 +11783,126 @@ msgstr ""
"もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
"skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+#~ msgid "Modifying the KDM login screen"
+#~ msgstr "KDM ログイン画面の変更"
+
+#~ msgid ""
+#~ "Customisations to the KDM login screen are made by adding a file in "
+#~ "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables "
+#~ "to override the default."
+#~ msgstr ""
+#~ "KDM ログイン画面の独自化は <computeroutput>/etc/default/kdm.d/</"
+#~ "computeroutput> にファイルを追加し、変数を指定してデフォルトを上書きするこ"
+#~ "とで行います。"
+
+#~ msgid ""
+#~ "Here is one example used to activate the theme in the "
+#~ "<computeroutput>desktop-base</computeroutput> package:"
+#~ msgstr ""
+#~ "<computeroutput>desktop-base</computeroutput> パッケージでテーマを有効にす"
+#~ "る例です:"
+
+#~ msgid ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+#~ msgstr ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+
+#~ msgid ""
+#~ "See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
+#~ "information on how these variables are used."
+#~ msgstr ""
+#~ "上記の変数の使い方に関するさらなる情報については <computeroutput>/etc/"
+#~ "init.d/kdm</computeroutput> のコードを見てください。"
+
+#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">LTSP クライアントのカーネル</emphasis>"
+
+#~ msgid ""
+#~ "In order to support older hardware the package <computeroutput>linux-"
+#~ "image-586</computeroutput> is installed by default. If all LTSP client "
+#~ "machines support the 686 processor architecture the <computeroutput>linux-"
+#~ "image-686</computeroutput> package could be installed in the chroot. Make "
+#~ "sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "より古いハードウェアをサポートするためにパッケージ <computeroutput>linux-"
+#~ "image-586</computeroutput> がデフォルトでインストールされます。全 LTSP ク"
+#~ "ライアントマシンで686プロセッサアーキテクチャをサポートしていれば "
+#~ "<computeroutput>linux-image-686</computeroutput> パッケージを chroot にイ"
+#~ "ンストールすることもできます。インストール後に必ず <computeroutput>ltsp-"
+#~ "update-kernels</computeroutput> を実行してください。"
+
+#~ msgid ""
+#~ "Since version 3.0 Skolelinux has been running LDM as its login manager, "
+#~ "which uses a secure SSH tunnel to log in. Switching to KDM also requires "
+#~ "a switch to XDMCP, which uses lower CPU resources on the clients and on "
+#~ "the server."
+#~ msgstr ""
+#~ "Skolelinux ではバージョン 3.0 から LDM をログインマネージャーとして利用し"
+#~ "ています。これはログインにSSHトンネルを使います。KDM に切り替えるためには "
+#~ "XDMCP への切り替えも必要となり、これが利用するクライアントとサーバのCPUリ"
+#~ "ソースは少なくなります。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use "
+#~ "encryption. Passwords will travel in cleartext over the network, as well "
+#~ "as anything else."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">警告</emphasis>: XDMCP は暗号化を行いません。パ"
+#~ "スワードも (最初だけ例外ですが) 他の全てと同様に平文のままネットワークを流"
+#~ "れます。"
+
+#~ msgid "To check if XDMCP is running, run this command from a workstation:"
+#~ msgstr ""
+#~ "XDMCP が実行されているか確認するにはワークステーションからこのコマンドを実"
+#~ "行します:"
+
+#~ msgid "X -query ltspserverXX"
+#~ msgstr "X -query ltspserverXX"
+
+#~ msgid "If you are on the thin client network, run this command:"
+#~ msgstr "そのシンクライアントのネットワークからの場合は:"
+
+#~ msgid "X -query 192.168.0.254"
+#~ msgstr "X -query 192.168.0.254"
+
+#~ msgid ""
+#~ "The goal is to let your \"real\" thin client contact the xdmcp-server on "
+#~ "192.168.0.254 (given a standard Skolelinux configuration)."
+#~ msgstr ""
+#~ "目的は「実際の」シンクライアントに (標準的な Skolelinux 設定だとして) "
+#~ "192.168.0.254 にある xdmcp-server と通信させることです。"
+
+#~ msgid ""
+#~ "If XDMCP is not accessible on your server which runs KDM, add the "
+#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+#~ msgstr ""
+#~ "KDM を実行しているサーバに XDMCP でアクセスできない場合は "
+#~ "<computeroutput>/etc/kde4/kdm/Xaccess</computeroutput> に以下を追加します:"
+
+#~ msgid "* # any host can get a login window"
+#~ msgstr "* # 任意のホストでログインウィンドウを得られることになります"
+
+#~ msgid ""
+#~ "The star before the comment '#' is important; the rest is a comment, of "
+#~ "course"
+#~ msgstr ""
+#~ "コメント記号「#」の前の「*」が重要です。残りはもちろんコメントです。"
+
+#~ msgid "Then turn on XDMCP in KDM with the command:"
+#~ msgstr "それから XDMCP を KDM で有効化します:"
+
+#~ msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+#~ msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+
+#~ msgid "Finally, restart KDM by running:"
+#~ msgstr "最後に、実行中の KDM を再起動します:"
+
+#~ msgid "sudo service kdm restart"
+#~ msgstr "sudo service kdm restart"
+
#~ msgid "{{attachment:gosa2_overview.png}}"
#~ msgstr "{{attachment:gosa2_overview.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index cf1fae4..69a7e93 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\n"
"PO-Revision-Date: 2015-06-02 12:58+0000\n"
"Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -1069,10 +1069,16 @@ msgstr ""
"\">nettverksarkitektur</ulink>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
+#| "(Debian architecture 'i386', oldest supported processors are Intel "
+#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
+#| "processors."
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"Datamaskinene som bruker Skolelinux må enten ha x86-prosessorer som er 32-"
"bit (Debian-arkitektur «i386», eldste støttede prosessorer er Intel Pentium "
@@ -1140,15 +1146,21 @@ msgstr ""
"Minimumskravet til lagerplass avhenger av hvilken profil som er installert:"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 60 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
"Hovedtjener + tynnklient: 60 GiB. Som vanlig med diskplass på en "
"hovedtjener, «jo større jo bedre»."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+#, fuzzy
+#| msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr "Tynnklienttjener: 40 GiB."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1201,7 +1213,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr "./images/smile.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ":)"
@@ -6310,45 +6322,6 @@ msgid "HowTos for the desktop"
msgstr "Veiledninger for skrivebordet"
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr "Modifisere innloggingskjermen KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-"I Debian/Squeeze så ble måten å tilpasse innloggingskjermen KDE forandret. "
-"Nå blir det gjort ved å legge en fil til <computeroutput>/etc/default/kdm.d/"
-"</computeroutput> som oppgir variabler som overstyrer standardvariablene."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-"Her er et eksempel som aktiverer temaet i <computeroutput>desktop-base</"
-"computeroutput>-pakken:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-"Se på koden i <computeroutput>/etc/init.d/kdm</computeroutput> for å få "
-"informasjon om hvordan disse variablene blir brukt."
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr "Bruk av KDE «Plasma», GNOME, LXDE, Xfce og/eller MATE sammen"
@@ -6519,7 +6492,7 @@ msgid ""
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6717,25 +6690,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-"For å støtte eldre maskinvare er pakken <computeroutput> linux-image-586 </"
-"computeroutput> installert som standard. Hvis alle LTSP-klientmaskiner "
-"støtter 686 prosessorarkitekturen, kan pakken <computeroutput> linux-"
-"image-686</computeroutput> installeres i chroot-en. Husk å kjøre "
-"<computeroutput>ltsp-update-kjernels</computeroutput> etter installasjon."
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr "Velg type installasjon"
@@ -7669,104 +7623,6 @@ msgstr ""
"kjøre dem som diskløse arbeidsstasjoner."
#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr "Erstatte LDM med KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-"Skolelinux 3.0 benytter LDM som innloggingsbehandler. Den bruker en sikker "
-"SSH-tunnel for å logge inn. For å bruke KDM er det nødvendig å bytte til "
-"XDMCP. XDMCP bruker mindre prosessorressurser på klientene og på tjeneren"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-"<emphasis role=\"strong\">Advarsel</emphasis>: XDMCP bruker ikke kryptering. "
-"Passord sendes i klartekst over nettverket, i likhet med all annen trafikk."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-" NB: lokale enheter med <computeroutput>LtspFS</computeroutput> vil ikke "
-"fungere lenger uten LDM."
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-"For å sjekke om XDMCP kjører kjør denne kommandoen fra en arbeidsstasjon:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr "X -query ltspserverXX"
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr "Hvis du er i tynnklientnettet, kjør denne kommandoen:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr "X -query 192.168.0.254"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-"Målet er å få din «virkelige» tynnklient til å kontakte XDMCP-tjeneren på "
-"192.168.0.254 (forutsatt et standard Skolelinux-oppsett)."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-"Hvis XDMCP ikke er tilgjengelig på din tjener som kjører KDM, legg følgende "
-"til <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr "* # hver vertsmaskin kan ha et innloggings-vindu"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr ""
-"Stjernen foran en kommentar \"#\" er viktig, resten er selvfølgelig en "
-"kommentar "
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr "Slå så på XDMCP i KDM med kommandoen:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr "Til slutt restartes KDM ved å kjøre:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr "sudo service kdm restart"
-
-#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "Koble Windows-maskiner til nettverket / Windows-integrasjon"
@@ -9185,9 +9041,15 @@ msgstr ""
"smbaLMPassword) er de samme."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
+#| "but this will only update the Kerberos password, and not the Samba and "
+#| "GOsa² (LDAP) password. So after you changed your password at the login "
+#| "prompt, you really should also change it using GOsa²."
msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
@@ -12771,6 +12633,136 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid "Modifying the KDM login screen"
+#~ msgstr "Modifisere innloggingskjermen KDM"
+
+#~ msgid ""
+#~ "Customisations to the KDM login screen are made by adding a file in "
+#~ "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables "
+#~ "to override the default."
+#~ msgstr ""
+#~ "I Debian/Squeeze så ble måten å tilpasse innloggingskjermen KDE "
+#~ "forandret. Nå blir det gjort ved å legge en fil til <computeroutput>/etc/"
+#~ "default/kdm.d/</computeroutput> som oppgir variabler som overstyrer "
+#~ "standardvariablene."
+
+#~ msgid ""
+#~ "Here is one example used to activate the theme in the "
+#~ "<computeroutput>desktop-base</computeroutput> package:"
+#~ msgstr ""
+#~ "Her er et eksempel som aktiverer temaet i <computeroutput>desktop-base</"
+#~ "computeroutput>-pakken:"
+
+#~ msgid ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+#~ msgstr ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+
+#~ msgid ""
+#~ "See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
+#~ "information on how these variables are used."
+#~ msgstr ""
+#~ "Se på koden i <computeroutput>/etc/init.d/kdm</computeroutput> for å få "
+#~ "informasjon om hvordan disse variablene blir brukt."
+
+#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+#~ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
+
+#~ msgid ""
+#~ "In order to support older hardware the package <computeroutput>linux-"
+#~ "image-586</computeroutput> is installed by default. If all LTSP client "
+#~ "machines support the 686 processor architecture the <computeroutput>linux-"
+#~ "image-686</computeroutput> package could be installed in the chroot. Make "
+#~ "sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "For å støtte eldre maskinvare er pakken <computeroutput> linux-image-586 "
+#~ "</computeroutput> installert som standard. Hvis alle LTSP-klientmaskiner "
+#~ "støtter 686 prosessorarkitekturen, kan pakken <computeroutput> linux-"
+#~ "image-686</computeroutput> installeres i chroot-en. Husk å kjøre "
+#~ "<computeroutput>ltsp-update-kjernels</computeroutput> etter installasjon."
+
+#~ msgid "Replacing LDM with KDM"
+#~ msgstr "Erstatte LDM med KDM"
+
+#~ msgid ""
+#~ "Since version 3.0 Skolelinux has been running LDM as its login manager, "
+#~ "which uses a secure SSH tunnel to log in. Switching to KDM also requires "
+#~ "a switch to XDMCP, which uses lower CPU resources on the clients and on "
+#~ "the server."
+#~ msgstr ""
+#~ "Skolelinux 3.0 benytter LDM som innloggingsbehandler. Den bruker en "
+#~ "sikker SSH-tunnel for å logge inn. For å bruke KDM er det nødvendig å "
+#~ "bytte til XDMCP. XDMCP bruker mindre prosessorressurser på klientene og "
+#~ "på tjeneren"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use "
+#~ "encryption. Passwords will travel in cleartext over the network, as well "
+#~ "as anything else."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Advarsel</emphasis>: XDMCP bruker ikke "
+#~ "kryptering. Passord sendes i klartekst over nettverket, i likhet med all "
+#~ "annen trafikk."
+
+#~ msgid ""
+#~ "Note: local devices with <computeroutput>ltspfs</computeroutput> will "
+#~ "stop working without LDM."
+#~ msgstr ""
+#~ " NB: lokale enheter med <computeroutput>LtspFS</computeroutput> vil ikke "
+#~ "fungere lenger uten LDM."
+
+#~ msgid "To check if XDMCP is running, run this command from a workstation:"
+#~ msgstr ""
+#~ "For å sjekke om XDMCP kjører kjør denne kommandoen fra en arbeidsstasjon:"
+
+#~ msgid "X -query ltspserverXX"
+#~ msgstr "X -query ltspserverXX"
+
+#~ msgid "If you are on the thin client network, run this command:"
+#~ msgstr "Hvis du er i tynnklientnettet, kjør denne kommandoen:"
+
+#~ msgid "X -query 192.168.0.254"
+#~ msgstr "X -query 192.168.0.254"
+
+#~ msgid ""
+#~ "The goal is to let your \"real\" thin client contact the xdmcp-server on "
+#~ "192.168.0.254 (given a standard Skolelinux configuration)."
+#~ msgstr ""
+#~ "Målet er å få din «virkelige» tynnklient til å kontakte XDMCP-tjeneren på "
+#~ "192.168.0.254 (forutsatt et standard Skolelinux-oppsett)."
+
+#~ msgid ""
+#~ "If XDMCP is not accessible on your server which runs KDM, add the "
+#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+#~ msgstr ""
+#~ "Hvis XDMCP ikke er tilgjengelig på din tjener som kjører KDM, legg "
+#~ "følgende til <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+
+#~ msgid "* # any host can get a login window"
+#~ msgstr "* # hver vertsmaskin kan ha et innloggings-vindu"
+
+#~ msgid ""
+#~ "The star before the comment '#' is important; the rest is a comment, of "
+#~ "course"
+#~ msgstr ""
+#~ "Stjernen foran en kommentar \"#\" er viktig, resten er selvfølgelig en "
+#~ "kommentar "
+
+#~ msgid "Then turn on XDMCP in KDM with the command:"
+#~ msgstr "Slå så på XDMCP i KDM med kommandoen:"
+
+#~ msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+#~ msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+
+#~ msgid "Finally, restart KDM by running:"
+#~ msgstr "Til slutt restartes KDM ved å kjøre:"
+
+#~ msgid "sudo service kdm restart"
+#~ msgstr "sudo service kdm restart"
+
#, fuzzy
#~| msgid "./images/gosa2_overview.png"
#~ msgid "{{attachment:gosa2_overview.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index e509e96..0ea1572 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
"Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\n"
"PO-Revision-Date: 2016-10-03 16:16+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -178,7 +178,6 @@ msgid "Network"
msgstr "Het netwerk"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/Debian_Edu_Network_Jessie.png"
msgid "./images/Debian_Edu_Network_Stretch.png"
msgstr "./images/Debian_Edu_Network_Stretch.png"
@@ -1095,10 +1094,16 @@ msgstr ""
"hoofdstuk <link linkend=\"Architecture\">Architectuur van het netwerk</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
+#| "(Debian architecture 'i386', oldest supported processors are Intel "
+#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
+#| "processors."
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"De computers met Debian Edu / Skolelinux moeten ofwel een 32-bits (Debian "
"architectuur 'i386' met als oudste nog ondersteunde processors Intel Pentium "
@@ -1175,15 +1180,21 @@ msgstr ""
"profiel:"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 60 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
"hoofdserver + thlin-clientserver: 60GB. Zoals gewoonlijk met schijfruimte op "
"een hoofdserver, geldt \"hoe meer, hoe beter\"."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+#, fuzzy
+#| msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr "Thin-clientserver: 40GB."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1237,7 +1248,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr "./images/smile.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ":)"
@@ -4135,7 +4146,6 @@ msgstr ""
"welke de oudste back-up is die u wenst te behouden:"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "{{attachment:slbackup-php_maintenance.png}}"
msgid "./images/slbackup-php_maintenance.png"
msgstr "./images/slbackup-php_maintenance.png"
@@ -6393,46 +6403,6 @@ msgid "HowTos for the desktop"
msgstr "HowTo's in verband met de bureaubladomgeving"
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr "Het KDM-aanmeldscherm aanpassen"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-"Het KDM-aanmeldscherm aanpassen gebeurt door in de map <computeroutput>/etc/"
-"default/kdm.d/</computeroutput> een bestand aan te maken met variabelen die "
-"de standaardinstellingen overschrijven."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-"Hierna volgt een voorbeeld dat u kunt gebruiken om het bureaubladthema uit "
-"het pakket <computeroutput>desktop-base</computeroutput> als nieuw "
-"bureaubladthema in te stellen:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-"Bekijk de code in <computeroutput>/etc/init.d/kdm</computeroutput> voor meer "
-"informatie over het gebruik van deze variabelen."
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr "KDE \"Plasma\", GNOME, LXDE, Xfce en/of MATE samen gebruiken"
@@ -6591,14 +6561,25 @@ msgid "To use www.deb-multimedia.org do the following:"
msgstr "Om www.deb-multimedia.org te kunnen gebruiken, doet u het volgende:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6810,27 +6791,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr "<emphasis role=\"strong\">De kernel van een LTSP-client</emphasis>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-"Om ook oudere apparatuur te blijven ondersteunen wordt standaard het pakket "
-"<computeroutput>linux-image-586</computeroutput> geïnstalleerd. Indien "
-"echter alle LTSP-clients compatibel zijn met de architectuur van een 686-"
-"processor, kunt u het pakket <computeroutput>linux-image-686</"
-"computeroutput> installeren in de chroot. Zorg er voor om na de installatie "
-"het commando <computeroutput>ltsp-update-kernels</computeroutput> uit te "
-"voeren."
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr "De keuze van het type LTSP-client"
@@ -7803,111 +7763,6 @@ msgstr ""
"schijfloze werkstations."
#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr "LDM vervangen door KDM"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-"Vanaf versie 3.0 gebruikt Skolelinux LDM voor aanmeldingsbeheer, omdat het "
-"een veilige SSH-tunnel gebruikt voor de aanmelding. Overschakelen naar KDM "
-"vereist ook dat men overschakelt naar XDMCP, dat minder behoefte heeft aan "
-"processorrekenkracht op de clients en op de server."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-"<emphasis role=\"strong\">Waarschuwing</emphasis>: XDMCP maakt geen gebruik "
-"van versleuteling. Wachtwoorden zullen dus, net zoals al de rest, "
-"ongecodeerd over het netwerk doorgegeven worden."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-"Noot: zonder LDM zullen lokale apparaten die gebruik maken van "
-"<computeroutput>ltspfs</computeroutput> niet langer functioneren."
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-"Om te weten of XDMCP in gebruik is, moet u vanaf een werkstation het "
-"volgende commando gebruiken:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr "X -query ltspserverXX"
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr ""
-"Indien u zich bevindt op het netwerk voor thin clients, gebruikt u het "
-"volgende commando:"
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr "X -query 192.168.0.254"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-"De bedoeling is om uw \"echte\" thin client contact te laten maken met de "
-"xdmcp-server op 192.168.0.254 (hierbij wordt uitgegaan van een "
-"standaardconfiguratie van Skolelinux)."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-"Indien uw server KDM gebruikt en u geen verbinding kunt maken met XDMCP op "
-"die server, moet u aan het bestand <computeroutput>/etc/kde4/kdm/Xaccess</"
-"computeroutput> het volgende toevoegen:"
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr "* # op elk apparaat is het aanmeldscherm beschikbaar"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr ""
-"Het sterretje voor het commentaarteken '#' is wat van belang is; het overige "
-"is uiteraard commentaar"
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr "Zet daarna XDMCP aan in KDM met de opdracht:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr "Tenslotte moet u KDM opnieuw starten met de opdracht:"
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr "sudo service kdm restart"
-
-#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "Windowsmachines met het netwerk verbinden / Windows integreren"
@@ -9362,9 +9217,15 @@ msgstr ""
"(sambaNTPassword and sambaLMPassword) identiek zijn."
#. type: Content of: <article><section><section><para>
-msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+#, fuzzy
+#| msgid ""
+#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
+#| "but this will only update the Kerberos password, and not the Samba and "
+#| "GOsa² (LDAP) password. So after you changed your password at the login "
+#| "prompt, you really should also change it using GOsa²."
+msgid ""
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
@@ -12978,6 +12839,143 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Modifying the KDM login screen"
+#~ msgstr "Het KDM-aanmeldscherm aanpassen"
+
+#~ msgid ""
+#~ "Customisations to the KDM login screen are made by adding a file in "
+#~ "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables "
+#~ "to override the default."
+#~ msgstr ""
+#~ "Het KDM-aanmeldscherm aanpassen gebeurt door in de map <computeroutput>/"
+#~ "etc/default/kdm.d/</computeroutput> een bestand aan te maken met "
+#~ "variabelen die de standaardinstellingen overschrijven."
+
+#~ msgid ""
+#~ "Here is one example used to activate the theme in the "
+#~ "<computeroutput>desktop-base</computeroutput> package:"
+#~ msgstr ""
+#~ "Hierna volgt een voorbeeld dat u kunt gebruiken om het bureaubladthema "
+#~ "uit het pakket <computeroutput>desktop-base</computeroutput> als nieuw "
+#~ "bureaubladthema in te stellen:"
+
+#~ msgid ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+#~ msgstr ""
+#~ "USETHEME=\"true\"\n"
+#~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
+
+#~ msgid ""
+#~ "See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
+#~ "information on how these variables are used."
+#~ msgstr ""
+#~ "Bekijk de code in <computeroutput>/etc/init.d/kdm</computeroutput> voor "
+#~ "meer informatie over het gebruik van deze variabelen."
+
+#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">De kernel van een LTSP-client</emphasis>"
+
+#~ msgid ""
+#~ "In order to support older hardware the package <computeroutput>linux-"
+#~ "image-586</computeroutput> is installed by default. If all LTSP client "
+#~ "machines support the 686 processor architecture the <computeroutput>linux-"
+#~ "image-686</computeroutput> package could be installed in the chroot. Make "
+#~ "sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Om ook oudere apparatuur te blijven ondersteunen wordt standaard het "
+#~ "pakket <computeroutput>linux-image-586</computeroutput> geïnstalleerd. "
+#~ "Indien echter alle LTSP-clients compatibel zijn met de architectuur van "
+#~ "een 686-processor, kunt u het pakket <computeroutput>linux-image-686</"
+#~ "computeroutput> installeren in de chroot. Zorg er voor om na de "
+#~ "installatie het commando <computeroutput>ltsp-update-kernels</"
+#~ "computeroutput> uit te voeren."
+
+#~ msgid "Replacing LDM with KDM"
+#~ msgstr "LDM vervangen door KDM"
+
+#~ msgid ""
+#~ "Since version 3.0 Skolelinux has been running LDM as its login manager, "
+#~ "which uses a secure SSH tunnel to log in. Switching to KDM also requires "
+#~ "a switch to XDMCP, which uses lower CPU resources on the clients and on "
+#~ "the server."
+#~ msgstr ""
+#~ "Vanaf versie 3.0 gebruikt Skolelinux LDM voor aanmeldingsbeheer, omdat "
+#~ "het een veilige SSH-tunnel gebruikt voor de aanmelding. Overschakelen "
+#~ "naar KDM vereist ook dat men overschakelt naar XDMCP, dat minder behoefte "
+#~ "heeft aan processorrekenkracht op de clients en op de server."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use "
+#~ "encryption. Passwords will travel in cleartext over the network, as well "
+#~ "as anything else."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Waarschuwing</emphasis>: XDMCP maakt geen "
+#~ "gebruik van versleuteling. Wachtwoorden zullen dus, net zoals al de rest, "
+#~ "ongecodeerd over het netwerk doorgegeven worden."
+
+#~ msgid ""
+#~ "Note: local devices with <computeroutput>ltspfs</computeroutput> will "
+#~ "stop working without LDM."
+#~ msgstr ""
+#~ "Noot: zonder LDM zullen lokale apparaten die gebruik maken van "
+#~ "<computeroutput>ltspfs</computeroutput> niet langer functioneren."
+
+#~ msgid "To check if XDMCP is running, run this command from a workstation:"
+#~ msgstr ""
+#~ "Om te weten of XDMCP in gebruik is, moet u vanaf een werkstation het "
+#~ "volgende commando gebruiken:"
+
+#~ msgid "X -query ltspserverXX"
+#~ msgstr "X -query ltspserverXX"
+
+#~ msgid "If you are on the thin client network, run this command:"
+#~ msgstr ""
+#~ "Indien u zich bevindt op het netwerk voor thin clients, gebruikt u het "
+#~ "volgende commando:"
+
+#~ msgid "X -query 192.168.0.254"
+#~ msgstr "X -query 192.168.0.254"
+
+#~ msgid ""
+#~ "The goal is to let your \"real\" thin client contact the xdmcp-server on "
+#~ "192.168.0.254 (given a standard Skolelinux configuration)."
+#~ msgstr ""
+#~ "De bedoeling is om uw \"echte\" thin client contact te laten maken met de "
+#~ "xdmcp-server op 192.168.0.254 (hierbij wordt uitgegaan van een "
+#~ "standaardconfiguratie van Skolelinux)."
+
+#~ msgid ""
+#~ "If XDMCP is not accessible on your server which runs KDM, add the "
+#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
+#~ msgstr ""
+#~ "Indien uw server KDM gebruikt en u geen verbinding kunt maken met XDMCP "
+#~ "op die server, moet u aan het bestand <computeroutput>/etc/kde4/kdm/"
+#~ "Xaccess</computeroutput> het volgende toevoegen:"
+
+#~ msgid "* # any host can get a login window"
+#~ msgstr "* # op elk apparaat is het aanmeldscherm beschikbaar"
+
+#~ msgid ""
+#~ "The star before the comment '#' is important; the rest is a comment, of "
+#~ "course"
+#~ msgstr ""
+#~ "Het sterretje voor het commentaarteken '#' is wat van belang is; het "
+#~ "overige is uiteraard commentaar"
+
+#~ msgid "Then turn on XDMCP in KDM with the command:"
+#~ msgstr "Zet daarna XDMCP aan in KDM met de opdracht:"
+
+#~ msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+#~ msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
+
+#~ msgid "Finally, restart KDM by running:"
+#~ msgstr "Tenslotte moet u KDM opnieuw starten met de opdracht:"
+
+#~ msgid "sudo service kdm restart"
+#~ msgstr "sudo service kdm restart"
+
#~ msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
#~ msgstr "{{attachment:Debian_Edu_Network_Stretch.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 141d306..666ecb1 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-09-18 15:24+0200\n"
+"POT-Creation-Date: 2016-10-09 13:55+0200\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"
@@ -787,8 +787,8 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
-"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
-"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
+"(Debian architecture 'i386', oldest supported processors are 686 class ones) "
+"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -838,12 +838,12 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"main server + thin client server: 70 GiB. As usual with disk space on a main "
"server, \"the bigger the better\"."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 40 GiB."
+msgid "thin client server: 50 GiB."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -887,7 +887,7 @@ msgstr ""
msgid "./images/smile.png"
msgstr ""
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":)"
msgstr ""
@@ -4496,36 +4496,6 @@ msgid "HowTos for the desktop"
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Modifying the KDM login screen"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
-"override the default."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base</computeroutput> package:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
-"information on how these variables are used."
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr ""
@@ -4644,7 +4614,7 @@ msgid ""
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -4781,20 +4751,6 @@ msgstr ""
msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
msgstr ""
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In order to support older hardware the package <computeroutput>linux-"
-"image-586</computeroutput> is installed by default. If all LTSP client "
-"machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot. Make "
-"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
-"installation."
-msgstr ""
-
#. type: Content of: <article><section><section><section><title>
msgid "LTSP client type selection"
msgstr ""
@@ -5447,90 +5403,6 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Replacing LDM with KDM"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Since version 3.0 Skolelinux has been running LDM as its login manager, "
-"which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
-"switch to XDMCP, which uses lower CPU resources on the clients and on the "
-"server."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
-"Passwords will travel in cleartext over the network, as well as anything "
-"else."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
-"working without LDM."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "To check if XDMCP is running, run this command from a workstation:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query ltspserverXX"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "If you are on the thin client network, run this command:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "X -query 192.168.0.254"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The goal is to let your \"real\" thin client contact the xdmcp-server on "
-"192.168.0.254 (given a standard Skolelinux configuration)."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If XDMCP is not accessible on your server which runs KDM, add the following "
-"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "* # any host can get a login window"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The star before the comment '#' is important; the rest is a comment, of "
-"course"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "Then turn on XDMCP in KDM with the command:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "Finally, restart KDM by running:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "sudo service kdm restart"
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr ""
@@ -6567,8 +6439,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"Changing passwords using PAM is working also at the GDM login prompt, but "
+"this will only update the Kerberos password, and not the Samba and GOsa² "
"(LDAP) password. So after you changed your password at the login prompt, you "
"really should also change it using GOsa²."
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 43ba833..cdd8a44 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -307,7 +307,7 @@
</para>
<itemizedlist>
<listitem>
-<para>The computers running Debian Edu / Skolelinux must have either 32 bit (Debian architecture 'i386', oldest supported processors are Intel Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors.
+<para>The computers running Debian Edu / Skolelinux must have either 32 bit (Debian architecture 'i386', oldest supported processors are 686 class ones) or 64 bit (Debian architecture 'amd64') x86 processors.
</para></listitem>
<listitem>
<para>At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are recommended for the main and thin client server profiles.
@@ -334,10 +334,10 @@
</para>
<itemizedlist>
<listitem>
-<para>main server + thin client server: 60 GiB. As usual with disk space on a main server, "the bigger the better".
+<para>main server + thin client server: 70 GiB. As usual with disk space on a main server, "the bigger the better".
</para></listitem>
<listitem>
-<para>thin client server: 40 GiB.
+<para>thin client server: 50 GiB.
</para></listitem>
<listitem>
<para>workstation or standalone: 30 GiB.
@@ -2001,18 +2001,6 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
<title>HowTos for the desktop
</title>
-<section id="Desktop--Modifying_the_KDM_login_screen">
-<title>Modifying the KDM login screen
-</title>
-<para>Customisations to the KDM login screen are made by adding a file in <computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to override the default.
-</para>
-<para>Here is one example used to activate the theme in the <computeroutput>desktop-base</computeroutput> package:
-</para><screen><![CDATA[USETHEME="true"
-THEME="/usr/share/apps/kdm/themes/debian-moreblue"]]></screen>
-<para>See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for information on how these variables are used.
-</para>
-</section>
-
<section id="Desktop--Using_KDE_.26quot.3BPlasma.26quot.3B.2C_GNOME.2C_LXDE.2C_Xfce_and.2BAC8or_MATE_together">
<title>Using KDE "Plasma", GNOME, LXDE, Xfce and/or MATE together
</title>
@@ -2058,7 +2046,7 @@ apt-get install debian-keyring
# fetch the deb-multimedia key insecurely:
gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907
# check securely if the key is correct and add it to the keyring used by APT if it is:
-gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -
+gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -
# add repository to sources.list - please check the homepages for mirrors!
echo "deb http://deb-multimedia.org jessie main" >> /etc/apt/sources.list
# update the list of available packages:
@@ -2120,10 +2108,6 @@ ltsp-chroot -d -a i386 apt-get -y -q install <package name>
ltsp-update-kernels]]></screen>
<para>As a shorter alternative -- installing all available firmware and updating the tftpboot directory -- you could execute:
</para><screen><![CDATA[/usr/share/debian-edu-config/tools/ltsp-addfirmware]]></screen>
-<para><emphasis role="strong">LTSP client kernel</emphasis>
-</para>
-<para>In order to support older hardware the package <computeroutput>linux-image-586</computeroutput> is installed by default. If all LTSP client machines support the 686 processor architecture the <computeroutput>linux-image-686</computeroutput> package could be installed in the chroot. Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after installation.
-</para>
<section id="NetworkClients--LTSP_client_type_selection">
<title>LTSP client type selection
@@ -2388,31 +2372,6 @@ exit]]></screen>
</section>
</section>
-<section id="NetworkClients--Replacing_LDM_with_KDM">
-<title>Replacing LDM with KDM
-</title>
-<para>Since version 3.0 Skolelinux has been running LDM as its login manager, which uses a secure SSH tunnel to log in. Switching to KDM also requires a switch to XDMCP, which uses lower CPU resources on the clients and on the server.
-</para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Warning</emphasis>: XDMCP does not use encryption. Passwords will travel in cleartext over the network, as well as anything else.
-</para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Note: local devices with <computeroutput>ltspfs</computeroutput> will stop working without LDM.
-</para>
-<para>To check if XDMCP is running, run this command from a workstation:
-</para><screen><![CDATA[ X -query ltspserverXX]]></screen>
-<para>If you are on the thin client network, run this command:
-</para><screen><![CDATA[ X -query 192.168.0.254]]></screen>
-<para>The goal is to let your "real" thin client contact the xdmcp-server on 192.168.0.254 (given a standard Skolelinux configuration).
-</para>
-<para>If XDMCP is not accessible on your server which runs KDM, add the following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:
-</para><screen><![CDATA[ * # any host can get a login window]]></screen>
-<para>The star before the comment '#' is important; the rest is a comment, of course <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:)</phrase></textobject></inlinemediaobject>
-</para>
-<para>Then turn on XDMCP in KDM with the command:
-</para><screen><![CDATA[ sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true]]></screen>
-<para>Finally, restart KDM by running:
-</para><screen><![CDATA[ sudo service kdm restart]]></screen>
-</section>
-
<section id="NetworkClients--Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration">
<title>Connecting Windows machines to the network / Windows integration
</title>
@@ -2969,7 +2928,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
</para>
<para>Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) passwords are the same.
</para>
-<para>Changing passwords using PAM is working (ie at the KDM/GDM login prompt), but this will only update the Kerberos password, and not the Samba and GOsa² (LDAP) password. So after you changed your password at the login prompt, you really should also change it using GOsa².
+<para>Changing passwords using PAM is working also at the GDM login prompt, but this will only update the Kerberos password, and not the Samba and GOsa² (LDAP) password. So after you changed your password at the login prompt, you really should also change it using GOsa².
</para>
</section>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list