[debian-edu-commits] debian-edu/debian-edu-doc.git (#1508) - master (branch) updated: 1.5_20130617_7.1-20-gedcae96
Holger Levsen
holger at alioth.debian.org
Thu Jul 4 17:30:11 UTC 2013
The branch, master has been updated
via edcae967ebba32f7f21dd5a3a9a3714e8786d418 (commit)
from da7c7c02e69fe1f709ba6fa989fd826862cb611b (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 edcae967ebba32f7f21dd5a3a9a3714e8786d418
Author: Holger Levsen <holger at layer-acht.org>
Date: Thu Jul 4 19:30:05 2013 +0200
update from the wiki, make changelog somewhat less redundant
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 7 +-
documentation/audacity/audacity-manual.pot | 2 +-
.../debian-edu-squeeze-manual.pot | 2 +-
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386842 -> 386832 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386941 -> 386931 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386884 -> 386874 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386880 -> 386871 bytes
.../debian-edu-wheezy-manual.da.po | 40 ++++--
.../debian-edu-wheezy-manual.de.po | 143 +++++---------------
.../debian-edu-wheezy-manual.es.po | 32 +++--
.../debian-edu-wheezy-manual.fr.po | 40 ++++--
.../debian-edu-wheezy-manual.it.po | 40 ++++--
.../debian-edu-wheezy-manual.nb.po | 28 ++--
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 25 ++--
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 8 +-
documentation/debian-edu-wheezy/fixme-status.txt | 2 +-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386754 -> 386832 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386854 -> 386931 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386796 -> 386874 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386792 -> 386871 bytes
documentation/rosegarden/rosegarden-manual.pot | 2 +-
21 files changed, 176 insertions(+), 195 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a9b5aa7..ecdb9b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,16 +9,13 @@ debian-edu-doc (1.5~20130701~7.1) UNRELEASED; urgency=low
[ David Prévot ]
* Add French images of the installation process.
- [ Wolfgang Schweer ]
- * Add some German images of the installation process.
-
[ Manual translation update ]
- * German, Wolfgang Schweer
+ * German, thanks to Wolfgang Schweer.
[ Wolfgang Schweer ]
* Update manuals and images from the wiki.
* Update manual translation.
- * Add more images 'translated' to German.
+ * Add images 'translated' to German.
-- Holger Levsen <holger at debian.org> Mon, 17 Jun 2013 04:49:44 +0200
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index de8d182..c95126f 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-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-04 19:26+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 8e47e3f..9e581a9 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-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-04 19:25+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 548438c..df26db3 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index 5349112..c0aebf7 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index 88e69a1..abc711e 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index d548866..9e733ad 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 919d5d2..6fd938a 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-03 15:09+0300\n"
+"POT-Creation-Date: 2013-07-04 19:18+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"
@@ -2166,11 +2166,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"After giving the root password, you will be asked to create a normal user "
-"account \"for non-administrative tasks\". For Debian-edu, this account is "
-"very important! It is the account you will use to manage the Skolelinux "
-"network. You must choose a password length of at least 5 characters for this "
-"user, otherwise you will not be able to log in (even though a shorter "
-"password will be accepted by the installer)."
+"account \"for non-administrative tasks\". For Debian Edu this account is "
+"very important: It is the account you will use to manage the Skolelinux "
+"network."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
+"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
+"- otherwise login will not be possible. (And that's even though a shorter "
+"password will be accepted by the installer.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2606,10 +2612,10 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid ""
-#| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: one screenshot still needs to be done here..."
-msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#| 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"
@@ -6293,8 +6299,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"These steps have to be taken to get back to the behaviour in Debian Edu "
-"Squeeze."
+"The following steps can be used to get back the behaviour from Debian Edu "
+"Squeeze:"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -11672,6 +11678,13 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#~ msgid "FIXME: one screenshot still needs to be done here..."
+#~ msgstr ""
+#~ "FIXME: these screenshots need to be redone once we have wheezy artwork"
+
#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
@@ -11938,9 +11951,6 @@ msgstr ""
#~ msgid "pxe-tjener.png"
#~ msgstr "pxe-tjener.png"
-#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
#~ msgid ""
#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
#~ "to install the main server, all user passwords exept that one for the "
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 d3a93a4..d01c4a5 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-03 15:09+0300\n"
+"POT-Creation-Date: 2013-07-04 19:18+0300\n"
"PO-Revision-Date: 2013-07-03 20:38+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1475,9 +1475,6 @@ msgstr ""
"Prozessorarchitektur ist erhältlich mittels"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-#| "edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
@@ -1486,9 +1483,6 @@ msgstr ""
"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-#| "edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
@@ -1497,9 +1491,6 @@ msgstr ""
"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
@@ -1855,12 +1846,6 @@ msgstr ""
"verfügbar sind "
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
"the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
@@ -1872,11 +1857,6 @@ msgstr ""
"Boot-Parameter."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
@@ -1887,11 +1867,6 @@ msgstr ""
"als zusätzlichen Kernel-Boot-Parameter."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
msgid ""
"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
@@ -2124,13 +2099,19 @@ msgstr ""
"benötigen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "After giving the root password, you will be asked to create a normal user "
+#| "account \"for non-administrative tasks\". For Debian-edu, this account is "
+#| "very important! It is the account you will use to manage the Skolelinux "
+#| "network. You must choose a password length of at least 5 characters for "
+#| "this user, otherwise you will not be able to log in (even though a "
+#| "shorter password will be accepted by the installer)."
msgid ""
"After giving the root password, you will be asked to create a normal user "
-"account \"for non-administrative tasks\". For Debian-edu, this account is "
-"very important! It is the account you will use to manage the Skolelinux "
-"network. You must choose a password length of at least 5 characters for this "
-"user, otherwise you will not be able to log in (even though a shorter "
-"password will be accepted by the installer)."
+"account \"for non-administrative tasks\". For Debian Edu this account is "
+"very important: It is the account you will use to manage the Skolelinux "
+"network."
msgstr ""
"Nach Eingabe des Passwortes für »root« werden Sie aufgefordert, ein normales "
"Benutzerkonto für nichtadministrative Aufgaben einzurichten. Für Debian Edu "
@@ -2140,6 +2121,14 @@ msgstr ""
"kürzere Passwörter akzeptiert)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
+"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
+"- otherwise login will not be possible. (And that's even though a shorter "
+"password will be accepted by the installer.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr "Freuen Sie sich!"
@@ -2568,8 +2557,11 @@ msgstr ""
"im Netzwerk für Arbeitsplatzrechner bzw. für Thin Clients."
#. type: Content of: <article><section><section><para>
-msgid "FIXME: one screenshot still needs to be done here..."
-msgstr "FIXME: one screenshot still needs to be done here..."
+#, fuzzy
+#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgid ""
+"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "01-Installer_boot_menu.png"
@@ -2776,7 +2768,6 @@ msgid "tjener KDM Login"
msgstr "KDM-Login von tjener"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/27-Tjener-KDE_Desktop.png"
msgid "./images/24-Tjener-KDE_Start.png"
msgstr "./images/24-Tjener-KDE_Start.png"
@@ -2801,22 +2792,18 @@ msgid "KDE Desktop"
msgstr "KDE-Desktop"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
msgid "./images/29-Diskless-WS-LDM_Login.png"
msgstr "./images/29-Diskless-WS-LDM_Login.png"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Diskless workstations"
msgid "Diskless Workstation Login"
msgstr "Diskless Workstation Login"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/23-Tjener-KDM_Login.png"
msgid "./images/30-ThinClient-LDM_Login.png"
msgstr "./images/30-ThinClient-LDM_Login.png"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Thin clients"
msgid "Thin Client Login"
msgstr "Thin Client Login"
@@ -3236,13 +3223,6 @@ msgid "Filterbox"
msgstr "Filterbox"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "To modify or delete a user, use GOsa² to browse the list of users on your "
-#| "system. On the very right of the screen you will find the \"Filter\" box, "
-#| "a search tool provided by GOsa². If you don't know the exact location of "
-#| "your user account in your tree, change to the base level of the GOsa²/"
-#| "LDAP tree and search there with the option marked \"[x] Search in subtrees"
-#| "\"."
msgid ""
"To modify or delete a user, use GOsa² to browse the list of users on your "
"system. On the middle of the screen you may open the \"Filter\" box, a "
@@ -3259,12 +3239,6 @@ msgstr ""
"Teilbäumen«."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "When using the \"Filter\" box, results will immediately appear in the "
-#| "middle of the text in the table list view. Every line represents a user "
-#| "account and the items farthest to the right on each line are little icons "
-#| "that provide actions for you: edit, lock, set password, restore snapshot "
-#| "(greyed out if no snapshot was taken before), take snapshot and delete."
msgid ""
"When using the \"Filter\" box, results will immediately appear in the middle "
"of the text in the table list view. Every line represents a user account and "
@@ -3351,12 +3325,10 @@ msgstr ""
"Passwort setzen."
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:change_password_administratively.png]"
msgid "./images/change_password_administratively.png"
msgstr "./images/change_password_administratively.png"
#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Set passwords"
msgid "Set user password"
msgstr "Passwort setzen "
@@ -3474,7 +3446,6 @@ msgid "Group Management with GOsa²"
msgstr "Gruppen mit GOsa² verwalten"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/alert.png"
msgid "./images/create_group.png"
msgstr "./images/create_group.png"
@@ -3483,7 +3454,6 @@ msgid "create group"
msgstr "Gruppe einrichten"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/edit_user.png"
msgid "./images/list_groups.png"
msgstr "./images/list_groups.png"
@@ -3609,17 +3579,6 @@ msgstr ""
"für DHCP reserviert und werden dynamisch zugewiesen."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "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 system will then have a "
-#| "matching icon."
msgid ""
"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; "
@@ -3643,15 +3602,6 @@ msgstr ""
"Arbeitsplatzrechner verwenden"
#. type: Content of: <article><section><section><para>
-#| 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². 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 "
@@ -3676,16 +3626,6 @@ msgstr ""
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "root at tjener:~# sitesummary2ldapdhcp -a\n"
-#| "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-#| "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-#| "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
-#| "\n"
-#| "Enter password if you want to activate these changes, and ^c to abort.\n"
-#| "\n"
-#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-#| "enter password: █"
msgid ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"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.\n"
@@ -3704,7 +3644,6 @@ msgstr ""
"enter password:"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:gosa_systems_list.png]"
msgid "./images/gosa_systems_list.png"
msgstr "./images/gosa_systems_list.png"
@@ -3713,7 +3652,6 @@ msgid "GOsa² systems listing"
msgstr "GOsa² Liste der Systeme"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:gosa_systems_host_details.png]"
msgid "./images/gosa_systems_host_details.png"
msgstr "./images/gosa_systems_host_details.png"
@@ -3722,7 +3660,6 @@ msgid "Host details"
msgstr "Host Details"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:gosa_systems_edit_host.png]"
msgid "./images/gosa_systems_edit_host.png"
msgstr "./images/gosa_systems_edit_host.png"
@@ -3731,7 +3668,6 @@ msgid "Modify host"
msgstr "Host bearbeiten"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:gosa_systems_add_netgroup.png]"
msgid "./images/gosa_systems_add_netgroup.png"
msgstr "./images/gosa_systems_add_netgroup.png"
@@ -4238,12 +4174,10 @@ msgstr ""
"ältesten zu bewahrenden Zustand (snapshot):"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:slbackup-php_maintenance.png]"
msgid "./images/slbackup-php_maintenance.png"
msgstr "./images/slbackup-php_maintenance.png"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "[attachment:slbackup-php_maintenance.png]"
msgid "slbackup-php Maintenance"
msgstr "slbackup-php Maintenance"
@@ -6170,11 +6104,6 @@ msgstr ""
"Clients verwenden zu können."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
-#| "workstations. If the amount of RAM is less, the machine will boot as thin "
-#| "client. Unlike workstations, diskless workstations run without any need "
-#| "to add them with GOsa²."
msgid ""
"LTSP defines 320MB as the default minimum amount of RAM for diskless "
"workstations. If the amount of RAM is less, the machine will boot as thin "
@@ -6189,9 +6118,13 @@ msgstr ""
"Anmelden und Verbinden mit dem LTSP-Server verwendet wird."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "These steps have to be taken to get back to the behaviour in Debian Edu "
+#| "Squeeze."
msgid ""
-"These steps have to be taken to get back to the behaviour in Debian Edu "
-"Squeeze."
+"The following steps can be used to get back the behaviour from Debian Edu "
+"Squeeze:"
msgstr ""
"Diese Schritte müssen erfolgen, um das Verhalten wie bei Debian-Edu Squeeze "
"festzulegen. "
@@ -6211,7 +6144,6 @@ msgid "Add the diskless workstations to LDAP with GOsa²."
msgstr "Tragen Sie die Diskless Workstations mit GOsa² in LDAP ein."
#. type: Content of: <article><section><section><para>
-#| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
msgstr "<emphasis role=\"strong\">Firmware der LTSP-Clients</emphasis>"
@@ -6283,11 +6215,6 @@ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
msgstr "<emphasis role=\"strong\">Kernel der LTSP-Clients</emphasis>"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "In order to support older hardware the package <computeroutput>linux-"
-#| "image-486</computeroutput> is installed by default. If all LTSP client "
-#| "machines support the 686 processor architecture the <computeroutput>linux-"
-#| "image-686</computeroutput> package could be installed in the chroot."
msgid ""
"In order to support older hardware the package <computeroutput>linux-"
"image-486</computeroutput> is installed by default. If all LTSP client "
@@ -8750,7 +8677,6 @@ msgstr ""
"»Intern« sollte die gerade abgeschickte E-Mail vorhanden sein."
#. type: Content of: <article><section><section><section><title>
-#| msgid "Obtaining a Kerberos ticket to read email on diskless clients"
msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
msgstr ""
"Kerberos-Ticket zum Lesen von Email auf Diskless Workstations anfordern"
@@ -9509,8 +9435,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -11669,3 +11595,6 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+
+#~ msgid "FIXME: one screenshot still needs to be done here..."
+#~ msgstr "FIXME: one screenshot still needs to be done here..."
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 05a8ea5..62275da 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-03 15:09+0300\n"
+"POT-Creation-Date: 2013-07-04 19:18+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"
@@ -2615,11 +2615,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"After giving the root password, you will be asked to create a normal user "
-"account \"for non-administrative tasks\". For Debian-edu, this account is "
-"very important! It is the account you will use to manage the Skolelinux "
-"network. You must choose a password length of at least 5 characters for this "
-"user, otherwise you will not be able to log in (even though a shorter "
-"password will be accepted by the installer)."
+"account \"for non-administrative tasks\". For Debian Edu this account is "
+"very important: It is the account you will use to manage the Skolelinux "
+"network."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
+"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
+"- otherwise login will not be possible. (And that's even though a shorter "
+"password will be accepted by the installer.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3089,8 +3095,11 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid "FIXME: one screenshot still needs to be done here..."
-msgstr ""
+#, 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"
@@ -6368,8 +6377,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"These steps have to be taken to get back to the behaviour in Debian Edu "
-"Squeeze."
+"The following steps can be used to get back the behaviour from Debian Edu "
+"Squeeze:"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -11258,9 +11267,6 @@ msgstr ""
#~ msgid "pxe-tjener.png"
#~ msgstr "pxe-tjener.png"
-#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
#, fuzzy
#~| msgid ""
#~| "New in Debian Edu 6.0.3 beta2 Codename \"Wheezy\" released 2012-01-07"
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 01f6168..b017e5b 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-03 15:09+0300\n"
+"POT-Creation-Date: 2013-07-04 19:18+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"
@@ -2196,11 +2196,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"After giving the root password, you will be asked to create a normal user "
-"account \"for non-administrative tasks\". For Debian-edu, this account is "
-"very important! It is the account you will use to manage the Skolelinux "
-"network. You must choose a password length of at least 5 characters for this "
-"user, otherwise you will not be able to log in (even though a shorter "
-"password will be accepted by the installer)."
+"account \"for non-administrative tasks\". For Debian Edu this account is "
+"very important: It is the account you will use to manage the Skolelinux "
+"network."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
+"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
+"- otherwise login will not be possible. (And that's even though a shorter "
+"password will be accepted by the installer.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2640,10 +2646,10 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid ""
-#| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: one screenshot still needs to be done here..."
-msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#| 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"
@@ -6389,8 +6395,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"These steps have to be taken to get back to the behaviour in Debian Edu "
-"Squeeze."
+"The following steps can be used to get back the behaviour from Debian Edu "
+"Squeeze:"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -11929,6 +11935,13 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#~ msgid "FIXME: one screenshot still needs to be done here..."
+#~ msgstr ""
+#~ "FIXME: these screenshots need to be redone once we have wheezy artwork"
+
#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
@@ -12221,9 +12234,6 @@ msgstr ""
#~ msgid "pxe-tjener.png"
#~ msgstr "pxe-tjener.png"
-#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
#~ msgid ""
#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
#~ "to install the main server, all user passwords exept that one for 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 f3f6af2..690bb36 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-03 15:09+0300\n"
+"POT-Creation-Date: 2013-07-04 19:18+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"
@@ -2148,11 +2148,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"After giving the root password, you will be asked to create a normal user "
-"account \"for non-administrative tasks\". For Debian-edu, this account is "
-"very important! It is the account you will use to manage the Skolelinux "
-"network. You must choose a password length of at least 5 characters for this "
-"user, otherwise you will not be able to log in (even though a shorter "
-"password will be accepted by the installer)."
+"account \"for non-administrative tasks\". For Debian Edu this account is "
+"very important: It is the account you will use to manage the Skolelinux "
+"network."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
+"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
+"- otherwise login will not be possible. (And that's even though a shorter "
+"password will be accepted by the installer.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2575,10 +2581,10 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid ""
-#| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: one screenshot still needs to be done here..."
-msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#| 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"
@@ -6252,8 +6258,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"These steps have to be taken to get back to the behaviour in Debian Edu "
-"Squeeze."
+"The following steps can be used to get back the behaviour from Debian Edu "
+"Squeeze:"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -11667,6 +11673,13 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#~ msgid "FIXME: one screenshot still needs to be done here..."
+#~ msgstr ""
+#~ "FIXME: these screenshots need to be redone once we have wheezy artwork"
+
#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
@@ -11970,9 +11983,6 @@ msgstr ""
#~ msgid "pxe-tjener.png"
#~ msgstr "pxe-tjener.png"
-#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
#~ msgid ""
#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
#~ "to install the main server, all user passwords exept that one for the "
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 3597d29..2c536aa 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-03 15:09+0300\n"
+"POT-Creation-Date: 2013-07-04 19:18+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"
@@ -2477,11 +2477,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"After giving the root password, you will be asked to create a normal user "
-"account \"for non-administrative tasks\". For Debian-edu, this account is "
-"very important! It is the account you will use to manage the Skolelinux "
-"network. You must choose a password length of at least 5 characters for this "
-"user, otherwise you will not be able to log in (even though a shorter "
-"password will be accepted by the installer)."
+"account \"for non-administrative tasks\". For Debian Edu this account is "
+"very important: It is the account you will use to manage the Skolelinux "
+"network."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
+"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
+"- otherwise login will not be possible. (And that's even though a shorter "
+"password will be accepted by the installer.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2965,8 +2971,12 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid "FIXME: one screenshot still needs to be done here..."
+#, 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"
@@ -6688,8 +6698,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"These steps have to be taken to get back to the behaviour in Debian Edu "
-"Squeeze."
+"The following steps can be used to get back the behaviour from Debian Edu "
+"Squeeze:"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index cb885b2..d592d4e 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-03 15:09+0300\n"
+"POT-Creation-Date: 2013-07-04 19:26+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"
@@ -1542,11 +1542,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"After giving the root password, you will be asked to create a normal user "
-"account \"for non-administrative tasks\". For Debian-edu, this account is "
-"very important! It is the account you will use to manage the Skolelinux "
-"network. You must choose a password length of at least 5 characters for this "
-"user, otherwise you will not be able to log in (even though a shorter "
-"password will be accepted by the installer)."
+"account \"for non-administrative tasks\". For Debian Edu this account is "
+"very important: It is the account you will use to manage the Skolelinux "
+"network."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
+"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
+"- otherwise login will not be possible. (And that's even though a shorter "
+"password will be accepted by the installer.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1857,7 +1863,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid "FIXME: one screenshot still needs to be done here..."
+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>
@@ -4470,8 +4477,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"These steps have to be taken to get back to the behaviour in Debian Edu "
-"Squeeze."
+"The following steps can be used to get back the behaviour from Debian Edu "
+"Squeeze:"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 5a5afa0..8886b63 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -649,7 +649,9 @@ FIXME: only the CD download links work currently - the DVD and source DVD downlo
<para>Wait. If the selected profiles include Thin-client-server then the installer will spend quite some time at the end, "Finishing the installation - Running debian-edu-profile-udeb..."
</para></listitem>
<listitem>
-<para>After giving the root password, you will be asked to create a normal user account "for non-administrative tasks". For Debian-edu, this account is very important! It is the account you will use to manage the Skolelinux network. You must choose a password length of at least 5 characters for this user, otherwise you will not be able to log in (even though a shorter password will be accepted by the installer).
+<para>After giving the root password, you will be asked to create a normal user account "for non-administrative tasks". For Debian Edu this account is very important: It is the account you will use to manage the Skolelinux network.
+</para>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The choosen password for this user <emphasis role="strong">must</emphasis> have a length of <emphasis role="strong">at least 5 characters</emphasis> - otherwise login will not be possible. (And that's even though a shorter password will be accepted by the installer.)
</para></listitem>
<listitem>
<para>Be happy
@@ -792,7 +794,7 @@ FIXME: two PXE screenshots (with wheezy artwork) are missing here
<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 needs to be done here...
+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>
@@ -1930,7 +1932,7 @@ apt-get update]]></screen>
</para>
<para>LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. Unlike workstations, diskless workstations run without any need to add them with GOsa², cause LDM is used to login and connect to the LTSP server.
</para>
-<para>These steps have to be taken to get back to the behaviour in Debian Edu Squeeze.
+<para>The following steps can be used to get back the behaviour from Debian Edu Squeeze:
</para>
<itemizedlist>
<listitem>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index 3941998..d2a898d 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -3,7 +3,7 @@ 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: Check these numbers for Wheezy. They are 2012-01-22 for Lenny.
FIXME: two PXE screenshots (with wheezy artwork) are missing here
-FIXME: one screenshot still needs to be done here...
+FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png).
----------------------------------
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?
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index c60f5e5..df26db3 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index bea8a0e..c0aebf7 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index cec1d8f..abc711e 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 779c2bf..9e733ad 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index fcb02fa..de0b5da 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-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-04 19:26+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