[debian-edu-commits] debian-edu/debian-edu-doc.git (#1570) - master (branch) updated: 1.5_20130727_7.1-19-g3213277
David Prévot
taffit at alioth.debian.org
Fri Aug 30 20:42:31 UTC 2013
The branch, master has been updated
via 32132777ab61e6dadf810473eb4f783b6538aabd (commit)
from 9c26f61bde7523b96119301293973a835f5c2262 (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 32132777ab61e6dadf810473eb4f783b6538aabd
Author: David Prévot <taffit at debian.org>
Date: Fri Aug 30 16:40:37 2013 -0400
Update Wheezy manual from the wiki (-2 FIXMEs)
Git-Dch: Ignore
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-wheezy-manual.da.po | 10 +-
.../debian-edu-wheezy-manual.de.po | 26 ++--
.../debian-edu-wheezy-manual.es.po | 10 +-
.../debian-edu-wheezy-manual.fr.po | 18 +--
.../debian-edu-wheezy-manual.it.po | 38 ++---
.../debian-edu-wheezy-manual.nb.po | 154 ++++++++++----------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 10 +-
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 6 -
documentation/debian-edu-wheezy/fixme-status.txt | 4 +-
9 files changed, 110 insertions(+), 166 deletions(-)
The diff of changes is:
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 328dd4b..133ba2c 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-08-30 17:35+0300\n"
+"POT-Creation-Date: 2013-08-30 16:38-0400\n"
"PO-Revision-Date: 2013-07-18 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2272,10 +2272,6 @@ msgstr ""
"Det er sådan her at PXE-menuen ser ud kun med profilen for <emphasis role="
"\"strong\">hovedserveren</emphasis>:"
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
-msgstr ""
-
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/pxe-tjener.png"
msgstr "./images/pxe-tjener.png"
@@ -2702,10 +2698,6 @@ msgstr "./images/27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "KDE-skrivebord"
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: screenshot 28 needs to be updated with new artwork."
-msgstr ""
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
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 22ac127..f66d18f 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-08-30 17:35+0300\n"
+"POT-Creation-Date: 2013-08-30 16:38-0400\n"
"PO-Revision-Date: 2013-08-26 11:53+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <kde-i18n-doc at kde.org>\n"
@@ -779,8 +779,8 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
-"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
+"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
"Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
"Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
"Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -2328,10 +2328,6 @@ msgstr ""
"So sieht das PXE-Menü mit dem <emphasis role=\"strong\">Hauptserver</"
"emphasis> als alleinigem Profil aus:"
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
-msgstr "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
-
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/pxe-tjener.png"
msgstr "./images/pxe-tjener.png"
@@ -2758,10 +2754,6 @@ msgstr "./images/27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "KDE-Desktop"
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: screenshot 28 needs to be updated with new artwork."
-msgstr "FIXME: screenshot 28 needs to be updated with new artwork."
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
@@ -11735,6 +11727,14 @@ msgstr ""
"werden."
#~ msgid ""
+#~ "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
+#~ msgstr ""
+#~ "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
+
+#~ msgid "FIXME: screenshot 28 needs to be updated with new artwork."
+#~ msgstr "FIXME: screenshot 28 needs to be updated with new artwork."
+
+#~ msgid ""
#~ "Boot parameters available when installing from the netinstall CD image, "
#~ "not when installing from the multi-arch image"
#~ msgstr ""
@@ -11759,8 +11759,8 @@ msgstr ""
#~ "Down-Menü eine andere wählen - eine freie Wahl bietet der Assistent "
#~ "jedoch nicht. (Die Generierung der Kennungen kann in der Datei "
#~ "<computeroutput>/etc/gosa/gosa.conf</computeroutput> angepasst werden; es "
-#~ "könnte z.B. die Voreinstellung <computeroutput>idGenerator=\"{%givenName"
-#~ "[1-6]}{%sn[1-6]}\"</computeroutput> geändert werden in "
+#~ "könnte z.B. die Voreinstellung <computeroutput>idGenerator="
+#~ "\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> geändert werden in "
#~ "<computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
#~ "computeroutput>. Damit würde für den Benutzer »Peter Muster« die Kennung "
#~ "<computeroutput>pmuster</computeroutput> und für einen weiteren Benutzer "
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 63d9c02..77d9c49 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-08-30 17:35+0300\n"
+"POT-Creation-Date: 2013-08-30 16:38-0400\n"
"PO-Revision-Date: 2013-08-27 11:58-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -2831,10 +2831,6 @@ msgstr ""
"Así es como el menú PXE se mira con el perfil <emphasis role=\"strong"
"\">Servidor-Principal</emphasis>"
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
-msgstr ""
-
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
#| msgid "pxe-tjener.png"
@@ -3329,10 +3325,6 @@ msgstr "27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "Escritorio KDE"
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: screenshot 28 needs to be updated with new artwork."
-msgstr ""
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
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 315c7c4..02b07a6 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2013-08-30 17:35+0300\n"
+"POT-Creation-Date: 2013-08-30 16:38-0400\n"
"PO-Revision-Date: 2013-07-23 16:13+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2342,10 +2342,6 @@ msgstr ""
"Voici à quoi ressemble le menu PXE avec uniquement le profil <emphasis role="
"\"strong\">Serveur principal</emphasis> :"
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
-msgstr ""
-
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/pxe-tjener.png"
msgstr "./images/pxe-tjener.png"
@@ -2775,10 +2771,6 @@ msgstr "./images/27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "Bureau KDE"
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: screenshot 28 needs to be updated with new artwork."
-msgstr ""
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
@@ -6752,10 +6744,10 @@ msgid ""
"address or IP address like this: <computeroutput>[192.168.0.10]</"
"computeroutput>."
msgstr ""
-"Les valeurs par défaut sont définies dans la section <computeroutput>"
-"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
-"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
-"computeroutput>."
+"Les valeurs par défaut sont définies dans la section "
+"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
+"indiquez son adresse MAC ou son adresse IP de cette manière : "
+"<computeroutput>[192.168.0.10]</computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
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 da305b2..e234ae5 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-08-30 17:35+0300\n"
+"POT-Creation-Date: 2013-08-30 16:38-0400\n"
"PO-Revision-Date: 2013-07-26 23:39+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -2338,10 +2338,6 @@ msgstr ""
"Così appare il menu PXE solo con il profilo <emphasis role=\"strong\">Main-"
"Server</emphasis>:"
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
-msgstr ""
-
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/pxe-tjener.png"
msgstr "./images/pxe-tjener.png"
@@ -2761,10 +2757,6 @@ msgstr "./images/27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "Desktop KDE"
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: screenshot 28 needs to be updated with new artwork."
-msgstr ""
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
@@ -6701,8 +6693,8 @@ msgid ""
msgstr ""
"I valori predefiniti sono definiti in <computeroutput>[default]</"
"computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
-"</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: "
+"<computeroutput>[192.168.0.10]</computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -15931,13 +15923,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -15949,8 +15941,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15958,8 +15950,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15976,8 +15968,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15985,8 +15977,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 660239d..2c09547 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-08-30 17:35+0300\n"
+"POT-Creation-Date: 2013-08-30 16:38-0400\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -754,10 +754,10 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
"Terminal Server Project (LTSP)."
#. type: Content of: <article><section><section><section><para>
@@ -1764,8 +1764,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
#, fuzzy
msgid "./images/Installer_help.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -2283,10 +2283,6 @@ msgstr ""
"Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
"\">hovedtjeber</emphasis> tilgjengelig: "
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
-msgstr ""
-
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/pxe-tjener.png"
@@ -2587,57 +2583,57 @@ msgstr ""
#, fuzzy
msgid "./images/08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-06-profile.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-06-profile.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_squeeze.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_squeeze.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -2702,43 +2698,43 @@ msgstr ""
#, fuzzy
msgid "./images/13-Install+the+base+system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "13-Install the base system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -2769,29 +2765,29 @@ msgstr ""
#, fuzzy
msgid "./images/20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
msgid "FIXME: screenshot 22 needs to be updated with new artwork."
@@ -2843,10 +2839,6 @@ msgstr ""
msgid "KDE Desktop"
msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: screenshot 28 needs to be updated with new artwork."
-msgstr ""
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
@@ -3580,8 +3572,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_list.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "GOsa² systems listing"
@@ -3591,8 +3583,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_host_details.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Host details"
@@ -3613,8 +3605,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_add_netgroup.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Add netgroup"
@@ -4136,8 +4128,8 @@ msgstr ""
#, fuzzy
msgid "./images/slbackup-php_maintenance.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -5973,10 +5965,10 @@ msgid ""
"boots from a diskette or directly from the server using network-PROM (or "
"PXE) without using a local client hard drive."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. "
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -11221,8 +11213,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-#~ "started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "getting-]started.png\"/></imageobject>"
#, fuzzy
#~ msgid "FIXME: add wheezy kde desktop screenshot here"
@@ -11245,8 +11237,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-#~ "edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
#, fuzzy
#~| msgid "Set passwords"
@@ -12509,8 +12501,8 @@ msgstr ""
#~ "workstation server(s):"
#~ msgstr ""
#~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
-#~ "(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på "
+#~ "arbeidsstasjonstjener(ne):"
#~ msgid ""
#~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -14837,13 +14829,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -14855,8 +14847,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14864,8 +14856,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14881,8 +14873,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14890,8 +14882,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 31c402c..e4207bb 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-08-30 17:35+0300\n"
+"POT-Creation-Date: 2013-08-30 16:38-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1694,10 +1694,6 @@ msgid ""
"Server</emphasis> profile only:"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
-msgstr ""
-
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/pxe-tjener.png"
msgstr ""
@@ -2062,10 +2058,6 @@ msgstr ""
msgid "KDE Desktop"
msgstr ""
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: screenshot 28 needs to be updated with new artwork."
-msgstr ""
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 50f0eb5..1d26dd6 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -713,9 +713,6 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
</para>
<para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> profile only:
</para>
-<para>
-FIXME: two screenshots (pxe) need to be replaced with updated artwork.
-</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/pxe-tjener.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject>
</para>
<para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> and <emphasis role="strong">Thin-Client-Server</emphasis> profiles:
@@ -823,9 +820,6 @@ FIXME: screenshot 22 needs to be updated with new artwork.
</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-KDE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject>
</para>
-<para>
-FIXME: screenshot 28 needs to be updated with new artwork.
-</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>28-Diskless-WS-GRUB_Boot_menu-PXE.png</phrase></textobject></inlinemediaobject>
</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/29-Diskless-WS-LDM_Login.png"/></imageobject><textobject><phrase>Diskless Workstation Login</phrase></textobject></inlinemediaobject>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index 68af0a5..452a669 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -1,14 +1,12 @@
----------------------------------
https://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
FIXME: the source DVD download URL currently doesn't work
-FIXME: two screenshots (pxe) need to be replaced with updated artwork.
FIXME: screenshot 22 needs to be updated with new artwork.
-FIXME: screenshot 28 needs to be updated with new artwork.
----------------------------------
https://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/NetworkClients
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
====================
-7 FIXMEs left to fix
+5 FIXMEs left to fix
====================
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