[debian-edu-commits] [SCM] Debian package debian-edu-doc branch, wheezy, updated. 1.4_20120925_6.0.6-45-g4ed91e0

David Prévot taffit at debian.org
Thu Feb 14 03:51:19 UTC 2013


The following commit has been merged in the wheezy branch:
commit e7ab3f0f7b2196f1430dada73b2804ed5f37b58e
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 13:46:45 2013 -0400

    Wheezy manual and images import from the wiki
    
    1217 translated messages, 112 fuzzy translations, 7 untranslated
    messages.

diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 04e0543..47a5f03 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-01-23 15:13-0400\n"
+"POT-Creation-Date: 2013-02-13 22:59-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"
@@ -21,29 +21,27 @@ msgid "en"
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr ""
-
-#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu login"
+#. type: Content of: <article><section><para>
+msgid ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> is a wiki and updated frequently."
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -135,7 +133,7 @@ msgid "Network"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Debian_Edu_Network_Squeeze.png"
+msgid "./images/Debian_Edu_Network_Wheezy.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -988,8 +986,8 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-"Debian Squeeze</ulink> before you start installing a system for production "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 
@@ -1014,14 +1012,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Even more information about the Debian Squeeze release is available in its "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Even more information about the Debian Wheezy release is available in its "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1035,22 +1033,28 @@ msgid ""
 "or rsync via:"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1065,20 +1069,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-CD."
-"iso\">debian-edu-6.0.6+r1-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-CD."
-"iso\">debian-edu-6.0.6+r1-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"CD.iso debian-edu-6.0.6+r1-CD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1091,20 +1095,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-"
-"source-DVD.iso\">debian-edu-6.0.6+r1-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-"
-"source-DVD.iso\">debian-edu-6.0.6+r1-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"source-DVD.iso debian-edu-6.0.6+r1-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -1143,12 +1147,8 @@ msgstr ""
 msgid "Select type of installation"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:01-Installer_boot_menu.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1187,12 +1187,8 @@ msgid ""
 "installer"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_a.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1235,12 +1231,8 @@ msgid ""
 "preseed file."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_b.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_b.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1281,12 +1273,8 @@ msgid ""
 "needs a preseed file."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer help screen"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_help.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1369,7 +1357,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">system requirements</ulink> and make sure you have at "
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
@@ -1539,9 +1527,9 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -1562,7 +1550,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
+msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -1594,26 +1582,6 @@ msgid "Minimal: 12 of 83 MiB downloaded."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on some RAID controllers"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"When using a USB drive to add missing firmware during install, with some "
-"RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-"installation results in a GRUB error. A workaround for this problem is to "
-"remove the USB drive after the firmware is loaded, and preferably before "
-"partitioning starts."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
 msgstr ""
 
@@ -1694,12 +1662,8 @@ msgid ""
 "Server</emphasis> profile only:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/pxe-tjener.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "pxe-tjener.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:pxe-tjener.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1709,12 +1673,8 @@ msgid ""
 "emphasis> profiles:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1767,7 +1727,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -1833,240 +1793,124 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/02-select_a_language.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "02-select_a_language.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/03-select_your_location.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "03-select_your_location.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/04-Configure_the_keyboard.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "04-Configure_the_keyboard.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "05-Detect_and_mount_CD-ROM.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "06-Load_installer_components_from_CD.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/07-Detect_network_hardware.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "07-Detect_network_hardware.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "08-Choose_Debian_Edu_profile.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "11-Participate_in_the_package_usage_survey.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12a-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12b-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12b-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12c-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12c-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/13-Install+the+base+system.png"
+#. type: Content of: <article><section><section><para>
+msgid "FIXME: these screenshots need to be redone once we have wheezy artwork"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "13-Install the base system.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:02-select_a_language.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:03-select_your_location.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:04-Configure_the_keyboard.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:05-Detect_and_mount_CD-ROM.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:06-Load_installer_components_from_CD.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/18-Build+LTSP+chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:07-Detect_network_hardware.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "18-Build LTSP chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12-Set_up_users_and_passwords.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12a-Set_up_users_and_passwords.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12b-Set_up_users_and_passwords.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12c-Set_up_users_and_passwords.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:13-Install the base system.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:14-Select_and_install_software.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:17-Select_and_install_software.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:18-Build LTSP chroot.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:20-Finish_the_Installation.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:23-Tjener-KDM_Login.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:24-Tjener-KDE_Start.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:27-Tjener-KDE_Desktop.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:30-ThinClient-LDM_Login.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -2115,12 +1959,8 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/getting-started-desktop.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu desktop"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:getting-started-desktop.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2179,7 +2019,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"If you are using a new Debian Edu Squeeze machine, the site certificate will "
+"If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
 
@@ -2200,12 +2040,8 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa2_overview.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² overview page after login as the first user"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:gosa2_overview.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2340,43 +2176,12 @@ msgid ""
 "within your network."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Please note:</emphasis> If Squeeze/r0 was used to "
-"install the main server, all user passwords exept that one for the first "
-"user will expire in only 2 days.  To fix this, please execute the following "
-"script in a terminal.  This script is included in r1."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\""
-msgstr ""
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/filterbox.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Filterbox"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:filterbox.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2404,12 +2209,8 @@ msgid ""
 "belongs to."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/edit_user.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Editing user data"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:edit_user.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -2450,12 +2251,8 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/change_password_administratively.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Set user password"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:change_password_administratively.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2545,16 +2342,12 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/create_group.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "create group"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:create_group.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/list_groups.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:list_groups.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2660,7 +2453,7 @@ msgstr ""
 #, 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: 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"
@@ -2670,36 +2463,20 @@ msgid ""
 "enter password: █"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_list.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² systems listing"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_host_details.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Host details"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_edit_host.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_list.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Modify host"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_host_details.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_add_netgroup.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_edit_host.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Add netgroup"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_add_netgroup.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3058,12 +2835,8 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/slbackup-php_maintenance.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "slbackup-php Maintenance"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:slbackup-php_maintenance.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -3354,12 +3127,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-msgid "Upgrades from Debian Edu Lenny"
+msgid "Upgrades from Debian Edu Squeeze"
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Lenny in a test "
+"Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
 
@@ -3370,7 +3143,7 @@ msgstr ""
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"lenny\" with \"squeeze\"."
+"occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
@@ -3391,6 +3164,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
 "accounts, passwords, network settings, services and machines are treated is "
 "quite different now. So LDAP has to be rebuild from scratch. There's a "
@@ -3406,7 +3184,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will automatically support both thin-clients and diskless workstations."
+"will still support both thin-clients and diskless workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3428,17 +3206,17 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 msgid ""
-"Upgrades from older Debian Edu / Skolelinux installations (before Lenny)"
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"To upgrade from any older release, you will need to upgrade to the Lenny-"
+"To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian Edu Lenny</"
-"ulink> about how to upgrade to Lenny from the previous release, Etch, and "
-"the Etch manual covers the one before that!"
+"debian.org/DebianEdu/Documentation/Squeeze#\">Manual for Debian Edu Squeeze</"
+"ulink> about how to upgrade to Squeeze from the previous release, Lenny, and "
+"the Lenny manual covers the one before that! (Etch was it's name.)"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -3784,7 +3562,7 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
 "apt-get update"
 msgstr ""
 
@@ -3802,8 +3580,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to upgrade from one version to another (for example from Squeeze "
-"6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical "
+"If you want to upgrade from one version to another (for example from Wheezy "
+"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
 "media, follow these steps:"
 msgstr ""
 
@@ -4339,7 +4117,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -5157,7 +4935,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5640,7 +5418,7 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-"
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
 "style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
@@ -6314,8 +6092,8 @@ msgstr ""
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> and you can contribute easily. Note: a user account is needed "
-"to edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 
@@ -6425,1393 +6203,1489 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-msgid "New features in Debian Edu Squeeze"
+msgid "New features in Debian Edu Wheezy"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "sitesummary was updated from 0.1.3 to 0.1.8"
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Make Nagios configuration more robust and efficient"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
+"installation, in the login screen and as desktop wallpaper."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Comply with 3.X kernel"
+#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: hopefully. h01ger is one it to ask gismo."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
+#. type: Content of: <article><section><section><section><title>
+msgid "Installation changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Minor updates from the wiki"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Danish translation now complete"
+#. type: Content of: <article><section><section><section><title>
+msgid "Software updates"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Wheezy:"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
-"#664596"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 3.2.x"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Handle '#' characters in the root or first users password. Closes: #664976"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-sync:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 10 ESR"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't fail if password contains \""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LibreOffice 3.5.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't disclose new password string in syslog"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 12.01"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-create:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 12.04"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Invalidate libnss cache before applying changes"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.8.2"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Multiple failures during mass user import into GOsa²"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.1"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.11.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"gosa-netgroups plugin: don't erase entries of attribute type "
-"\"memberNisNetgroup\". Closes: #687256"
+"Debian Wheezy includes over 10,000 new packages available for installation, "
+"including the Chromium browser"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "First user now uses the same Kerberos policy as all other users"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Add Danish web page"
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "to be documented, if any"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Improve preseeding support and documentation"
+#. type: Content of: <article><section><section><section><title>
+msgid "Documentation and translation updates"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in FIXME languages."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
+"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
+msgid "Regressions"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
-"installation, in the login screen and as desktop wallpaper."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <link linkend=\"GettingStarted\">Getting started chapter</link> of the "
-"manual for more information on GOsa²."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "See below for a list of updated software."
+#. type: Content of: <article><section><title>
+msgid "Copyright and authors"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Show welcome page to users when they first log in. This default start page "
-"for Iceweasel is fetched from LDAP at installation and boot time for "
-"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
-"Standalone installations."
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
+"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
+"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
+"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
+"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
+"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
+"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
+"GPL2 or any later version. Enjoy!"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
-"installation method."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the GPL2 or later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Speed up LTSP client boot."
+#. type: Content of: <article><section><title>
+msgid "Translation copyright and authors"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Provide a KDE menu entry for changing the password in GOsa²."
+#. type: Content of: <article><section><para>
+msgid ""
+"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
+"released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"For more information on how to change passwords (including expired passwords "
-"at the KDM/GDM login prompt), please see the <link linkend=\"Users\">HowTos "
-"for users</link> chapter of the manual."
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
+"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
+"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
-"shown to new users."
+"The German translation is copyrighted by Holger Levsen (2007), Patrick "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
+"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
+"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
+"and is released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"All LTSP servers are also <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP servers</link> by default."
+"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Improve handing of removable media on thin clients. Show desktop "
-"notification longer when inserting new media and provide an option to start "
-"dolphin when such media is inserted."
+"The French translation is copyrighted by Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
+"2010, 2012) and is released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Installation changes"
+#. type: Content of: <article><section><para>
+msgid ""
+"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+"(2009) and is released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
-"for more details."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
-"is set up during installation of the Main Server. This user is up as GOsa² "
-"administrator and is also granted sudo access. The Debian Edu menu "
-"reordering has been enabled as well, by adding the user also to the "
-"<computeroutput>teachers</computeroutput> group."
+#. type: Content of: <article><section><title>
+msgid "Translations of this document"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"Versions of this document fully translated into German, Italian, French and "
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">take a look here</ulink> for your own language."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New roaming workstation profile for laptops."
+#. type: Content of: <article><section><section><title>
+msgid "HowTo translate this document"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Device access for all users is handled by <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-"needed to get access to devices."
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-"
+"manual-translations</computeroutput>. The Subversion repository (see below) "
+"contains this file too. Take a look there and at the <ulink url=\"http://"
+"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
+"specific conventions</ulink> if you want to help translating this document."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A warning will be issued when installing on too small disks for the selected "
-"profile."
+"To commit your translations you need to be a member of the Alioth project "
+"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
+"check out some files from from Subversion (which can be done anonymously) "
+"and create patches. Please file a bug against the debian-edu-doc package and "
+"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
+"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
+"\">instructions on how to submit bugs</ulink> here."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/ "
-"but no seperate /usr anymore."
+"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
+"anonymously with the following command (you need to have the "
+"<computeroutput>subversion</computeroutput> package installed for this to "
+"work):"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"More tests in the test suite, and correct some of the tests that failed "
-"earlier."
+"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
+"edu-doc</computeroutput>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make sure to report an error and abort the installation when trying to use "
-"the netinst images without a working Internet connection, instead of "
-"silently installing a broken system."
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
+"<computeroutput>lokalize</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Software updates"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Then you either commit the file directly to Subversion (if you have the "
+"rights to do so) or send the file to the bugreport."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Squeeze:"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"compatibility with the FHS v2.3 and software developed for version 3.2 of "
-"the LSB."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Linux kernel 2.6.32"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 3.5"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<computeroutput>svn up</computeroutput>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "OpenOffice.org 3.2.1"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 9.3"
+#.  <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 "
+"translate any string which contains \" FIXME\"."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Music creator Rosegarden 10.04.2"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Basic information about Alioth (the host where our Subversion repository is "
+"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
+"Alioth/Svn\"/>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Image editor Gimp 2.6.10"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
+"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
+"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
+"Subversion</ulink>. Also you might want to look at the "
+"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
+"for Subversion instead of using the commandline client."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual universe Celestia 1.6.0"
+#. type: Content of: <article><section><section><para>
+msgid "Please report any problems."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual stargazer Stellarium 0.10.4"
+#. type: Content of: <article><section><title>
+msgid "Appendix A - The GNU General Public License"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation, "
-"including the browser Chromium"
+#. type: CDATA
+#, no-wrap
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
-"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The dynamic DHCP range was extended on the backbone network to around 4k IP "
-"addresses, and around 200 IP addresses for the thin client network."
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
-"computeroutput>"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"There are no pre-defined host entries for client systems in DNS anymore "
-"(staticXX, ..., dhcpYY...)"
+#. type: Content of: <article><section><section><title>
+msgid "GNU GENERAL PUBLIC LICENSE"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "MIT Kerberos5 used for user authentication, enabled for:"
+#. type: Content of: <article><section><section><para>
+msgid "Version 2, June 1991"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "PAM"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "IMAP"
+#. type: Content of: <article><section><section><title>
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "SMTP"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the <computeroutput>workstation</"
-"computeroutput> netgroup to be able to mount the home directories"
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A complete PXE boot environment is setup when installing from the DVD, so "
-"that further installations can be done using PXE network installs only. A "
-"new script pxe-addfirmware is provided to support more hardware models "
-"needing firmware."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Remove all hard coded settings on workstations, and configure workstations "
-"and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
-"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Documentation and translation updates"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
-"proof-read with corrections was done by a native English linguist."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
-"and Spanish."
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to many language tasks, especially French and Danish."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to the welcome web page shown at first logins."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add new Japanese, Portuguese and Catalan translations of the welcome web "
-"page."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
-"installing a KDE environemnt."
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
-"netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop gtick in the default installation, because it doesn't work on thin "
-"clients (BTS #566335)."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "New administration tool: GOsa²"
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
-"with:"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fix DHCP host removal. Closes: #650258"
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Backport user generator unicode character transliteration. Closes: #657086"
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Customized GOsa² configuration to better suit the Debian Edu network "
-"architecture."
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"GOsa² updates DNS and NFS exports immediately when a system is updated in "
-"LDAP, making diskless workstations work right after they are added to the "
-"required netgroup."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
-"objects using information gathered by sitesummary, to make it easier to add "
-"new computers to the network."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "More software changes"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change default package manager from adept to synaptic, to avoid getting two "
-"graphical package managers installed by default."
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
-"KDE."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
-"default KDE installation."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Replace network-manager-kde with plasma-widget-networkmanagement in the "
-"standalone KDE profile"
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add cifs-utils to the default installation to ensure SMB mounting can work "
-"in any profile."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
-"and valgrind from the default installation and the DVD to make room for "
-"higher priority packages."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
-"authoritive source of host names."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
-"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
-"installed instead.)"
+#. type: Content of: <article><section><title>
+msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#. type: Content of: <article><section><para>
+msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Make the LDAP server handle more clients after increasing the server's file "
-"descriptor limit from 1024 to 32768."
+#. type: Content of: <article><section><section><title>
+msgid "Features of the Standalone image"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
-"flush all CUPS queues every night. Both can be disabled in LDAP."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Almost all packages from the Standalone profile"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Provide network blocking / exam mode by default, controlled by LDAP. In "
-"addition to network blocking, changes to the Squid proxy configuration is "
-"needed."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "All packages from the laptop task"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Enable automatic extending of full file systems on the Main Server by "
-"default. This can be disabled in LDAP."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The KDE desktop profile for students/pupils."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change SSL certificate name used by the LDAP server and adjust clients to "
-"use the new name to be able to enable certificate checking on clients."
+#. type: Content of: <article><section><section><title>
+msgid "Activating translations and regional support"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
-"setup used for DNS."
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Simplify autofs LDAP rules to make sure they work with extra home directory "
-"partitions exported from the main-server without any changes."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Make backup system more robust in handling LDAP database dump and restart."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Root logins are denied for both KDM and GDM - see above and <link linkend="
-"\"GettingStarted\">Getting started</link> for details."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Bokmål"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Clients set up to shut down at night will stay up for at least an hour if "
-"they are turned on manually between 16:00 and 07:00."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nb_NO.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Additionally use local NTP clock on the main-server to ensure clients and "
-"server sync clocks also when disconnected from the Internet."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Nynorsk"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "The home0 partition is mounted nosuid, to increase security."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nn_NO.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
-"from 144 to 24 MiB."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "German"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de_DE.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Copyright and authors"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
-"GPL2 or any later version. Enjoy!"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "French (France)"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr_FR.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Translation copyright and authors"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Greek (Greece)"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el_GR.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
-"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
-"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
-"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
-"version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Japanese"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "ja_JP.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "jp"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Northern Sami (Norway)"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Translations of this document"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "se_NO"
 msgstr ""
 
-#. type: Content of: <article><section><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no(smi)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "HowTo translate this document"
+msgid "Stuff to know"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"As in many free software projects, translations of this document are kept in "
-"PO files. More information about the process can be found in "
-"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
-"contains this file too. Take a look there and at the <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-"specific conventions</ulink> if you want to help translating this document."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The password for the user is \"user\"; root has no passwd set."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
-"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
-"\">instructions on how to submit bugs</ulink> here."
+#. type: Content of: <article><section><section><title>
+msgid "Known issues with the image"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "There are no wheezy images yet"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/sad.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language "
-"code). There are many tools for translating available; we suggest using "
-"<computeroutput>lokalize</computeroutput>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+msgid ":("
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+#. type: Content of: <article><section><section><title>
+msgid "Download"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
+#. type: Content of: <article><section><title>
+msgid "Appendix C - Features in older releases"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><title>
 msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations to find information how to create a new PO file for your "
-"language if there isn't one yet, and how to update translations."
+"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released 2013-0?-??"
 msgstr ""
 
-#.  <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 "
-"translate any string which contains \" FIXME\"."
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make Nagios configuration more robust and efficient"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "Please report any problems."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Comply with 3.X kernel"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Appendix A - The GNU General Public License"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
 msgstr ""
 
-#. type: CDATA
-#, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Minor updates from the wiki"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Danish translation now complete"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-config from 1.453 to 1.454"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
+"#664596"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "GNU GENERAL PUBLIC LICENSE"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-sync:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "Version 2, June 1991"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't fail if password contains \""
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't disclose new password string in syslog"
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-create:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Invalidate libnss cache before applying changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Multiple failures during mass user import into GOsa²"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"gosa-netgroups plugin: don't erase entries of attribute type "
+"\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "First user now uses the same Kerberos policy as all other users"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Add Danish web page"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-install from 1.528 to 1.529"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Improve preseeding support and documentation"
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
+"the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "See below for a list of updated software."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Show welcome page to users when they first log in. This default start page "
+"for Iceweasel is fetched from LDAP at installation and boot time for "
+"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
+"Standalone installations."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+"Gnome option, the LXDE desktop option is only supported by the CD "
+"installation method."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Speed up LTSP client boot."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Provide a KDE menu entry for changing the password in GOsa²."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</ulink> "
+"chapter of the manual."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
+"shown to new users."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Improve handing of removable media on thin clients. Show desktop "
+"notification longer when inserting new media and provide an option to start "
+"dolphin when such media is inserted."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
+"is set up during installation of the Main Server. This user is up as GOsa² "
+"administrator and is also granted sudo access. The Debian Edu menu "
+"reordering has been enabled as well, by adding the user also to the "
+"<computeroutput>teachers</computeroutput> group."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
+"<computeroutput>cat</computeroutput>.."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New roaming workstation profile for laptops."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"Device access for all users is handled by <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"More tests in the test suite, and correct some of the tests that failed "
+"earlier."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"Make sure to report an error and abort the installation when trying to use "
+"the netinst images without a working Internet connection, instead of "
+"silently installing a broken system."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Squeeze:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"compatibility with the FHS v2.3 and software developed for version 3.2 of "
+"the LSB."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 2.6.32"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 3.5"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "OpenOffice.org 3.2.1"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 9.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 10.04.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.6.10"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.0"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.10.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
+"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"The dynamic DHCP range was extended on the backbone network to around 4k IP "
+"addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"The DHCP network for 10.0.0.0/8 has been renamed from "
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+"There are no pre-defined host entries for client systems in DNS anymore "
+"(staticXX, ..., dhcpYY...)"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "MIT Kerberos5 used for user authentication, enabled for:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "PAM"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "IMAP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"A complete PXE boot environment is setup when installing from the DVD, so "
+"that further installations can be done using PXE network installs only. A "
+"new script pxe-addfirmware is provided to support more hardware models "
+"needing firmware."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Remove all hard coded settings on workstations, and configure workstations "
+"and roaming workstations using settings detected from the environment using "
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
+"proof-read with corrections was done by a native English linguist."
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid "Debian Edu Live CD/DVDs for Squeeze are not available at the moment."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Features of the Standalone image"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to many language tasks, especially French and Danish."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Almost all packages from the Standalone profile"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to the welcome web page shown at first logins."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "All packages from the laptop task"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add new Japanese, Portuguese and Catalan translations of the welcome web "
+"page."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The KDE desktop profile for students/pupils."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Activating translations and regional support"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
+"netinst installation CDs. It is still possible to run Debian Edu on "
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want.  To activate a given keyboard layout, use the "
-"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
-"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live CD build script "
-"documentation</ulink>.  Here is a list of commonly used locale codes:"
+"Drop gtick in the default installation, because it doesn't work on thin "
+"clients (BTS #566335)."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
+#. type: Content of: <article><section><section><section><title>
+msgid "New administration tool: GOsa²"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Locale value</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix DHCP host removal. Closes: #650258"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Bokmål"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Backport user generator unicode character transliteration. Closes: #657086"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nb_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Customized GOsa² configuration to better suit the Debian Edu network "
+"architecture."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"GOsa² updates DNS and NFS exports immediately when a system is updated in "
+"LDAP, making diskless workstations work right after they are added to the "
+"required netgroup."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Nynorsk"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
+"objects using information gathered by sitesummary, to make it easier to add "
+"new computers to the network."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nn_NO.UTF-8"
+#. type: Content of: <article><section><section><section><title>
+msgid "More software changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "German"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de_DE.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change default package manager from adept to synaptic, to avoid getting two "
+"graphical package managers installed by default."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
+"KDE."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "French (France)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change video player setup to install different players in KDE "
+"(dragonplayer), Gnome (totem) and LXDE (totem)."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr_FR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
+"default KDE installation."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace network-manager-kde with plasma-widget-networkmanagement in the "
+"standalone KDE profile"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Greek (Greece)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el_GR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add cifs-utils to the default installation to ensure SMB mounting can work "
+"in any profile."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
+"and valgrind from the default installation and the DVD to make room for "
+"higher priority packages."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Japanese"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
+"authoritive source of host names."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "ja_JP.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
+"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
+"installed instead.)"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "jp"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make the LDAP server handle more clients after increasing the server's file "
+"descriptor limit from 1024 to 32768."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Northern Sami (Norway)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "se_NO"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide network blocking / exam mode by default, controlled by LDAP. In "
+"addition to network blocking, changes to the Squid proxy configuration is "
+"needed."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no(smi)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable automatic extending of full file systems on the Main Server by "
+"default. This can be disabled in LDAP."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
-"the live images. Not all locales have translations installed, though.  The "
-"keyboard layout names can be found in /usr/share/keymaps/i386/."
+"Change SSL certificate name used by the LDAP server and adjust clients to "
+"use the new name to be able to enable certificate checking on clients."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Stuff to know"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
+"setup used for DNS."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The password for the user is \"user\"; root has no passwd set."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Simplify autofs LDAP rules to make sure they work with extra home directory "
+"partitions exported from the main-server without any changes."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Known issues with the image"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "There are no squeeze images yet"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/sad.png"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Clients set up to shut down at night will stay up for at least an hour if "
+"they are turned on manually between 16:00 and 07:00."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-msgid ":("
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Additionally use local NTP clock on the main-server to ensure clients and "
+"server sync clocks also when disconnected from the Internet."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Download"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Access to Debian repositories is always done via a proxy on the main server "
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "The home0 partition is mounted nosuid, to increase security."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
+"from 144 to 24 MiB."
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Appendix C - Features in older releases"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New tool notify-local-users to send desktop notification to all logged in "
+"users on a machine.  Useful for thin client servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
similarity index 92%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 32e53cc..040c389 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual <?dbtimestamp?></title></articleinfo>
+<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual <?dbtimestamp?></title></articleinfo>
 <section id="AboutDebianEdu">
-<title>Manual for Debian Edu 6.0.6+r1 Codename "Squeeze"
+<title>Manual for Debian Edu 7.0.0+r0 Codename "Wheezy"
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/welcome_to_tjener.png"/></imageobject><textobject><phrase>Debian Edu login</phrase></textobject></inlinemediaobject> 
+<para>[attachment:welcome_to_tjener.png] 
+FIXME: we need a wheezy login shot here once we have new artwork 
 </para>
-<para>This is the manual for the Debian Edu Squeeze 6.0.6+r1 release.  
+<para>This is the manual for the Debian Edu Wheezy 7.0.0+r0 release.  
 </para>
-<para>The version at <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze"/> is a wiki and updated frequently.  
+<para>The version at <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Wheezy"/> is a wiki and updated frequently.  
 </para>
 <para><link linkend="Translations">Translations</link> are part of the <computeroutput>debian-edu-doc</computeroutput> package which can be installed on a webserver, and is available <ulink url="http://maintainer.skolelinux.org/debian-edu-doc/">online</ulink>. 
 </para>
@@ -47,7 +48,7 @@
 <section id="Architecture--Network">
 <title>Network
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Debian_Edu_Network_Squeeze.png"/></imageobject><textobject><phrase>The Debian Edu network topology</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Debian_Edu_Network_Wheezy.png"/></imageobject><textobject><phrase>The Debian Edu network topology</phrase></textobject></inlinemediaobject> 
 </para>
 <para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux network assumes that there is one (and only one) main-server, while allowing the inclusion of both normal workstations and thin-client-servers (with associated thin-clients). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the thin-client servers, each of which is on a separate network so that the traffic between the thin-clients and the thin-client server doesn't affect the rest of the network services. 
 </para>
@@ -412,16 +413,16 @@
 <section id="Installation--Where_to_find_additional_information">
 <title>Where to find additional information
 </title>
-<para>We recommend that you read or at least take a look at the <ulink url="http://www.debian.org/releases/squeeze/releasenotes">release notes for Debian Squeeze</ulink> before you start installing a system for production use. Please give Debian Edu/Skolelinux a try, it should just work. <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:-)</phrase></textobject></inlinemediaobject>  
+<para>We recommend that you read or at least take a look at the <ulink url="http://www.debian.org/releases/wheezy/releasenotes">release notes for Debian Wheezy</ulink> before you start installing a system for production use. Please give Debian Edu/Skolelinux a try, it should just work. <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:-)</phrase></textobject></inlinemediaobject>  
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be sure to read the <link linkend="GettingStarted">getting started</link> chapter of this manual, though, as it explains how to log in for the first time. 
 </para>
-<para>Even more information about the Debian Squeeze release is available in its <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink>. 
+<para>Even more information about the Debian Wheezy release is available in its <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink>. 
 </para>
 </section>
 
-<section id="Installation--Download_the_installation_media_for_Debian_Edu_6.0.6.2B-r1_Codename_.22Squeeze.22">
-<title>Download the installation media for Debian Edu 6.0.6+r1 Codename "Squeeze"
+<section id="Installation--Download_the_installation_media_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22">
+<title>Download the installation media for Debian Edu 7.0.0+r0 Codename "Wheezy"
 </title>
 
 <section id="Installation--DVD_for_i386.2C_amd64">
@@ -429,12 +430,15 @@
 </title>
 <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: these download URLs need to be adapted for wheezy still... They currently don't work 
+</para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD.iso">debian-edu-6.0.6+r1-DVD.iso</ulink> 
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso">debian-edu-7.0.0+r0-DVD.iso</ulink> 
 </para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD.iso">debian-edu-6.0.6+r1-DVD.iso</ulink> 
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso">debian-edu-7.0.0+r0-DVD.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput> 
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -444,11 +448,11 @@
 <para>The netinstall CD, which can be used for installation of i386 and amd64 as well, is available via 
 </para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-CD.iso">debian-edu-6.0.6+r1-CD.iso</ulink> 
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD.iso">debian-edu-7.0.0+r0-CD.iso</ulink> 
 </para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-CD.iso">debian-edu-6.0.6+r1-CD.iso</ulink> 
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD.iso">debian-edu-7.0.0+r0-CD.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-CD.iso debian-edu-6.0.6+r1-CD.iso</computeroutput> 
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -458,11 +462,11 @@
 <para>The sources are available via 
 </para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-source-DVD.iso">debian-edu-6.0.6+r1-source-DVD.iso</ulink> 
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso">debian-edu-7.0.0+r0-source-DVD.iso</ulink> 
 </para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-source-DVD.iso">debian-edu-6.0.6+r1-source-DVD.iso</ulink> 
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso">debian-edu-7.0.0+r0-source-DVD.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-source-DVD.iso debian-edu-6.0.6+r1-source-DVD.iso</computeroutput> 
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -483,7 +487,7 @@
 <section id="Installation--Select_type_of_installation">
 <title>Select type of installation
 </title><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>Installer boot menu</phrase></textobject></inlinemediaobject>
+<para>[attachment:01-Installer_boot_menu.png]
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para> <emphasis role="strong">Install</emphasis> is the default text mode installation on i386 and amd64.
 </para>
@@ -497,7 +501,7 @@
 </para>
 <para><emphasis role="strong">Help</emphasis> gives some hints on using the installer
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_a.png"/></imageobject><textobject><phrase>Installer advanced options screen 1</phrase></textobject></inlinemediaobject>
+<para>[attachment:Installer_advanced_options_a.png]
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para><emphasis role="strong">Back..</emphasis> brings back to the main menu.
 </para>
@@ -513,7 +517,7 @@
 </para>
 <para> <emphasis role="strong">64 bit automated install</emphasis> needs a preseed file.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_b.png"/></imageobject><textobject><phrase>Installer advanced options screen 2</phrase></textobject></inlinemediaobject>
+<para>[attachment:Installer_advanced_options_b.png]
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para><emphasis role="strong">Graphical expert install</emphasis> gives access to all available questions in graphical mode.
 </para>
@@ -527,7 +531,7 @@
 </para>
 <para> <emphasis role="strong">64 bit graphical automated install</emphasis> needs a preseed file.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_help.png"/></imageobject><textobject><phrase>Installer help screen</phrase></textobject></inlinemediaobject>
+<para>[attachment:Installer_help.png]
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para> This Help screen is self explaining and enables the <F>-keys on the keyboard for getting more detailed help on the topics described.
 </para></entry></row></tbody></tgroup></informaltable>
@@ -568,7 +572,7 @@
 <section id="Installation--The_installation_process">
 <title>The installation process
 </title>
-<para>Remember the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/Requirements">system requirements</ulink> and make sure you have at least two network cards (NICs) if you plan on setting up a thin client server. 
+<para>Remember the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Requirements">system requirements</ulink> and make sure you have at least two network cards (NICs) if you plan on setting up a thin client server. 
 </para>
 <itemizedlist>
 <listitem>
@@ -651,9 +655,9 @@
 <title>A note on DVD installs
 </title>
 <para>After you install from a DVD, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from the DVD. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed: 
-</para><screen><![CDATA[deb http://ftp.debian.org/debian/ squeeze main 
-deb http://security.debian.org/ squeeze/updates main 
-deb http://ftp.skolelinux.org/skolelinux squeeze local]]></screen>
+</para><screen><![CDATA[deb http://ftp.debian.org/debian/ wheezy main 
+deb http://security.debian.org/ wheezy/updates main 
+deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 <para>The DVD only works with KDE desktop installations.  If you want to install other desktop options, use the netinst images or PXE installation. 
 </para>
 </section>
@@ -664,7 +668,7 @@ deb http://ftp.skolelinux.org/skolelinux squeeze local]]></screen>
 <para>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 profile: 
 </para>
 <para>
-FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny. 
+FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny. 
 </para>
 <itemizedlist>
 <listitem>
@@ -690,15 +694,6 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Installation--A_note_on_some_RAID_controllers">
-<title>A note on some RAID controllers
-</title>
-<para>When using a USB drive to add missing firmware during install, with some RAID-controllers GRUB is installed to the USB drive. So a reboot after installation results in a GRUB error. A workaround for this problem is to remove the USB drive after the firmware is loaded, and preferably before partitioning starts.     
-</para>
-<para>More information is available in <ulink url="http://bugs.skolelinux.org/show_bug.cgi?id=1395">Debian-Edu bug #1395</ulink> and Debian bug <ulink url="http://bugs.debian.org/516280#">516280</ulink>. 
-</para>
-</section>
-
 <section id="Installation--A_note_on_thin-client-server_installations">
 <title>A note on thin-client-server installations
 </title>
@@ -731,11 +726,11 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> profile only: 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/pxe-tjener.png"/></imageobject><textobject><phrase>pxe-tjener.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:pxe-tjener.png] 
 </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: 
 </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>[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png] 
 </para>
 <para>This setup also allows diskless workstations and thin clients to be booted on the main network. Diskless workstations must be added with GOsa² just like normal workstations or thin client servers. 
 </para>
@@ -751,7 +746,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para><screen><![CDATA[d-i    pkgsel/include string my-extra-package(s)]]></screen>
 <para>The PXE installation uses <computeroutput>/var/lib/tftpboot/debian-edu/install.cfg</computeroutput> and the preseeding file in <computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput>. These files can be changed to adjust the preseeding used during installation, to avoid more questions when installing over the net. Another way to achieve this is to provide extra settings in <computeroutput>/etc/debian-edu/pxeinstall.conf</computeroutput> and <computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</computeroutput> and to run <computeroutput>/usr/sbin/debian-edu-pxeinstall</computeroutput> to update the generated files.  
 </para>
-<para>Further information can be found in the <ulink url="http://www.debian.org/releases/squeeze/installmanual">manual of the Debian Installer</ulink>. 
+<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>
@@ -777,67 +772,70 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </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><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_boot_menu.png</phrase></textobject></inlinemediaobject> 
+<para>
+FIXME: these screenshots need to be redone once we have wheezy artwork 
+</para>
+<para>[attachment:01-Installer_boot_menu.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/02-select_a_language.png"/></imageobject><textobject><phrase>02-select_a_language.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:02-select_a_language.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/03-select_your_location.png"/></imageobject><textobject><phrase>03-select_your_location.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:03-select_your_location.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/04-Configure_the_keyboard.png"/></imageobject><textobject><phrase>04-Configure_the_keyboard.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:04-Configure_the_keyboard.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/05-Detect_and_mount_CD-ROM.png"/></imageobject><textobject><phrase>05-Detect_and_mount_CD-ROM.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:05-Detect_and_mount_CD-ROM.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/06-Load_installer_components_from_CD.png"/></imageobject><textobject><phrase>06-Load_installer_components_from_CD.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:06-Load_installer_components_from_CD.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/07-Detect_network_hardware.png"/></imageobject><textobject><phrase>07-Detect_network_hardware.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:07-Detect_network_hardware.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/08-Choose_Debian_Edu_profile.png"/></imageobject><textobject><phrase>08-Choose_Debian_Edu_profile.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:08-Choose_Debian_Edu_profile.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/09-Really_use_the_automatic_partitioning_tool.png"/></imageobject><textobject><phrase>09-Really_use_the_automatic_partitioning_tool.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:09-Really_use_the_automatic_partitioning_tool.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"/></imageobject><textobject><phrase>10-Really_use_the_automatic_partitioning_tool-Yes.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/11-Participate_in_the_package_usage_survey.png"/></imageobject><textobject><phrase>11-Participate_in_the_package_usage_survey.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:11-Participate_in_the_package_usage_survey.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/12-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:12-Set_up_users_and_passwords.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/12a-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12a-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:12a-Set_up_users_and_passwords.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/12b-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12b-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:12b-Set_up_users_and_passwords.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/12c-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12c-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:12c-Set_up_users_and_passwords.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/13-Install+the+base+system.png"/></imageobject><textobject><phrase>13-Install the base system.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:13-Install the base system.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/14-Select_and_install_software.png"/></imageobject><textobject><phrase>14-Select_and_install_software.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:14-Select_and_install_software.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/17-Select_and_install_software.png"/></imageobject><textobject><phrase>17-Select_and_install_software.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:17-Select_and_install_software.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/18-Build+LTSP+chroot.png"/></imageobject><textobject><phrase>18-Build LTSP chroot.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:18-Build LTSP chroot.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"/></imageobject><textobject><phrase>19-Install_the_GRUB_boot_loader_on_a_hard_disk.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/20-Finish_the_Installation.png"/></imageobject><textobject><phrase>20-Finish_the_Installation.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:20-Finish_the_Installation.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/21-Finish_the_Installation-Installation_complete.png"/></imageobject><textobject><phrase>21-Finish_the_Installation-Installation_complete.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:21-Finish_the_Installation-Installation_complete.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/22-Tjener_GRUB_boot_menu.png"/></imageobject><textobject><phrase>22-Tjener_GRUB_boot_menu.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:22-Tjener_GRUB_boot_menu.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/23-Tjener-KDM_Login.png"/></imageobject><textobject><phrase>23-Tjener-KDM_Login.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:23-Tjener-KDM_Login.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/24-Tjener-KDE_Start.png"/></imageobject><textobject><phrase>24-Tjener-KDE_Start.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:24-Tjener-KDE_Start.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/26-Tjener-KDE_Desktop_Browser.png"/></imageobject><textobject><phrase>26-Tjener-KDE_Desktop_Browser.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:26-Tjener-KDE_Desktop_Browser.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-KDE_Desktop.png"/></imageobject><textobject><phrase>27-Tjener-KDE_Desktop.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:27-Tjener-KDE_Desktop.png] 
 </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>[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/29-Diskless-WS-KDM_Login.png"/></imageobject><textobject><phrase>29-Diskless-WS-KDM_Login.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:29-Diskless-WS-KDM_Login.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/30-ThinClient-LDM_Login.png"/></imageobject><textobject><phrase>30-ThinClient-LDM_Login.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:30-ThinClient-LDM_Login.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/31-ThinClient-KDE_Desktop.png"/></imageobject><textobject><phrase>31-ThinClient-KDE_Desktop.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:31-ThinClient-KDE_Desktop.png] 
 </para>
 </section>
 </section>
@@ -866,7 +864,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <para>The <link linkend="HowTo">HowTo</link> chapter covers more tips and tricks and some frequently asked questions. 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/getting-started-desktop.png"/></imageobject><textobject><phrase>Debian Edu desktop</phrase></textobject></inlinemediaobject> 
+<para>[attachment:getting-started-desktop.png] 
 </para>
 
 <section id="GettingStarted--Services_running_on_the_main_server">
@@ -907,7 +905,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <itemizedlist>
 <listitem>
-<para>If you are using a new Debian Edu Squeeze machine, the site certificate will be known by the browser. 
+<para>If you are using a new Debian Edu Wheezy machine, the site certificate will be known by the browser. 
 </para></listitem>
 <listitem>
 <para>Otherwise, you will get an error message about the SSL certificate being wrong. If you know you are alone on your network, just tell the browser to accept it and ignore that. 
@@ -918,7 +916,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 <section id="GettingStarted--GOsa.2BALI-_Login_plus_Overview">
 <title>GOsa² Login plus Overview
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa2_overview.png"/></imageobject><textobject><phrase>GOsa² overview page after login as the first  user</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa2_overview.png] 
 </para>
 <para>After logging in to GOsa² you will see the overview page of GOsa². 
 </para>
@@ -965,33 +963,20 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <para>If all went well, you can now see the new user in the user list table. You should now be able to log in with that username on any Skolelinux machine within your network. 
 </para>
-<para><emphasis role="strong">Please note:</emphasis> If Squeeze/r0 was used to install the main server, all user passwords exept that one for the first user will expire in only 2 days.  To fix this, please execute the following script in a terminal.  This script is included in r1. 
-</para><screen><![CDATA[  #!/bin/bash
-  #
-  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0
-  #
-  # Fix password expiring after 2 days (#664596) incorrectly introduced
-  # in Debian Edu Squeeze up to r0; for new users the password will
-  # never expire. For existing users this will be the case after they've
-  # changed their password. Give old users the chance to change the
-  # password, exclude not affected accounts: templates and first user.
-  #
-  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do
-    kadmin.local -q "modprinc -pwexpire 7000days $i"
-  done
-  kadmin.local -q "modpol -maxlife 0secs users"]]></screen>
 </section>
 
 <section id="GettingStarted--Search.2C_modify_and_delete_users">
 <title>Search, modify and delete users
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/filterbox.png"/></imageobject><textobject><phrase>Filterbox</phrase></textobject></inlinemediaobject> 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". 
+<para>[attachment:filterbox.png] 
+</para>
+<para>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". 
 </para>
 <para>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. 
 </para>
 <para>A new page will show up where you can directly modify information about the user, change the password of the user and modify the list of groups the user belongs to. 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/edit_user.png"/></imageobject><textobject><phrase>Editing user data</phrase></textobject></inlinemediaobject> 
+<para>[attachment:edit_user.png] 
 </para>
 </section>
 
@@ -1013,7 +998,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 <listitem>
 <para>on the page subsequently presented you can set a new password chosen by yourself 
 </para></listitem></orderedlist>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/change_password_administratively.png"/></imageobject><textobject><phrase>Set user password</phrase></textobject></inlinemediaobject> 
+<para>[attachment:change_password_administratively.png] 
 </para>
 <para><emphasis role="strong">Beware of security implications due to easy to guess passwords!</emphasis> 
 </para>
@@ -1064,9 +1049,9 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 <section id="GettingStarted--Group_Management_with_GOsa.2BALI-">
 <title>Group Management with GOsa²
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/create_group.png"/></imageobject><textobject><phrase>create group</phrase></textobject></inlinemediaobject> 
+<para>[attachment:create_group.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/list_groups.png"/></imageobject><textobject><phrase>create group</phrase></textobject></inlinemediaobject> 
+<para>[attachment:list_groups.png] 
 </para>
 <para>The management of groups is very similar to the management of users.  
 </para>
@@ -1103,7 +1088,7 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
 </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². 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><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a
-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.
+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.
 info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.
 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.
 
@@ -1111,13 +1096,13 @@ Enter password if you want to activate these changes, and ^c to abort.
 
 Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
 enter password: █]]></screen>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_list.png"/></imageobject><textobject><phrase>GOsa² systems listing</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa_systems_list.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_host_details.png"/></imageobject><textobject><phrase>Host details</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa_systems_host_details.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_edit_host.png"/></imageobject><textobject><phrase>Modify host</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa_systems_edit_host.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_add_netgroup.png"/></imageobject><textobject><phrase>Add netgroup</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa_systems_add_netgroup.png] 
 </para>
 <para>A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</computeroutput> can be used to trigger the update manually.  
 </para>
@@ -1284,7 +1269,7 @@ enter password: █]]></screen>
 </para>
 <para>If you want to get rid of older backups, choose "Maintenance" in the menu on the backup page and select the oldest snapshot to keep: 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/slbackup-php_maintenance.png"/></imageobject><textobject><phrase>slbackup-php Maintenance</phrase></textobject></inlinemediaobject> 
+<para>[attachment:slbackup-php_maintenance.png] 
 </para>
 </section>
 
@@ -1405,17 +1390,17 @@ enter password: █]]></screen>
 </section>
 </section>
 
-<section id="Upgrades--Upgrades_from_Debian_Edu_Lenny">
-<title>Upgrades from Debian Edu Lenny
+<section id="Upgrades--Upgrades_from_Debian_Edu_Squeeze">
+<title>Upgrades from Debian Edu Squeeze
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be prepared: make sure you have tested the upgrade from Lenny in a test environment or have backups ready to be able to go back.  
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be prepared: make sure you have tested the upgrade from Squeeze in a test environment or have backups ready to be able to go back.  
 </para>
 
 <section id="Upgrades--The_basic_upgrade_operation">
 <title>The basic upgrade operation
 </title><orderedlist numeration="arabic">
 <listitem>
-<para>Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all occurrences of "lenny" with "squeeze". 
+<para>Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all occurrences of "squeeze" with "wheezy". 
 </para></listitem>
 <listitem>
 <para>run <computeroutput>apt-get update</computeroutput> 
@@ -1431,6 +1416,9 @@ enter password: █]]></screen>
 <section id="Upgrades--LDAP_service_needs_to_be_reconfigured">
 <title>LDAP service needs to be reconfigured
 </title>
+<para>
+FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed 
+</para>
 <para>The LDAP setup has changed a lot from Lenny to Squeeze. The way users accounts, passwords, network settings, services and machines are treated is quite different now. So LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that could be used to achieve this. Read the comment at the beginning of that script carefully before doing anything.       
 </para>
 </section>
@@ -1438,7 +1426,7 @@ enter password: █]]></screen>
 <section id="Upgrades--Recreating_an_LTSP_chroot">
 <title>Recreating an LTSP chroot
 </title>
-<para>On the LTSP server(s) the LTSP chroot should be recreated. The new chroot will automatically support both thin-clients and diskless workstations. 
+<para>On the LTSP server(s) the LTSP chroot should be recreated. The new chroot will still  support both thin-clients and diskless workstations. 
 </para>
 <para>Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or <computeroutput>/opt/ltsp/amd64</computeroutput>, depending on your setup). If you have enough diskspace, consider backing it up.  
 </para>
@@ -1449,10 +1437,10 @@ enter password: █]]></screen>
 </section>
 </section>
 
-<section id="Upgrades--Upgrades_from_older_Debian_Edu_.2BAC8_Skolelinux_installations_.28before_Lenny.29">
-<title>Upgrades from older Debian Edu / Skolelinux installations (before Lenny)
+<section id="Upgrades--Upgrades_from_older_Debian_Edu_.2BAC8_Skolelinux_installations_.28before_Squeeze.29">
+<title>Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)
 </title>
-<para>To upgrade from any older release, you will need to upgrade to the Lenny-based Debian Edu release first, before you can follow the instructions provided above. Instructions are given in the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Lenny#">Manual for Debian Edu Lenny</ulink> about how to upgrade to Lenny from the previous release, Etch, and the Etch manual covers the one before that! 
+<para>To upgrade from any older release, you will need to upgrade to the Squeeze-based Debian Edu release first, before you can follow the instructions provided above. Instructions are given in the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze#">Manual for Debian Edu Squeeze</ulink> about how to upgrade to Squeeze from the previous release, Lenny, and the Lenny manual covers the one before that! (Etch was it's name.) 
 </para>
 </section>
 
@@ -1602,7 +1590,7 @@ resize2fs /dev/vg_system/skole+tjener+home0]]></screen>
 <para>Backports are recompiled packages from Debian testing (mostly) and Debian unstable (in a few cases only, e.g. security updates), so they will run without new libraries (wherever this is possible) on a stable Debian distribution like Debian Edu. <emphasis role="strong">We recommend you to pick out individual backports which fit your needs, and not to use all backports available there.</emphasis>  
 </para>
 <para>Using backports.debian.org is simple: 
-</para><screen><![CDATA[echo "deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free" >> /etc/apt/sources.list
+</para><screen><![CDATA[echo "deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free" >> /etc/apt/sources.list
 apt-get update]]></screen>
 <para>Previously, extra configuration was needed to get updates installed automatically for installed backports, but since 2011 the <ulink url="http://backports.debian.org/news/squeeze-backports_and_lenny-backports-sloppy_started/">squeeze-backports suite</ulink> renders this unnecessary. 
 </para>
@@ -1611,7 +1599,7 @@ apt-get update]]></screen>
 <section id="Administration--Upgrading_with_a_CD_or_DVD_ROM">
 <title>Upgrading with a CD or DVD ROM
 </title>
-<para>If you want to upgrade from one version to another (for example from Squeeze 6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical media, follow these steps: 
+<para>If you want to upgrade from one version to another (for example from Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical media, follow these steps: 
 </para>
 <para>Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command: 
 </para><screen><![CDATA[mount /media/cdrom
@@ -1876,7 +1864,7 @@ gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907
 # check securely if the key is correct and add it to the keyring used by APT if it is:
 gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -
 # add repository to sources.list - please check the homepages for mirrors!
-echo "deb http://deb-multimedia.org squeeze main" >> /etc/apt/sources.list
+echo "deb http://deb-multimedia.org wheezy main" >> /etc/apt/sources.list
 # update the list of available packages:
 apt-get update]]></screen>
 </section>
@@ -2207,7 +2195,7 @@ exit]]></screen>
 </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 Squeeze Samba Howto</link>. 
+<para>Allowing a Windows client to join the domain requires 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>
@@ -2474,7 +2462,7 @@ logon home = ""]]></screen>
 <section id="Samba">
 <title>Samba in Debian Edu
 </title>
-<para>Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-style domain controller with Windows XP, Windows Vista and Windows 7 as clients. After a machine has joined the domain, this machine can be fully managed with GOsa². 
+<para>Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-style domain controller with Windows XP, Windows Vista and Windows 7 as clients. After a machine has joined the domain, this machine can be fully managed with GOsa². 
 </para>
 
 <section id="Samba--Getting_Started">
@@ -2814,7 +2802,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 <para>This document needs your help! First and foremost, it is not finished yet: if you read it, you will notice various 
 FIXMEs within the text. If you happen to know (a bit of) what needs to be explained there, please consider sharing your knowledge with us.  
 </para>
-<para>The source of the text is a wiki and can be edited with a simple webbrowser. Just go to  <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"/> and you can contribute easily. Note: a user account is needed to edit the pages; you need to <ulink url="http://wiki.debian.org/UserPreferences">create a wiki user</ulink> first. 
+<para>The source of the text is a wiki and can be edited with a simple webbrowser. Just go to  <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Wheezy/"/> and you can contribute easily. Note: a user account is needed to edit the pages; you need to <ulink url="http://wiki.debian.org/UserPreferences">create a wiki user</ulink> first. 
 </para>
 <para>Another very good way to contribute and to help users is by translating software and documentation. Information on how to translate this document can be found in the <link linkend="Translations">translations chapter</link> of this book. Please consider helping the translation effort of this book! 
 </para>
@@ -2902,86 +2890,14 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </section>
 
 <section id="Features">
-<title>New features in Debian Edu Squeeze
+<title>New features in Debian Edu Wheezy
 </title>
-
-<section id="Features--Changes_for_Debian_Edu_6.0.6.2B-r1_Codename_.22Squeeze.22_.2AUN.2Areleased_as_of_2013-0.3F-.3F.3F">
-<title>Changes for Debian Edu 6.0.6+r1 Codename "Squeeze" *UN*released as of 2013-0?-??
-</title>
-<itemizedlist>
-<listitem>
-<para>sitesummary was updated from 0.1.3 to 0.1.8 
-</para>
-<itemizedlist>
-<listitem>
-<para>Make Nagios configuration more robust and efficient 
-</para></listitem>
-<listitem>
-<para>Comply with 3.X kernel 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0 
-</para>
-<itemizedlist>
-<listitem>
-<para>Minor updates from the wiki 
-</para></listitem>
-<listitem>
-<para>Danish translation now complete 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>debian-edu-config from 1.453 to 1.454 
-</para>
-<itemizedlist>
-<listitem>
-<para>Correct Kerberos user policy: don't expire password after 2 days. Closes: #664596 
-</para></listitem>
-<listitem>
-<para>Handle '#' characters in the root or first users password. Closes: #664976 
-</para></listitem>
-<listitem>
-<para>Fixes for gosa-sync: 
-</para>
-<itemizedlist>
-<listitem>
-<para>Don't fail if password contains " 
-</para></listitem>
-<listitem>
-<para>Don't disclose new password string in syslog 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>Fixes for gosa-create: 
-</para>
-<itemizedlist>
-<listitem>
-<para>Invalidate libnss cache before applying changes 
-</para></listitem>
-<listitem>
-<para>Multiple failures during mass user import into GOsa² 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>gosa-netgroups plugin: don't erase entries of attribute type "memberNisNetgroup". Closes: #687256 
-</para></listitem>
-<listitem>
-<para>First user now uses the same Kerberos policy as all other users 
-</para></listitem>
-<listitem>
-<para>Add Danish web page 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>debian-edu-install from 1.528 to 1.529 
-</para>
-<itemizedlist>
-<listitem>
-<para>Improve preseeding support and documentation 
-</para></listitem></itemizedlist></listitem></itemizedlist>
 <para>
 FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead. 
 </para>
-</section>
 
-<section id="Features--New_features_for_Debian_Edu_6.0.4.2B-r0_Codename_.22Squeeze.22_released_2012-03-11">
-<title>New features for Debian Edu 6.0.4+r0 Codename "Squeeze" released 2012-03-11
+<section id="Features--New_features_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22_released_2013-.3F.3F-.3F.3F">
+<title>New features for Debian Edu 7.0.0+r0 Codename "Wheezy" released 2013-??-??
 </title>
 
 <section id="Features--User_visible_changes">
@@ -2990,38 +2906,10 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 <itemizedlist>
 <listitem>
 <para>Updated artwork and new Debian Edu / Skolelinux logo, visible during installation, in the login screen and as desktop wallpaper. 
-</para></listitem>
-<listitem>
-<para>Replace LWAT with GOsa² as the LDAP administration interface. See below and the <link linkend="GettingStarted">Getting started chapter</link> of the manual for more information on GOsa². 
-</para></listitem>
-<listitem>
-<para>See below for a list of updated software. 
-</para></listitem>
-<listitem>
-<para>Show welcome page to users when they first log in. This default start page for Iceweasel is fetched from LDAP at installation and boot time for networked profiles. Set to <ulink url="http://www.skolelinux.org/"/> for Standalone installations.  
-</para></listitem>
-<listitem>
-<para>New LXDE desktop option, in addition to KDE (default) and Gnome. As the Gnome option, the LXDE desktop option is only supported by the CD installation method. 
-</para></listitem>
-<listitem>
-<para>Speed up LTSP client boot. 
-</para></listitem>
-<listitem>
-<para>Provide a KDE menu entry for changing the password in GOsa².  
-</para>
-<itemizedlist>
-<listitem>
-<para>For more information on how to change passwords (including expired passwords at the KDM/GDM login prompt), please see the <link linkend="Users">HowTos for users</link> chapter of the manual. 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>Add link to <ulink url="http://linuxsignpost.org/"/> on the start page shown to new users. 
-</para></listitem>
-<listitem>
-<para>All LTSP servers are also <link linkend="NetworkClients--Remote_Desktop_Service">RDP servers</link> by default. 
-</para></listitem>
-<listitem>
-<para>Improve handing of removable media on thin clients. Show desktop notification longer when inserting new media and provide an option to start dolphin when such media is inserted.  
 </para></listitem></itemizedlist>
+<para>
+FIXME: hopefully. h01ger is one it to ask gismo. 
+</para>
 </section>
 
 <section id="Features--Installation_changes">
@@ -3029,31 +2917,7 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para>New version of debian-installer from Debian Squeeze, see <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink> for more details. 
-</para></listitem>
-<listitem>
-<para>Since root logins are no longer allowed when using gdm/kdm, a user in LDAP is set up during installation of the Main Server. This user is up as GOsa² administrator and is also granted sudo access. The Debian Edu menu reordering has been enabled as well, by adding the user also to the <computeroutput>teachers</computeroutput> group. 
-</para></listitem>
-<listitem>
-<para>The <computeroutput>.iso</computeroutput> images can directly be copied onto USB sticks, for example by using <computeroutput>dd</computeroutput> or even <computeroutput>cat</computeroutput>.. 
-</para></listitem>
-<listitem>
-<para>New roaming workstation profile for laptops. 
-</para></listitem>
-<listitem>
-<para>Device access for all users is handled by <ulink url="http://wiki.debian.org/PolicyKit#">PolicyKit</ulink>, and no extra group memberships are needed to get access to devices. 
-</para></listitem>
-<listitem>
-<para>A warning will be issued when installing on too small disks for the selected profile. 
-</para></listitem>
-<listitem>
-<para>Simplify partitioning for Standalone installs to only have a separate /home/ but no seperate /usr anymore.  
-</para></listitem>
-<listitem>
-<para>More tests in the test suite, and correct some of the tests that failed earlier.  
-</para></listitem>
-<listitem>
-<para>Make sure to report an error and abort the installation when trying to use the netinst images without a working Internet connection, instead of silently installing a broken system.  
+<para>New version of debian-installer from Debian Wheezy, see <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink> for more details. 
 </para></listitem></itemizedlist>
 </section>
 
@@ -3062,45 +2926,42 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para>Everything which is new in Debian Squeeze: 
+<para>Everything which is new in Debian Wheezy: 
 </para>
 <itemizedlist>
 <listitem>
-<para>compatibility with the FHS v2.3 and software developed for version 3.2 of the LSB. 
-</para></listitem>
-<listitem>
-<para>Linux kernel 2.6.32 
+<para>Linux kernel 3.2.x 
 </para></listitem>
 <listitem>
-<para>Desktop environments KDE "Plasma" 4.4 and GNOME 2.30 
+<para>Desktop environments KDE "Plasma" 4.8.4 and GNOME 3.4 
 </para></listitem>
 <listitem>
-<para>Web browser Iceweasel 3.5 
+<para>Web browser Iceweasel 10 ESR 
 </para></listitem>
 <listitem>
-<para>OpenOffice.org 3.2.1 
+<para>LibreOffice 3.5.4 
 </para></listitem>
 <listitem>
-<para>Educational toolbox GCompris 9.3 
+<para>Educational toolbox GCompris 12.01 
 </para></listitem>
 <listitem>
-<para>Music creator Rosegarden 10.04.2 
+<para>Music creator Rosegarden 12.04 
 </para></listitem>
 <listitem>
-<para>Image editor Gimp 2.6.10 
+<para>Image editor Gimp 2.8.2 
 </para></listitem>
 <listitem>
-<para>Virtual universe Celestia 1.6.0 
+<para>Virtual universe Celestia 1.6.1 
 </para></listitem>
 <listitem>
-<para>Virtual stargazer Stellarium 0.10.4 
+<para>Virtual stargazer Stellarium 0.11.3 
 </para></listitem>
 <listitem>
-<para>Debian Squeeze includes over 10,000 new packages available for installation, including the browser Chromium 
+<para>Debian Wheezy includes over 10,000 new packages available for installation, including the Chromium browser 
 </para></listitem></itemizedlist>
 <itemizedlist>
 <listitem>
-<para>More information about Debian Squeeze 6.0 is provided in the <ulink url="http://www.debian.org/releases/squeeze/releasenotes">release notes</ulink> and the <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink>. 
+<para>More information about Debian Wheezy 7.0 is provided in the <ulink url="http://www.debian.org/releases/wheezy/releasenotes">release notes</ulink> and the <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink>. 
 </para></listitem></itemizedlist></listitem></itemizedlist>
 </section>
 
@@ -3109,42 +2970,7 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para>The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past.  
-</para>
-<itemizedlist>
-<listitem>
-<para>The dynamic DHCP range was extended on the backbone network to around 4k IP addresses, and around 200 IP addresses for the thin client network.  
-</para></listitem>
-<listitem>
-<para>The DHCP network for 10.0.0.0/8 has been renamed from <computeroutput>barebone</computeroutput> to <computeroutput>intern</computeroutput> 
-</para></listitem>
-<listitem>
-<para>There are no pre-defined host entries for client systems in DNS anymore (staticXX, ..., dhcpYY...) 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>MIT Kerberos5 used for user authentication, enabled for: 
-</para>
-<itemizedlist>
-<listitem>
-<para>PAM 
-</para></listitem>
-<listitem>
-<para>IMAP 
-</para></listitem>
-<listitem>
-<para>SMTP 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>NFSv4, but without added Kerberos privacy/integrity/authentication.  The machines still have to be added to the <computeroutput>workstation</computeroutput> netgroup to be able to mount the home directories 
-</para></listitem>
-<listitem>
-<para>Full Samba NT4 domain support for Windows XP/Vista/7 
-</para></listitem>
-<listitem>
-<para>A complete PXE boot environment is setup when installing from the DVD, so that further installations can be done using PXE network installs only. A new script pxe-addfirmware is provided to support more hardware models needing firmware.  
-</para></listitem>
-<listitem>
-<para>Remove all hard coded settings on workstations, and configure workstations and roaming workstations using settings detected from the environment using DNS,  DHCP and LDAP.  See this <ulink url="http://people.skolelinux.org/pere/blog/No_hardcoded_config_on_Debian_Edu_clients.html">blog post with more information on the changes</ulink>. 
+<para>to be documented, if any 
 </para></listitem></itemizedlist>
 </section>
 
@@ -3153,24 +2979,12 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para>Translation updates for the templates used in the installer. These templates are now available in 28 languages. 
-</para></listitem>
-<listitem>
-<para>The Debian Edu Squeeze Manual has generally been cleaned up and improved. A proof-read with corrections was done by a native English linguist. 
-</para></listitem>
-<listitem>
-<para>The Debian Edu Squeeze Manual is fully translated to German, French and Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal and Spanish. 
+<para>Translation updates for the templates used in the installer. These templates are now available in 
+FIXME languages. 
 </para></listitem>
 <listitem>
-<para>Improvements to many language tasks, especially French and Danish. 
-</para></listitem>
-<listitem>
-<para>Improvements to the welcome web page shown at first logins.  
-</para>
-<itemizedlist>
-<listitem>
-<para>Add new Japanese, Portuguese and Catalan translations of the welcome web page. 
-</para></listitem></itemizedlist></listitem></itemizedlist>
+<para>The Debian Edu Wheezy Manual is fully translated to German, French, Italian and Danish. Partly translated versions exist for Norwegian Bokmal and Spanish. 
+</para></listitem></itemizedlist>
 </section>
 
 <section id="Features--Regressions">
@@ -3178,135 +2992,25 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para><ulink url="http://lists.debian.org/20100810061204.GD7929@login2.uio.no">CD and DVD installs are different</ulink> - the DVD is only suitable for installing a KDE environemnt. 
-</para></listitem>
-<listitem>
-<para>Drop support for <computeroutput>powerpc</computeroutput> architecture from netinst installation CDs. It is still possible to run Debian Edu on <computeroutput>powerpc</computeroutput>, but installation is less automated. 
-</para></listitem>
-<listitem>
-<para>Drop gtick in the default installation, because it doesn't work on thin clients (BTS #566335). 
+<para>to be documented, if any 
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Features--New_administration_tool:_GOsa.2BALI-">
-<title>New administration tool: GOsa²
+<section id="Features--Other_LDAP_related_changes">
+<title>Other LDAP related changes
 </title>
 <itemizedlist>
 <listitem>
-<para>gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, with: 
-</para>
-<itemizedlist>
-<listitem>
-<para>Fix DHCP host removal. Closes: #650258 
-</para></listitem>
-<listitem>
-<para>Backport user generator unicode character transliteration. Closes: #657086 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>Customized GOsa² configuration to better suit the Debian Edu network architecture. 
-</para>
-<itemizedlist>
-<listitem>
-<para>GOsa² updates DNS and NFS exports immediately when a system is updated in LDAP, making diskless workstations work right after they are added to the required netgroup.  
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>Provide script sitesummary2ldapdhcp to update or populate GOsa² with system objects using information gathered by sitesummary, to make it easier to add new computers to the network.  
+<para>to be documented, if any 
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Features--More_software_changes">
-<title>More software changes
+<section id="Features--Other_changes">
+<title>Other changes
 </title>
 <itemizedlist>
 <listitem>
-<para>Add video editor Kdenlive 0.7.7  and interactive geometry tool Geogebra 3.2.42 
-</para></listitem>
-<listitem>
-<para>Change default package manager from adept to synaptic, to avoid getting two graphical package managers installed by default. 
-</para></listitem>
-<listitem>
-<para>Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in KDE. 
-</para></listitem>
-<listitem>
-<para>Change video player setup to install different players in KDE (dragonplayer), Gnome (totem) and LXDE (totem). 
-</para></listitem>
-<listitem>
-<para>Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the default KDE installation. 
-</para></listitem>
-<listitem>
-<para>Replace network-manager-kde with plasma-widget-networkmanagement in the standalone KDE profile 
-</para></listitem>
-<listitem>
-<para>Install usb-modeswitch on laptops to handle dual mode USB devices. 
-</para></listitem>
-<listitem>
-<para>Add cifs-utils to the default installation to ensure SMB mounting can work in any profile. 
-</para></listitem>
-<listitem>
-<para>Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, and valgrind from the default installation and the DVD to make room for higher priority packages. 
-</para></listitem>
-<listitem>
-<para>Drop libnss-mdns from stationary profiles, to make sure DNS is the authoritive source of host names. 
-</para></listitem>
-<listitem>
-<para><computeroutput>freerdp-x11</computeroutput> is installed by default as RDP and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was installed instead.) 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Features--Other_LDAP_related_changes">
-<title>Other LDAP related changes
-</title>
-<itemizedlist>
-<listitem>
-<para>Make the LDAP server handle more clients after increasing the server's file descriptor limit from 1024 to 32768.  
-</para></listitem>
-<listitem>
-<para>Add code to re-enable stopped CUPS queues every hour on the Main Server, and flush all CUPS queues every night. Both can be disabled in LDAP.  
-</para></listitem>
-<listitem>
-<para>Provide network blocking / exam mode by default, controlled by LDAP. In addition to network blocking, changes to the Squid proxy configuration is needed.  
-</para></listitem>
-<listitem>
-<para>Enable automatic extending of full file systems on the Main Server by default. This can be disabled in LDAP.  
-</para></listitem>
-<listitem>
-<para>Change SSL certificate name used by the LDAP server and adjust clients to use the new name to be able to enable certificate checking on clients. 
-</para></listitem>
-<listitem>
-<para>Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP setup used for DNS. 
-</para></listitem>
-<listitem>
-<para>Simplify autofs LDAP rules to make sure they work with extra home directory partitions exported from the main-server without any changes. 
-</para></listitem>
-<listitem>
-<para>Make backup system more robust in handling LDAP database dump and restart. 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Features--Other_changes">
-<title>Other changes
-</title>
-<itemizedlist>
-<listitem>
-<para>Root logins are denied for both KDM and GDM - see above and <link linkend="GettingStarted">Getting started</link> for details.  
-</para></listitem>
-<listitem>
-<para>Clients set up to shut down at night will stay up for at least an hour if they are turned on manually between 16:00 and 07:00. 
-</para></listitem>
-<listitem>
-<para>Additionally use local NTP clock on the main-server to ensure clients and server sync clocks also when disconnected from the Internet.  
-</para></listitem>
-<listitem>
-<para>Access to Debian repositories is always done via a proxy on the main server - read more about the implementation details <ulink url="http://lists.debian.org/20100704221022.GC30542@login1.uio.no">using DHCP and WPAD</ulink> 
-</para></listitem>
-<listitem>
-<para>The home0 partition is mounted nosuid, to increase security.  
-</para></listitem>
-<listitem>
-<para>Change KDE/Akonadi configuration to reduce the disk footprint of every user from 144 to 24 MiB.  
-</para></listitem>
-<listitem>
-<para>New tool notify-local-users to send desktop notification to all logged in users on a machine.  Useful for thin client servers. 
+<para>to be documented, if any 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -3349,7 +3053,7 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 <section id="Translations--HowTo_translate_this_document">
 <title>HowTo translate this document
 </title>
-<para>As in many free software projects, translations of this document are kept in PO files. More information about the process can be found in <computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations</computeroutput>. The Subversion repository (see below) contains this file too. Take a look there and at the <ulink url="http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#">language specific conventions</ulink> if you want to help translating this document.   
+<para>As in many free software projects, translations of this document are kept in PO files. More information about the process can be found in <computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-translations</computeroutput>. The Subversion repository (see below) contains this file too. Take a look there and at the <ulink url="http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#">language specific conventions</ulink> if you want to help translating this document.   
 </para>
 <para>To commit your translations you need to be a member of the Alioth project <computeroutput>debian-edu</computeroutput>. To translate, you just need to check out some files from from Subversion (which can be done anonymously) and create patches. Please file a bug against the debian-edu-doc package and attach the PO file to the <ulink url="http://bugs.debian.org/debian-edu-doc">bugreport</ulink>. You can find some <ulink url="http://bugs.debian.org">instructions on how to submit bugs</ulink> here. 
 </para>
@@ -3358,7 +3062,7 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 <itemizedlist><listitem override="none">
 <para><computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc</computeroutput> 
 </para></listitem></itemizedlist>
-<para>Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language code). There are many tools for translating available; we suggest using <computeroutput>lokalize</computeroutput>. 
+<para>Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language code). There are many tools for translating available; we suggest using <computeroutput>lokalize</computeroutput>. 
 </para>
 <para>Then you either commit the file directly to Subversion (if you have the rights to do so) or send the file to the bugreport. 
 </para>
@@ -3367,7 +3071,7 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 <itemizedlist><listitem override="none">
 <para><computeroutput>svn up</computeroutput> 
 </para></listitem></itemizedlist>
-<para>Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations. 
+<para>Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations. 
 </para>
 <para>Please keep in mind that this manual is still under development, so don't translate any string which contains "
 FIXME". <!-- <remark>status ignore</remark> --> 
@@ -3385,8 +3089,8 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <title>Appendix A - The GNU General Public License
 </title><screen><![CDATA[Note to translators: there is no need to translate the GPL license text. ]]></screen>
 
-<section id="AppendixA--Manual_for_Debian_Edu_6.0.6.2B-r1_Codename_.22Squeeze.22">
-<title>Manual for Debian Edu 6.0.6+r1 Codename "Squeeze"
+<section id="AppendixA--Manual_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22">
+<title>Manual for Debian Edu 7.0.0+r0 Codename "Wheezy"
 </title>
 <para>Copyright (C) 2007-2013 Holger Levsen < <ulink url="mailto:holger at layer-acht.org">holger at layer-acht.org</ulink> > and others, see the <link linkend="CopyRight">Copyright chapter</link> for the full list of copyright owners. 
 </para>
@@ -3480,9 +3184,9 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 
 <section id="AppendixB">
-<title>Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet
+<title>Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Debian Edu Live CD/DVDs for Squeeze are not available at the moment. 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Debian Edu Live CD/DVDs for Wheezy are not available at the moment. 
 </para>
 
 <section id="AppendixB--Features_of_the_Standalone_image">
@@ -3571,14 +3275,14 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </title>
 <itemizedlist>
 <listitem>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> There are no squeeze images yet <inlinemediaobject><imageobject><imagedata fileref="./images/sad.png"/></imageobject><textobject><phrase>:(</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> There are no wheezy images yet <inlinemediaobject><imageobject><imagedata fileref="./images/sad.png"/></imageobject><textobject><phrase>:(</phrase></textobject></inlinemediaobject> 
 </para></listitem></itemizedlist>
 </section>
 
 <section id="AppendixB--Download">
 <title>Download
 </title>
-<para>The image is 1.2 GiB and would be (but currently isn't) available via <ulink url="ftp://ftp.skolelinux.org/cd-squeeze-live/">FTP</ulink>, <ulink url="http://ftp.skolelinux.org/cd-squeeze-live/">HTTP</ulink> or rsync from <computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-squeeze-live/</computeroutput>. 
+<para>The image is 1.2 GiB and would be (but currently isn't) available via <ulink url="ftp://ftp.skolelinux.org/cd-wheezy-live/">FTP</ulink>, <ulink url="http://ftp.skolelinux.org/cd-wheezy-live/">HTTP</ulink> or rsync from <computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-wheezy-live/</computeroutput>. 
 </para>
 </section>
 </section>
@@ -3587,6 +3291,412 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <title>Appendix C - Features in older releases
 </title>
 
+<section id="AppendixC--Changes_for_Debian_Edu_6.0.6.2B-r1_Codename_.22Squeeze.22_.2AUN.2Areleased_2013-0.3F-.3F.3F">
+<title>Changes for Debian Edu 6.0.6+r1 Codename "Squeeze" *UN*released 2013-0?-??
+</title>
+<para>
+FIXME: this paragraph is work in progress and will be copied from DebianEdu/Documentation/Squeeze/Features once its ready 
+</para>
+<itemizedlist>
+<listitem>
+<para>sitesummary was updated from 0.1.3 to 0.1.8 
+</para>
+<itemizedlist>
+<listitem>
+<para>Make Nagios configuration more robust and efficient 
+</para></listitem>
+<listitem>
+<para>Comply with 3.X kernel 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0 
+</para>
+<itemizedlist>
+<listitem>
+<para>Minor updates from the wiki 
+</para></listitem>
+<listitem>
+<para>Danish translation now complete 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>debian-edu-config from 1.453 to 1.454 
+</para>
+<itemizedlist>
+<listitem>
+<para>Correct Kerberos user policy: don't expire password after 2 days. Closes: #664596 
+</para></listitem>
+<listitem>
+<para>Handle '#' characters in the root or first users password. Closes: #664976 
+</para></listitem>
+<listitem>
+<para>Fixes for gosa-sync: 
+</para>
+<itemizedlist>
+<listitem>
+<para>Don't fail if password contains " 
+</para></listitem>
+<listitem>
+<para>Don't disclose new password string in syslog 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Fixes for gosa-create: 
+</para>
+<itemizedlist>
+<listitem>
+<para>Invalidate libnss cache before applying changes 
+</para></listitem>
+<listitem>
+<para>Multiple failures during mass user import into GOsa² 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>gosa-netgroups plugin: don't erase entries of attribute type "memberNisNetgroup". Closes: #687256 
+</para></listitem>
+<listitem>
+<para>First user now uses the same Kerberos policy as all other users 
+</para></listitem>
+<listitem>
+<para>Add Danish web page 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>debian-edu-install from 1.528 to 1.529 
+</para>
+<itemizedlist>
+<listitem>
+<para>Improve preseeding support and documentation 
+</para></listitem></itemizedlist></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--New_features_for_Debian_Edu_6.0.4.2B-r0_Codename_.22Squeeze.22_released_2012-03-11">
+<title>New features for Debian Edu 6.0.4+r0 Codename "Squeeze" released 2012-03-11
+</title>
+
+<section id="AppendixC--User_visible_changes">
+<title>User visible changes
+</title>
+<itemizedlist>
+<listitem>
+<para>Updated artwork and new Debian Edu / Skolelinux logo, visible during installation, in the login screen and as desktop wallpaper. 
+</para></listitem>
+<listitem>
+<para>Replace LWAT with GOsa² as the LDAP administration interface. See below and the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#">Getting started chapter</ulink> of the manual for more information on GOsa². 
+</para></listitem>
+<listitem>
+<para>See below for a list of updated software. 
+</para></listitem>
+<listitem>
+<para>Show welcome page to users when they first log in. This default start page for Iceweasel is fetched from LDAP at installation and boot time for networked profiles. Set to <ulink url="http://www.skolelinux.org/"/> for Standalone installations.  
+</para></listitem>
+<listitem>
+<para>New LXDE desktop option, in addition to KDE (default) and Gnome. As the Gnome option, the LXDE desktop option is only supported by the CD installation method. 
+</para></listitem>
+<listitem>
+<para>Speed up LTSP client boot. 
+</para></listitem>
+<listitem>
+<para>Provide a KDE menu entry for changing the password in GOsa².  
+</para>
+<itemizedlist>
+<listitem>
+<para>For more information on how to change passwords (including expired passwords at the KDM/GDM login prompt), please see the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#">HowTos for users</ulink> chapter of the manual. 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Add link to <ulink url="http://linuxsignpost.org/"/> on the start page shown to new users. 
+</para></listitem>
+<listitem>
+<para>All LTSP servers are also <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service">RDP servers</ulink> by default. 
+</para></listitem>
+<listitem>
+<para>Improve handing of removable media on thin clients. Show desktop notification longer when inserting new media and provide an option to start dolphin when such media is inserted.  
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Installation_changes">
+<title>Installation changes
+</title>
+<itemizedlist>
+<listitem>
+<para>New version of debian-installer from Debian Squeeze, see <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink> for more details. 
+</para></listitem>
+<listitem>
+<para>Since root logins are no longer allowed when using gdm/kdm, a user in LDAP is set up during installation of the Main Server. This user is up as GOsa² administrator and is also granted sudo access. The Debian Edu menu reordering has been enabled as well, by adding the user also to the <computeroutput>teachers</computeroutput> group. 
+</para></listitem>
+<listitem>
+<para>The <computeroutput>.iso</computeroutput> images can directly be copied onto USB sticks, for example by using <computeroutput>dd</computeroutput> or even <computeroutput>cat</computeroutput>.. 
+</para></listitem>
+<listitem>
+<para>New roaming workstation profile for laptops. 
+</para></listitem>
+<listitem>
+<para>Device access for all users is handled by <ulink url="http://wiki.debian.org/PolicyKit#">PolicyKit</ulink>, and no extra group memberships are needed to get access to devices. 
+</para></listitem>
+<listitem>
+<para>A warning will be issued when installing on too small disks for the selected profile. 
+</para></listitem>
+<listitem>
+<para>Simplify partitioning for Standalone installs to only have a separate /home/ but no seperate /usr anymore.  
+</para></listitem>
+<listitem>
+<para>More tests in the test suite, and correct some of the tests that failed earlier.  
+</para></listitem>
+<listitem>
+<para>Make sure to report an error and abort the installation when trying to use the netinst images without a working Internet connection, instead of silently installing a broken system.  
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Software_updates">
+<title>Software updates
+</title>
+<itemizedlist>
+<listitem>
+<para>Everything which is new in Debian Squeeze: 
+</para>
+<itemizedlist>
+<listitem>
+<para>compatibility with the FHS v2.3 and software developed for version 3.2 of the LSB. 
+</para></listitem>
+<listitem>
+<para>Linux kernel 2.6.32 
+</para></listitem>
+<listitem>
+<para>Desktop environments KDE "Plasma" 4.4 and GNOME 2.30 
+</para></listitem>
+<listitem>
+<para>Web browser Iceweasel 3.5 
+</para></listitem>
+<listitem>
+<para>OpenOffice.org 3.2.1 
+</para></listitem>
+<listitem>
+<para>Educational toolbox GCompris 9.3 
+</para></listitem>
+<listitem>
+<para>Music creator Rosegarden 10.04.2 
+</para></listitem>
+<listitem>
+<para>Image editor Gimp 2.6.10 
+</para></listitem>
+<listitem>
+<para>Virtual universe Celestia 1.6.0 
+</para></listitem>
+<listitem>
+<para>Virtual stargazer Stellarium 0.10.4 
+</para></listitem>
+<listitem>
+<para>Debian Squeeze includes over 10,000 new packages available for installation, including the browser Chromium 
+</para></listitem></itemizedlist>
+<itemizedlist>
+<listitem>
+<para>More information about Debian Squeeze 6.0 is provided in the <ulink url="http://www.debian.org/releases/squeeze/releasenotes">release notes</ulink> and the <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink>. 
+</para></listitem></itemizedlist></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Infrastructural_changes">
+<title>Infrastructural changes
+</title>
+<itemizedlist>
+<listitem>
+<para>The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past.  
+</para>
+<itemizedlist>
+<listitem>
+<para>The dynamic DHCP range was extended on the backbone network to around 4k IP addresses, and around 200 IP addresses for the thin client network.  
+</para></listitem>
+<listitem>
+<para>The DHCP network for 10.0.0.0/8 has been renamed from <computeroutput>barebone</computeroutput> to <computeroutput>intern</computeroutput> 
+</para></listitem>
+<listitem>
+<para>There are no pre-defined host entries for client systems in DNS anymore (staticXX, ..., dhcpYY...) 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>MIT Kerberos5 used for user authentication, enabled for: 
+</para>
+<itemizedlist>
+<listitem>
+<para>PAM 
+</para></listitem>
+<listitem>
+<para>IMAP 
+</para></listitem>
+<listitem>
+<para>SMTP 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>NFSv4, but without added Kerberos privacy/integrity/authentication.  The machines still have to be added to the <computeroutput>workstation</computeroutput> netgroup to be able to mount the home directories 
+</para></listitem>
+<listitem>
+<para>Full Samba NT4 domain support for Windows XP/Vista/7 
+</para></listitem>
+<listitem>
+<para>A complete PXE boot environment is setup when installing from the DVD, so that further installations can be done using PXE network installs only. A new script pxe-addfirmware is provided to support more hardware models needing firmware.  
+</para></listitem>
+<listitem>
+<para>Remove all hard coded settings on workstations, and configure workstations and roaming workstations using settings detected from the environment using DNS,  DHCP and LDAP.  See this <ulink url="http://people.skolelinux.org/pere/blog/No_hardcoded_config_on_Debian_Edu_clients.html">blog post with more information on the changes</ulink>. 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Documentation_and_translation_updates">
+<title>Documentation and translation updates
+</title>
+<itemizedlist>
+<listitem>
+<para>Translation updates for the templates used in the installer. These templates are now available in 28 languages. 
+</para></listitem>
+<listitem>
+<para>The Debian Edu Squeeze Manual has generally been cleaned up and improved. A proof-read with corrections was done by a native English linguist. 
+</para></listitem>
+<listitem>
+<para>The Debian Edu Squeeze Manual is fully translated to German, French and Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal and Spanish. 
+</para></listitem>
+<listitem>
+<para>Improvements to many language tasks, especially French and Danish. 
+</para></listitem>
+<listitem>
+<para>Improvements to the welcome web page shown at first logins.  
+</para>
+<itemizedlist>
+<listitem>
+<para>Add new Japanese, Portuguese and Catalan translations of the welcome web page. 
+</para></listitem></itemizedlist></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Regressions">
+<title>Regressions
+</title>
+<itemizedlist>
+<listitem>
+<para><ulink url="http://lists.debian.org/20100810061204.GD7929@login2.uio.no">CD and DVD installs are different</ulink> - the DVD is only suitable for installing a KDE environemnt. 
+</para></listitem>
+<listitem>
+<para>Drop support for <computeroutput>powerpc</computeroutput> architecture from netinst installation CDs. It is still possible to run Debian Edu on <computeroutput>powerpc</computeroutput>, but installation is less automated. 
+</para></listitem>
+<listitem>
+<para>Drop gtick in the default installation, because it doesn't work on thin clients (BTS #566335). 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--New_administration_tool:_GOsa.2BALI-">
+<title>New administration tool: GOsa²
+</title>
+<itemizedlist>
+<listitem>
+<para>gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, with: 
+</para>
+<itemizedlist>
+<listitem>
+<para>Fix DHCP host removal. Closes: #650258 
+</para></listitem>
+<listitem>
+<para>Backport user generator unicode character transliteration. Closes: #657086 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Customized GOsa² configuration to better suit the Debian Edu network architecture. 
+</para>
+<itemizedlist>
+<listitem>
+<para>GOsa² updates DNS and NFS exports immediately when a system is updated in LDAP, making diskless workstations work right after they are added to the required netgroup.  
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Provide script sitesummary2ldapdhcp to update or populate GOsa² with system objects using information gathered by sitesummary, to make it easier to add new computers to the network.  
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--More_software_changes">
+<title>More software changes
+</title>
+<itemizedlist>
+<listitem>
+<para>Add video editor Kdenlive 0.7.7  and interactive geometry tool Geogebra 3.2.42 
+</para></listitem>
+<listitem>
+<para>Change default package manager from adept to synaptic, to avoid getting two graphical package managers installed by default. 
+</para></listitem>
+<listitem>
+<para>Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in KDE. 
+</para></listitem>
+<listitem>
+<para>Change video player setup to install different players in KDE (dragonplayer), Gnome (totem) and LXDE (totem). 
+</para></listitem>
+<listitem>
+<para>Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the default KDE installation. 
+</para></listitem>
+<listitem>
+<para>Replace network-manager-kde with plasma-widget-networkmanagement in the standalone KDE profile 
+</para></listitem>
+<listitem>
+<para>Install usb-modeswitch on laptops to handle dual mode USB devices. 
+</para></listitem>
+<listitem>
+<para>Add cifs-utils to the default installation to ensure SMB mounting can work in any profile. 
+</para></listitem>
+<listitem>
+<para>Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, and valgrind from the default installation and the DVD to make room for higher priority packages. 
+</para></listitem>
+<listitem>
+<para>Drop libnss-mdns from stationary profiles, to make sure DNS is the authoritive source of host names. 
+</para></listitem>
+<listitem>
+<para><computeroutput>freerdp-x11</computeroutput> is installed by default as RDP and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was installed instead.) 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Other_LDAP_related_changes">
+<title>Other LDAP related changes
+</title>
+<itemizedlist>
+<listitem>
+<para>Make the LDAP server handle more clients after increasing the server's file descriptor limit from 1024 to 32768.  
+</para></listitem>
+<listitem>
+<para>Add code to re-enable stopped CUPS queues every hour on the Main Server, and flush all CUPS queues every night. Both can be disabled in LDAP.  
+</para></listitem>
+<listitem>
+<para>Provide network blocking / exam mode by default, controlled by LDAP. In addition to network blocking, changes to the Squid proxy configuration is needed.  
+</para></listitem>
+<listitem>
+<para>Enable automatic extending of full file systems on the Main Server by default. This can be disabled in LDAP.  
+</para></listitem>
+<listitem>
+<para>Change SSL certificate name used by the LDAP server and adjust clients to use the new name to be able to enable certificate checking on clients. 
+</para></listitem>
+<listitem>
+<para>Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP setup used for DNS. 
+</para></listitem>
+<listitem>
+<para>Simplify autofs LDAP rules to make sure they work with extra home directory partitions exported from the main-server without any changes. 
+</para></listitem>
+<listitem>
+<para>Make backup system more robust in handling LDAP database dump and restart. 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Other_changes">
+<title>Other changes
+</title>
+<itemizedlist>
+<listitem>
+<para>Root logins are denied for both KDM and GDM - see above and <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#">Getting started</ulink> for details.  
+</para></listitem>
+<listitem>
+<para>Clients set up to shut down at night will stay up for at least an hour if they are turned on manually between 16:00 and 07:00. 
+</para></listitem>
+<listitem>
+<para>Additionally use local NTP clock on the main-server to ensure clients and server sync clocks also when disconnected from the Internet.  
+</para></listitem>
+<listitem>
+<para>Access to Debian repositories is always done via a proxy on the main server - read more about the implementation details <ulink url="http://lists.debian.org/20100704221022.GC30542@login1.uio.no">using DHCP and WPAD</ulink> 
+</para></listitem>
+<listitem>
+<para>The home0 partition is mounted nosuid, to increase security.  
+</para></listitem>
+<listitem>
+<para>Change KDE/Akonadi configuration to reduce the disk footprint of every user from 144 to 24 MiB.  
+</para></listitem>
+<listitem>
+<para>New tool notify-local-users to send desktop notification to all logged in users on a machine.  Useful for thin client servers. 
+</para></listitem></itemizedlist>
+</section>
+</section>
+
 <section id="AppendixC--New_in_Debian_Edu_5.0.6.2B-edu1_Codename_.22Lenny.22_released_2010-10-05">
 <title>New in Debian Edu 5.0.6+edu1 Codename "Lenny" released 2010-10-05
 </title>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
new file mode 100644
index 0000000..ef634fc
--- /dev/null
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -0,0 +1,27 @@
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//AboutDebianEdu
+FIXME: we need a wheezy login shot here once we have new artwork 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
+FIXME: these 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: these screenshots need to be redone once we have wheezy artwork 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Upgrades
+FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed 
+----------------------------------
+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 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 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Features
+FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead. 
+FIXME: hopefully. h01ger is one it to ask gismo. 
+FIXME languages. 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//AppendixC
+FIXME: this paragraph is work in progress and will be copied from DebianEdu/Documentation/Squeeze/Features once its ready 
+====================
+13 FIXMEs left to fix
+====================
diff --git a/documentation/debian-edu-squeeze/images/Debian_Edu_Network_Squeeze.png b/documentation/debian-edu-wheezy/images/Debian_Edu_Network_Wheezy.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/Debian_Edu_Network_Squeeze.png
copy to documentation/debian-edu-wheezy/images/Debian_Edu_Network_Wheezy.png
diff --git a/documentation/debian-edu-squeeze/images/alert.png b/documentation/debian-edu-wheezy/images/alert.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/alert.png
copy to documentation/debian-edu-wheezy/images/alert.png
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
new file mode 100644
index 0000000..acabfba
Binary files /dev/null and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
similarity index 53%
copy from documentation/debian-edu-squeeze/images/es/worldmap.png
copy to documentation/debian-edu-wheezy/images/es/worldmap.png
index a43be9c..1212c1d 100644
Binary files a/documentation/debian-edu-squeeze/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
new file mode 100644
index 0000000..c9b1d83
Binary files /dev/null and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/sad.png b/documentation/debian-edu-wheezy/images/sad.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/sad.png
copy to documentation/debian-edu-wheezy/images/sad.png
diff --git a/documentation/debian-edu-squeeze/images/smile.png b/documentation/debian-edu-wheezy/images/smile.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/smile.png
copy to documentation/debian-edu-wheezy/images/smile.png
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
new file mode 100644
index 0000000..6180794
Binary files /dev/null and b/documentation/debian-edu-wheezy/images/worldmap.png differ

-- 
Debian package debian-edu-doc



More information about the debian-edu-commits mailing list