[debian-edu-commits] debian-edu/debian-edu-doc.git (#1524) - master (branch) updated: 1.5_20130706_7.1-4-g6974364
Holger Levsen
holger at alioth.debian.org
Sun Jul 7 15:14:31 UTC 2013
The branch, master has been updated
via 69743640623403ae089bfb52c57f80ec9fbe6a44 (commit)
from da9a5925d98d22e5f22056daad4ede47cd7ca1e5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 69743640623403ae089bfb52c57f80ec9fbe6a44
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Jul 7 17:14:22 2013 +0200
Update manual from the wiki.
-----------------------------------------------------------------------
Summary of changes:
documentation/audacity/audacity-manual.pot | 2 +-
.../debian-edu-squeeze-manual.pot | 2 +-
.../debian-edu-wheezy-manual.da.po | 74 ++++++++++++-----
.../debian-edu-wheezy-manual.de.po | 85 +++++++++++++++-----
.../debian-edu-wheezy-manual.es.po | 46 +++++------
.../debian-edu-wheezy-manual.fr.po | 70 ++++++++++------
.../debian-edu-wheezy-manual.it.po | 69 +++++++++++-----
.../debian-edu-wheezy-manual.nb.po | 63 +++++++++------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 34 ++++----
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 23 +++---
documentation/debian-edu-wheezy/fixme-status.txt | 7 +-
documentation/rosegarden/rosegarden-manual.pot | 2 +-
12 files changed, 301 insertions(+), 176 deletions(-)
The diff of changes is:
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index 41ea516..0722f9f 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 16:37+0300\n"
+"POT-Creation-Date: 2013-07-07 17:14+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index 307a085..f6d2bde 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 16:36+0300\n"
+"POT-Creation-Date: 2013-07-07 17:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index c4312f7..62b6bd3 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-07-07 16:36+0300\n"
+"POT-Creation-Date: 2013-07-07 17:13+0300\n"
"PO-Revision-Date: 2013-02-15 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1393,10 +1393,15 @@ msgstr ""
"eller rsync via:"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: only the CD download links work currently - the DVD and source DVD "
+#| "download URLs need to be adapted for wheezy still... They currently don't "
+#| "work."
msgid ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"download URLs currently don't work, the usbstick image is not mentioned at "
+"all."
msgstr ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
"download URLs need to be adapted for wheezy still... They currently don't "
@@ -2369,6 +2374,17 @@ msgstr ""
"ulink>."
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To disable or change the use of the proxy when installing via PXE, the "
+#| "lines containing <computeroutput>mirror/http/proxy</computeroutput>, "
+#| "<computeroutput>mirror/ftp/proxy</computeroutput> and "
+#| "<computeroutput>preseed/early_command</computeroutput> in "
+#| "<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
+#| "computeroutput> need to be changed. To disable the use of a proxy when "
+#| "installing, put '#' in front of the first two lines, and remove the "
+#| "\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+#| "computeroutput>\" part from the last one."
msgid ""
"To disable or change the use of the proxy when installing via PXE, the lines "
"containing <computeroutput>mirror/http/proxy</computeroutput>, "
@@ -2377,7 +2393,7 @@ msgid ""
"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
"computeroutput> need to be changed. To disable the use of a proxy when "
"installing, put '#' in front of the first two lines, and remove the "
-"\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
"computeroutput>\" part from the last one."
msgstr ""
"For at deaktivere eller ændre brugen af proxyen når der installeres via PXE, "
@@ -2466,12 +2482,6 @@ msgstr ""
"den første opstart af tjener, en PXE-opstart på arbejdsstationsnetværket og "
"på netværket for de tynde klienter:"
-#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "01-Installer_boot_menu.png"
msgstr "01-Installer_boot_menu.png"
@@ -3506,8 +3516,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network. A few screenshots show how this may "
-"be done."
+"modified though to suite your network."
msgstr ""
"Hvis maskinerne er opstartet som tynde klienter/diskløse arbejdsstationer "
"eller er blevet installeret med brug af nogle af netværksprofilerne, kan "
@@ -3517,6 +3526,10 @@ msgstr ""
"tilhører det dynamiske IP-interval. Disse systemer kan så ændres så de "
"passer til dit netværk. Et par skærmbilleder viser hvordan dette gøres."
+#. type: Content of: <article><section><section><para>
+msgid "The following screenshots show how this looks in practice:"
+msgstr ""
+
#. type: CDATA
#, fuzzy, no-wrap
msgid ""
@@ -6969,20 +6982,19 @@ msgid "Finally, restart KDM by running:"
msgstr "Endelig, genstart KDM ved at køre:"
#. type: CDATA
-#, no-wrap
-msgid "sudo invoke-rc.d kdm restart"
+#, fuzzy, no-wrap
+#| msgid "sudo invoke-rc.d kdm restart"
+msgid "sudo service kdm restart"
msgstr "sudo invoke-rc.d kdm restart"
-#. type: Content of: <article><section><section><para>
-msgid "(with thanks to Finn-Arne Johansen)"
-msgstr "(tak til Finn-Arne Johansen)"
-
#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "Tilslutte Windowsmaskiner til netværket/Windowsintegration"
#. type: Content of: <article><section><section><section><title>
-msgid "Joining the domain"
+#, fuzzy
+#| msgid "Joining the domain"
+msgid "Joining a domain"
msgstr "Slutte sig til domænet"
#. type: Content of: <article><section><section><section><para>
@@ -6998,8 +7010,12 @@ msgstr ""
"og brugerdata og også godkende brugerne under logind."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Allowing a Windows client to join the domain requires steps described in "
+#| "the <link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgid ""
-"Allowing a Windows client to join the domain requires steps described in the "
+"Joining a domain with a Windows client requires the steps described in the "
"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgstr ""
"En Windowsklient kræver de følgende trin for at få tilladelse til at slutte "
@@ -7053,9 +7069,13 @@ msgstr ""
" comment=\"Alle studenter på skolen\""
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: would it be better to explain user groups in Windows first with "
+#| "GOsa², and then with an example for the command line?"
msgid ""
-"FIXME: would it be better to explain user groups in Windows first with "
-"GOsa², and then with an example for the command line?"
+"FIXME: it would be even better to first/also explain user groups for Windows "
+"with GOsa² (and then show an example for the command line)"
msgstr ""
"FIXME: would it be better to explain user groups in Windows first with "
"GOsa², and then with an example for the command line?"
@@ -11289,6 +11309,16 @@ msgstr ""
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+#~ msgstr ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+
+#~ msgid "(with thanks to Finn-Arne Johansen)"
+#~ msgstr "(tak til Finn-Arne Johansen)"
+
+#~ msgid ""
#~ "A netinst installation (which is the type of installation our CD "
#~ "provides) will fetch some packages from the CD and the rest from the "
#~ "net. The amount of packages fetched from the net varies from profile to "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index e055c58..bcacf2e 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-07 16:36+0300\n"
+"POT-Creation-Date: 2013-07-07 17:13+0300\n"
"PO-Revision-Date: 2013-07-05 22:12+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1431,10 +1431,15 @@ msgstr ""
"heruntergeladen werden:"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: only the CD download links work currently - the DVD and source DVD "
+#| "download URLs need to be adapted for wheezy still... They currently don't "
+#| "work."
msgid ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"download URLs currently don't work, the usbstick image is not mentioned at "
+"all."
msgstr ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
"download URLs need to be adapted for wheezy still... They currently don't "
@@ -2426,6 +2431,17 @@ msgstr ""
"wheezy/installmanual\">Debian-Installationshandbuch</ulink> zu finden."
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To disable or change the use of the proxy when installing via PXE, the "
+#| "lines containing <computeroutput>mirror/http/proxy</computeroutput>, "
+#| "<computeroutput>mirror/ftp/proxy</computeroutput> and "
+#| "<computeroutput>preseed/early_command</computeroutput> in "
+#| "<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
+#| "computeroutput> need to be changed. To disable the use of a proxy when "
+#| "installing, put '#' in front of the first two lines, and remove the "
+#| "\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+#| "computeroutput>\" part from the last one."
msgid ""
"To disable or change the use of the proxy when installing via PXE, the lines "
"containing <computeroutput>mirror/http/proxy</computeroutput>, "
@@ -2434,7 +2450,7 @@ msgid ""
"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
"computeroutput> need to be changed. To disable the use of a proxy when "
"installing, put '#' in front of the first two lines, and remove the "
-"\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
"computeroutput>\" part from the last one."
msgstr ""
"Um die Benutzung des Proxys während der Installation mittels PXE zu ändern "
@@ -2522,12 +2538,6 @@ msgstr ""
"Screenshots nach dem ersten Starten von tjener, dem PXE-Start eines Rechners "
"im Netzwerk für Arbeitsplatzrechner bzw. für Thin Clients."
-#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "01-Installer_boot_menu.png"
msgstr "01-Installer_boot_menu.png"
@@ -3569,6 +3579,17 @@ msgstr ""
"Arbeitsplatzrechner verwenden"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If the machines have booted as thin clients/diskless workstations or have "
+#| "been installed using any of the networked profiles, the "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
+#| "to automatically add machines to GOsa², "
+#| "<computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage "
+#| "information. Please note, that the IP addresses shown after usage of "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
+#| "dynamic IP range. These systems can then be modified though to suite your "
+#| "network. A few screenshots show how this may be done."
msgid ""
"If the machines have booted as thin clients/diskless workstations or have "
"been installed using any of the networked profiles, the "
@@ -3577,8 +3598,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network. A few screenshots show how this may "
-"be done."
+"modified though to suite your network."
msgstr ""
"Wenn die Maschinen als Thin Clients bzw. Diskless Workstations gestartet "
"oder wenn sie unter Verwendung eines der Netzwerkprofile installiert wurden, "
@@ -3591,6 +3611,10 @@ msgstr ""
"anschließend aber so bearbeitet werden, dass sie zu Ihrem Netzwerk passen. "
"Einige Bilder zeigen, wie dies erfolgen könnte."
+#. type: Content of: <article><section><section><para>
+msgid "The following screenshots show how this looks in practice:"
+msgstr ""
+
#. type: CDATA
#, no-wrap
msgid ""
@@ -7162,20 +7186,19 @@ msgid "Finally, restart KDM by running:"
msgstr "Abschließend starten Sie KDM mit dem folgenden Kommando neu:"
#. type: CDATA
-#, no-wrap
-msgid "sudo invoke-rc.d kdm restart"
+#, fuzzy, no-wrap
+#| msgid "sudo invoke-rc.d kdm restart"
+msgid "sudo service kdm restart"
msgstr "sudo invoke-rc.d kdm restart"
-#. type: Content of: <article><section><section><para>
-msgid "(with thanks to Finn-Arne Johansen)"
-msgstr "(Danke an Finn-Arne Johansen)"
-
#. 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"
#. type: Content of: <article><section><section><section><title>
-msgid "Joining the domain"
+#, fuzzy
+#| msgid "Joining the domain"
+msgid "Joining a domain"
msgstr "Der Domäne beitreten"
#. type: Content of: <article><section><section><section><para>
@@ -7191,8 +7214,12 @@ msgstr ""
"Benutzer während der Anmeldung zu authentifizieren."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Allowing a Windows client to join the domain requires steps described in "
+#| "the <link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgid ""
-"Allowing a Windows client to join the domain requires steps described in the "
+"Joining a domain with a Windows client requires the steps described in the "
"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgstr ""
"Um einem Windows-Rechner den Zutritt zur Domäne zu erlauben, sind die im "
@@ -7248,9 +7275,13 @@ msgstr ""
" comment=\"Alle Schüler dieser Schulel\""
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: would it be better to explain user groups in Windows first with "
+#| "GOsa², and then with an example for the command line?"
msgid ""
-"FIXME: would it be better to explain user groups in Windows first with "
-"GOsa², and then with an example for the command line?"
+"FIXME: it would be even better to first/also explain user groups for Windows "
+"with GOsa² (and then show an example for the command line)"
msgstr ""
"FIXME: would it be better to explain user groups in Windows first with "
"GOsa², and then with an example for the command line?"
@@ -11589,6 +11620,16 @@ msgstr ""
"werden."
#~ msgid ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+#~ msgstr ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+
+#~ msgid "(with thanks to Finn-Arne Johansen)"
+#~ msgstr "(Danke an Finn-Arne Johansen)"
+
+#~ msgid ""
#~ "A netinst installation (which is the type of installation our CD "
#~ "provides) will fetch some packages from the CD and the rest from the "
#~ "net. The amount of packages fetched from the net varies from profile to "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index f424f5c..51e2cb5 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-07 16:36+0300\n"
+"POT-Creation-Date: 2013-07-07 17:13+0300\n"
"PO-Revision-Date: 2012-06-16 18:34-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1743,8 +1743,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"download URLs currently don't work, the usbstick image is not mentioned at "
+"all."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2969,7 +2969,7 @@ msgid ""
"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
"computeroutput> need to be changed. To disable the use of a proxy when "
"installing, put '#' in front of the first two lines, and remove the "
-"\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
"computeroutput>\" part from the last one."
msgstr ""
@@ -3052,13 +3052,6 @@ msgid ""
"tjener, a PXE boot on the workstation network and on the thinclient network:"
msgstr ""
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "01-Installer_boot_menu.png"
msgstr "01-Installer_boot_menu.png"
@@ -4162,8 +4155,11 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network. A few screenshots show how this may "
-"be done."
+"modified though to suite your network."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid "The following screenshots show how this looks in practice:"
msgstr ""
#. type: CDATA
@@ -7144,21 +7140,18 @@ msgid "Finally, restart KDM by running:"
msgstr "Finalmente, reinicia KDM ejecutando:"
#. type: CDATA
-#, no-wrap
-msgid "sudo invoke-rc.d kdm restart"
+#, fuzzy, no-wrap
+#| msgid "sudo invoke-rc.d kdm restart"
+msgid "sudo service kdm restart"
msgstr "sudo invoke-rc.d kdm restart"
-#. type: Content of: <article><section><section><para>
-msgid "(with thanks to Finn-Arne Johansen)"
-msgstr ""
-
#. type: Content of: <article><section><section><title>
#, fuzzy
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "Conectar máquinas windows a la red / integración con windows"
#. type: Content of: <article><section><section><section><title>
-msgid "Joining the domain"
+msgid "Joining a domain"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -7185,7 +7178,7 @@ msgstr ""
#| "In order to make Windows clients join the domain some (few) steps are "
#| "required:"
msgid ""
-"Allowing a Windows client to join the domain requires steps described in the "
+"Joining a domain with a Windows client requires the steps described in the "
"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgstr ""
"Para que los clientes Windows se puedan unir al dominio deben seguirse unos "
@@ -7237,8 +7230,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"FIXME: would it be better to explain user groups in Windows first with "
-"GOsa², and then with an example for the command line?"
+"FIXME: it would be even better to first/also explain user groups for Windows "
+"with GOsa² (and then show an example for the command line)"
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
@@ -11008,6 +11001,13 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
#~| msgid ""
#~| "The netinst installation (which is the type of installation our CD "
#~| "provides) will fetch some packages from the CD and the rest from the "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 90b76f7..99135aa 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-07-07 16:36+0300\n"
+"POT-Creation-Date: 2013-07-07 17:13+0300\n"
"PO-Revision-Date: 2013-05-14 00:39+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1456,8 +1456,8 @@ msgstr ""
#| "edu~7.0+edu0~a0-CD.iso) should work."
msgid ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"download URLs currently don't work, the usbstick image is not mentioned at "
+"all."
msgstr ""
"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
@@ -2514,6 +2514,17 @@ msgstr ""
"manuel d'installation."
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To disable or change the use of the proxy when installing via PXE, the "
+#| "lines containing <computeroutput>mirror/http/proxy</computeroutput>, "
+#| "<computeroutput>mirror/ftp/proxy</computeroutput> and "
+#| "<computeroutput>preseed/early_command</computeroutput> in "
+#| "<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
+#| "computeroutput> need to be changed. To disable the use of a proxy when "
+#| "installing, put '#' in front of the first two lines, and remove the "
+#| "\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+#| "computeroutput>\" part from the last one."
msgid ""
"To disable or change the use of the proxy when installing via PXE, the lines "
"containing <computeroutput>mirror/http/proxy</computeroutput>, "
@@ -2522,7 +2533,7 @@ msgid ""
"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
"computeroutput> need to be changed. To disable the use of a proxy when "
"installing, put '#' in front of the first two lines, and remove the "
-"\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
"computeroutput>\" part from the last one."
msgstr ""
"Pour désactiver ou modifier l'usage du serveur mandataire (« proxy ») lors "
@@ -2611,13 +2622,6 @@ msgstr ""
"PXE sur le réseau des stations de travail et sur le réseau des clients "
"légers :"
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "01-Installer_boot_menu.png"
msgstr "01-Installer_boot_menu.png"
@@ -3801,8 +3805,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network. A few screenshots show how this may "
-"be done."
+"modified though to suite your network."
msgstr ""
"Si les machines ont démarré comme clients légers ou stations de travail sans "
"disque, ou ont été installées en utilisant n'importe quel profil réseau, le "
@@ -3813,6 +3816,10 @@ msgstr ""
"peuvent ensuite être modifiés pour s'adapter à votre réseau. Quelques "
"captures d'écrans montrent comment cela peut être fait."
+#. type: Content of: <article><section><section><para>
+msgid "The following screenshots show how this looks in practice:"
+msgstr ""
+
#. type: CDATA
#, fuzzy, no-wrap
#| msgid ""
@@ -7448,20 +7455,19 @@ msgid "Finally, restart KDM by running:"
msgstr "Finalement, veuillez redémarrer KDM en lançant :"
#. type: CDATA
-#, no-wrap
-msgid "sudo invoke-rc.d kdm restart"
+#, fuzzy, no-wrap
+#| msgid "sudo invoke-rc.d kdm restart"
+msgid "sudo service kdm restart"
msgstr "sudo invoke-rc.d kdm restart"
-#. type: Content of: <article><section><section><para>
-msgid "(with thanks to Finn-Arne Johansen)"
-msgstr "(merci à Finn-Arne Johansen)"
-
#. 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"
#. type: Content of: <article><section><section><section><title>
-msgid "Joining the domain"
+#, fuzzy
+#| msgid "Joining the domain"
+msgid "Joining a domain"
msgstr "Rejoindre le domaine"
#. type: Content of: <article><section><section><section><para>
@@ -7477,8 +7483,12 @@ msgstr ""
"utilisateur et authentifie les utilisateurs durant la phase de connexion."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Allowing a Windows client to join the domain requires steps described in "
+#| "the <link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgid ""
-"Allowing a Windows client to join the domain requires steps described in the "
+"Joining a domain with a Windows client requires the steps described in the "
"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgstr ""
"Afin d'ajouter des clients Windows au domaine, les étapes décrites dans le "
@@ -7534,9 +7544,13 @@ msgstr ""
" comment=\"Tous les élèves de l'école\""
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: would it be better to explain user groups in Windows first with "
+#| "GOsa², and then with an example for the command line?"
msgid ""
-"FIXME: would it be better to explain user groups in Windows first with "
-"GOsa², and then with an example for the command line?"
+"FIXME: it would be even better to first/also explain user groups for Windows "
+"with GOsa² (and then show an example for the command line)"
msgstr ""
"FIXME: would it be better to explain user groups in Windows first with GOsa, "
"and then with an example for the command line?"
@@ -11931,6 +11945,16 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#~ msgid "(with thanks to Finn-Arne Johansen)"
+#~ msgstr "(merci à Finn-Arne Johansen)"
+
#~ msgid ""
#~ "A netinst installation (which is the type of installation our CD "
#~ "provides) will fetch some packages from the CD and the rest from the "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 41c5b76..85fbab1 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-07-07 16:36+0300\n"
+"POT-Creation-Date: 2013-07-07 17:13+0300\n"
"PO-Revision-Date: 2013-05-12 17:17+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -1398,8 +1398,8 @@ msgstr ""
#, fuzzy
msgid ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"download URLs currently don't work, the usbstick image is not mentioned at "
+"all."
msgstr ""
"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
@@ -2376,6 +2376,17 @@ msgstr ""
"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To disable or change the use of the proxy when installing via PXE, the "
+#| "lines containing <computeroutput>mirror/http/proxy</computeroutput>, "
+#| "<computeroutput>mirror/ftp/proxy</computeroutput> and "
+#| "<computeroutput>preseed/early_command</computeroutput> in "
+#| "<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
+#| "computeroutput> need to be changed. To disable the use of a proxy when "
+#| "installing, put '#' in front of the first two lines, and remove the "
+#| "\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+#| "computeroutput>\" part from the last one."
msgid ""
"To disable or change the use of the proxy when installing via PXE, the lines "
"containing <computeroutput>mirror/http/proxy</computeroutput>, "
@@ -2384,7 +2395,7 @@ msgid ""
"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
"computeroutput> need to be changed. To disable the use of a proxy when "
"installing, put '#' in front of the first two lines, and remove the "
-"\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
"computeroutput>\" part from the last one."
msgstr ""
"Per disabilitare o cambiare le impostazioni del proxy quando si installa via "
@@ -2470,12 +2481,6 @@ msgstr ""
"server tjener, a PXE boot on the workstation network and on the thinclient "
"network:"
-#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "01-Installer_boot_menu.png"
msgstr "01-Installer_boot_menu.png"
@@ -3519,8 +3524,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network. A few screenshots show how this may "
-"be done."
+"modified though to suite your network."
msgstr ""
"Se le macchine sono avviate come thin client/diskless workstations o sono "
"state installate usando uno dei profili di rete, lo script "
@@ -3531,6 +3535,10 @@ msgstr ""
"sistemi possono poi essere modificati sulla base della vostra rete. Alcuni "
"screenshots mostrano come questo può essere fatto."
+#. type: Content of: <article><section><section><para>
+msgid "The following screenshots show how this looks in practice:"
+msgstr ""
+
#. type: CDATA
#, fuzzy, no-wrap
msgid ""
@@ -7028,20 +7036,19 @@ msgid "Finally, restart KDM by running:"
msgstr "Alla fine riavvia KDM eseguendo:"
#. type: CDATA
-#, no-wrap
-msgid "sudo invoke-rc.d kdm restart"
+#, fuzzy, no-wrap
+#| msgid "sudo invoke-rc.d kdm restart"
+msgid "sudo service kdm restart"
msgstr "sudo invoke-rc.d kdm restart"
-#. type: Content of: <article><section><section><para>
-msgid "(with thanks to Finn-Arne Johansen)"
-msgstr "(per la cortesia di Finn-Arne Johansen)"
-
#. 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"
#. type: Content of: <article><section><section><section><title>
-msgid "Joining the domain"
+#, fuzzy
+#| msgid "Joining the domain"
+msgid "Joining a domain"
msgstr "Collegarsi al dominio"
#. type: Content of: <article><section><section><section><para>
@@ -7057,8 +7064,12 @@ msgstr ""
"degli utenti e autenticare gli utenti attraverso il login."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Allowing a Windows client to join the domain requires steps described in "
+#| "the <link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgid ""
-"Allowing a Windows client to join the domain requires steps described in the "
+"Joining a domain with a Windows client requires the steps described in the "
"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgstr ""
"Per collegare i client Windows al dominio sono necessari i passi descritti "
@@ -7111,9 +7122,13 @@ msgstr ""
" comment=\"All students in the school\""
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: would it be better to explain user groups in Windows first with "
+#| "GOsa², and then with an example for the command line?"
msgid ""
-"FIXME: would it be better to explain user groups in Windows first with "
-"GOsa², and then with an example for the command line?"
+"FIXME: it would be even better to first/also explain user groups for Windows "
+"with GOsa² (and then show an example for the command line)"
msgstr ""
"FIXME: would it be better to explain user groups in Windows first with "
"GOsa², and then with an example for the command line?"
@@ -11385,6 +11400,16 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+#~ msgstr ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+
+#~ msgid "(with thanks to Finn-Arne Johansen)"
+#~ msgstr "(per la cortesia di Finn-Arne Johansen)"
+
+#~ msgid ""
#~ "A netinst installation (which is the type of installation our CD "
#~ "provides) will fetch some packages from the CD and the rest from the "
#~ "net. The amount of packages fetched from the net varies from profile to "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index c39eced..d03fd39 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-07-07 16:36+0300\n"
+"POT-Creation-Date: 2013-07-07 17:13+0300\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -1414,8 +1414,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"download URLs currently don't work, the usbstick image is not mentioned at "
+"all."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2396,6 +2396,17 @@ msgstr ""
"squeeze/installmanual\"> manualen til Debian Installer</ulink>."
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To disable or change the use of the proxy when installing via PXE, the "
+#| "lines containing <computeroutput>mirror/http/proxy</computeroutput>, "
+#| "<computeroutput>mirror/ftp/proxy</computeroutput> and "
+#| "<computeroutput>preseed/early_command</computeroutput> in "
+#| "<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
+#| "computeroutput> need to be changed. To disable the use of a proxy when "
+#| "installing, put '#' in front of the first two lines, and remove the "
+#| "\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+#| "computeroutput>\" part from the last one."
msgid ""
"To disable or change the use of the proxy when installing via PXE, the lines "
"containing <computeroutput>mirror/http/proxy</computeroutput>, "
@@ -2404,7 +2415,7 @@ msgid ""
"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
"computeroutput> need to be changed. To disable the use of a proxy when "
"installing, put '#' in front of the first two lines, and remove the "
-"\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
"computeroutput>\" part from the last one."
msgstr ""
"For å slå av eller endre bruken av proxy når du innstallerer fra PXE, må "
@@ -2489,14 +2500,6 @@ msgid ""
"tjener, a PXE boot on the workstation network and on the thinclient network:"
msgstr ""
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
-"png]\"/></imageobject>"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "01-Installer_boot_menu.png"
msgstr ""
@@ -3562,8 +3565,11 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network. A few screenshots show how this may "
-"be done."
+"modified though to suite your network."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid "The following screenshots show how this looks in practice:"
msgstr ""
#. type: CDATA
@@ -6911,20 +6917,17 @@ msgstr "Til slutt restartes kdm ved å kjøre:"
#. type: CDATA
#, fuzzy, no-wrap
-msgid "sudo invoke-rc.d kdm restart"
+msgid "sudo service kdm restart"
msgstr "sudo invoke-rc.d kdm restart\n"
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid "(with thanks to Finn-Arne Johansen)"
-msgstr "(genererøst levert av Finn-Arne Johansen)"
-
#. type: Content of: <article><section><section><title>
msgid "Connecting Windows machines to the network / Windows integration"
msgstr "Koble windowsmaskiner til nettverket / integrering av windows"
#. type: Content of: <article><section><section><section><title>
-msgid "Joining the domain"
+#, fuzzy
+#| msgid "Joining the domain"
+msgid "Joining a domain"
msgstr "Bli med i domenet"
#. type: Content of: <article><section><section><section><para>
@@ -6943,7 +6946,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
-"Allowing a Windows client to join the domain requires steps described in the "
+"Joining a domain with a Windows client requires the steps described in the "
"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgstr "For å melde windowsklienter inn i domenet må noen (få) steg utføres:"
@@ -6997,8 +7000,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
#, fuzzy
msgid ""
-"FIXME: would it be better to explain user groups in Windows first with "
-"GOsa², and then with an example for the command line?"
+"FIXME: it would be even better to first/also explain user groups for Windows "
+"with GOsa² (and then show an example for the command line)"
msgstr ""
"FIXME: isnt that better be explained with lwat first, and then with an "
"example for the command line?"
@@ -10985,6 +10988,18 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
+#~ "png)."
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-"
+#~ "tjener.png]\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "(with thanks to Finn-Arne Johansen)"
+#~ msgstr "(genererøst levert av Finn-Arne Johansen)"
+
+#, fuzzy
+#~ msgid ""
#~ "A netinst installation (which is the type of installation our CD "
#~ "provides) will fetch some packages from the CD and the rest from the "
#~ "net. The amount of packages fetched from the net varies from profile to "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index cc0bab3..b17b360 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 16:36+0300\n"
+"POT-Creation-Date: 2013-07-07 17:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1047,8 +1047,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"download URLs currently don't work, the usbstick image is not mentioned at "
+"all."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1780,7 +1780,7 @@ msgid ""
"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
"computeroutput> need to be changed. To disable the use of a proxy when "
"installing, put '#' in front of the first two lines, and remove the "
-"\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
"computeroutput>\" part from the last one."
msgstr ""
@@ -1834,11 +1834,6 @@ msgid ""
"tjener, a PXE boot on the workstation network and on the thinclient network:"
msgstr ""
-#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr ""
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "01-Installer_boot_menu.png"
msgstr ""
@@ -2665,8 +2660,11 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network. A few screenshots show how this may "
-"be done."
+"modified though to suite your network."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid "The following screenshots show how this looks in practice:"
msgstr ""
#. type: CDATA
@@ -5205,11 +5203,7 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid "sudo invoke-rc.d kdm restart"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "(with thanks to Finn-Arne Johansen)"
+msgid "sudo service kdm restart"
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -5217,7 +5211,7 @@ msgid "Connecting Windows machines to the network / Windows integration"
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Joining the domain"
+msgid "Joining a domain"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -5230,7 +5224,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Allowing a Windows client to join the domain requires steps described in the "
+"Joining a domain with a Windows client requires the steps described in the "
"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
msgstr ""
@@ -5267,8 +5261,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"FIXME: would it be better to explain user groups in Windows first with "
-"GOsa², and then with an example for the command line?"
+"FIXME: it would be even better to first/also explain user groups for Windows "
+"with GOsa² (and then show an example for the command line)"
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index ad9bd8c..ab79dd0 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -432,7 +432,7 @@
<para>The multi-architecture DVD ISO image is 4.4 GiB large and can be used for installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP or rsync via:
</para>
<para>
-FIXME: only the CD download links work currently - the DVD and source DVD download URLs need to be adapted for wheezy still... They currently don't work.
+FIXME: only the CD download links work currently - the DVD and source DVD download URLs currently don't work, the usbstick image is not mentioned at all.
</para>
<itemizedlist><listitem override="none">
<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD.iso">debian-edu-7.1+edu0-DVD.iso</ulink>
@@ -741,7 +741,7 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
</para>
<para>Further information can be found in the <ulink url="http://www.debian.org/releases/wheezy/installmanual">manual of the Debian Installer</ulink>.
</para>
-<para>To disable or change the use of the proxy when installing via PXE, the lines containing <computeroutput>mirror/http/proxy</computeroutput>, <computeroutput>mirror/ftp/proxy</computeroutput> and <computeroutput>preseed/early_command</computeroutput> in <computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </computeroutput> need to be changed. To disable the use of a proxy when installing, put '#' in front of the first two lines, and remove the "<computeroutput>export xhttp_proxy="http://webcache:3128"; </computeroutput>" part from the last one.
+<para>To disable or change the use of the proxy when installing via PXE, the lines containing <computeroutput>mirror/http/proxy</computeroutput>, <computeroutput>mirror/ftp/proxy</computeroutput> and <computeroutput>preseed/early_command</computeroutput> in <computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </computeroutput> need to be changed. To disable the use of a proxy when installing, put '#' in front of the first two lines, and remove the "<computeroutput>export http_proxy="http://webcache:3128"; </computeroutput>" part from the last one.
</para>
<para>Some settings can not be preseeded because they are needed before the preseeding file is downloaded. These are configured in the PXElinux-based boot arguments available from <computeroutput>/var/lib/tftproot/debian-edu/install.cfg</computeroutput>. Language, keyboard layout and desktop are examples of such settings.
</para>
@@ -765,9 +765,6 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
</para>
<para>So here is a screenshot tour through a graphical Main-Server + Workstation + Thin Client Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network:
</para>
-<para>
-FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png).
-</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_boot_menu.png</phrase></textobject></inlinemediaobject>
</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/02-select_a_language.png"/></imageobject><textobject><phrase>02-select_a_language.png</phrase></textobject></inlinemediaobject>
@@ -1087,7 +1084,9 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
</para>
<para>To assign a host with the MAC address 52:54:00:12:34:10 a static IP address in GOsa² you have to enter the MAC address, the hostname and the IP; alternatively you might click the <computeroutput>Propose ip</computeroutput> button which will show the first free fixed address in 10.0.0.0/8, most probably something like 10.0.0.2 if you add the first machine this way. It may be better to first think about your network: For example you could use 10.0.0.x with x>10 and x<50 for servers, and x>100 for workstations. Don't forget to activate the just added system. With the exception of the main server all systems will then have a matching icon.
</para>
-<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suite your network. A few screenshots show how this may be done.
+<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suite your network.
+</para>
+<para>The following screenshots show how this looks in practice:
</para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations
info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.
@@ -2198,21 +2197,19 @@ exit]]></screen>
<para>Then turn on XDMCP in KDM with the command:
</para><screen><![CDATA[ sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]></screen>
<para>Finally, restart KDM by running:
-</para><screen><![CDATA[ sudo invoke-rc.d kdm restart]]></screen>
-<para>(with thanks to Finn-Arne Johansen)
-</para>
+</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>
-<section id="NetworkClients--Joining_the_domain">
-<title>Joining the domain
+<section id="NetworkClients--Joining_a_domain">
+<title>Joining a domain
</title>
<para>For Windows clients the Windows domain "SKOLELINUX" is available to be joined. A special service called Samba, installed on the main-server tjener, enables Windows clients to store profiles and user data, and also authenticates the users during the login.
</para>
-<para>Allowing a Windows client to join the domain requires steps described in the <link linkend="Samba">Debian Edu Wheezy Samba Howto</link>.
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Joining a domain with a Windows client requires the steps described in the <link linkend="Samba">Debian Edu Wheezy Samba Howto</link>.
</para>
<para>Windows will sync the profiles of domain users on every Windows login and logout. Depending on how much data is stored in the profile, this could take some time. To minimise the time needed, deactivate things like local cache in browsers (you can use the Squid proxy cache installed on tjener instead) and save files into the H: volume rather than under "My Documents".
</para>
@@ -2225,7 +2222,7 @@ exit]]></screen>
type=domain ntgroup="students" \
comment="All students in the school"]]></screen>
<para>
-FIXME: would it be better to explain user groups in Windows first with GOsa², and then with an example for the command line?
+FIXME: it would be even better to first/also explain user groups for Windows with GOsa² (and then show an example for the command line)
</para>
<para>If you want to check user groups on Windows, you need to download the tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can use this for example in the logon script which resides on tjener in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>.
</para>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index 8898521..58ca398 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -1,12 +1,11 @@
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
-FIXME: only the CD download links work currently - the DVD and source DVD download URLs need to be adapted for wheezy still... They currently don't work.
-FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png).
+FIXME: only the CD download links work currently - the DVD and source DVD download URLs currently don't work, the usbstick image is not mentioned at all.
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/NetworkClients
-FIXME: would it be better to explain user groups in Windows first with GOsa², and then with an example for the command line?
+FIXME: it would be even better to first/also explain user groups for Windows with GOsa² (and then show an example for the command line)
FIXME: explain how to use profiles from global policies for Windows machines in the skolelinux network
FIXME: describe roaming profile key for the global policy editor here
====================
-5 FIXMEs left to fix
+4 FIXMEs left to fix
====================
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index fd44375..9c59264 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 16:37+0300\n"
+"POT-Creation-Date: 2013-07-07 17:14+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list