[debian-edu-commits] debian-edu/debian-edu-doc.git (#1469) - squeeze (branch) updated: 1.5_20130215_7.0-28-gad34d86

David Prévot taffit at alioth.debian.org
Mon Feb 25 14:20:29 UTC 2013


The branch, squeeze has been updated
       via  ad34d8676c908a2647630edba39197d42538453e (commit)
       via  ea6da74f6547dcbdb336a2312923ac9050ef70bd (commit)
       via  2b49764f423628c3531f145c084d27c774c49c68 (commit)
       via  dfbe623936bfbe7e8b6ddc705dff7f351d6b9190 (commit)
       via  03a1ebdac3b5e1080e89de1e9e8e3121d580d295 (commit)
       via  f3f0707f6aba5664bbfed2c7f64577a2f89f36b4 (commit)
       via  958993d37db001c48a77490ad06a4f0c7fcc56b3 (commit)
       via  5cf4d3069dddd081f63dfc5d5cbd2dde72b7a453 (commit)
       via  2d6722129ea85f66f6111b46c30173a4cf33f936 (commit)
       via  ece56ad434fe41ceda30e40c376a91a2eb933f80 (commit)
       via  3b0dd85a843702dce3020293af0a6c20fb889b78 (commit)
       via  bd653bae32c51eb058fb9e65730d920f01ab4f32 (commit)
       via  c7266993f5cca978c7b94cd21ac28ab5cb697dc3 (commit)
       via  aadc272e6acc08fd2a11340679baa9fc25d22ba5 (commit)
       via  aebd49fb4eb5ef22d823acd531b9e0525c8fc7a5 (commit)
       via  2295ca9d9820ac8ad865e4e0566d56872fb72e89 (commit)
       via  2e3b9452c53cda2e911e0262be3f9069d1c62670 (commit)
       via  148743e87b21ec46b9316ade27185276f78dca27 (commit)
       via  e0e3c1cab397ee2949838072eef0a3d089555784 (commit)
       via  bc257357e65bdec4b11747c2f7d9e8203e28787b (commit)
       via  b7dea20552e99d99036d6faca29e703e78a46b38 (commit)
       via  7fe1c62bcb06ac31a9d888ec68b921813bca74fa (commit)
       via  070dc84d8270e78040f9451a82cf1fbe5c60b707 (commit)
       via  d5eb5392f8be2f9ae2df4ab18ebad7aad84b51dc (commit)
       via  c1072675826c336cebe7be91cd18e9a4ecf38d89 (commit)
       via  f9fa3b81f8c3fcbb817b9776d44f947bee37039e (commit)
       via  c641c21fa284121dcf317a9df0fa29262fd20a7b (commit)
       via  658dc4ad85b498eeaca4ec2a5a8d75ac29d938f2 (commit)
       via  5bd8b5a6223a16838e11d4ec28d6e2a34e83b318 (commit)
       via  f2f60fa2894bb409fd0fda8cfe0b6cf9f17ffed1 (commit)
       via  93dab60cb97324e5bcfb274506b4c08aef30a4f1 (commit)
       via  dd412d96c8838ec5cd65edeff2b0a43a34d3696b (commit)
       via  bab1ed4976e951d6a20dceb2781011815a5f2561 (commit)
       via  467e30a9b69e98c36b462e961d38a68b66c88313 (commit)
       via  b11eaad5053f48a31a7841fc3b821f7e0790c321 (commit)
       via  c072a1e77379fcdcf505661fefaaf5ac77e25958 (commit)
       via  f324fcfc75f151efa568512dc1cefc4de8d18539 (commit)
       via  bdb300792d1b09bcd8b12a5b3a21373987022bab (commit)
       via  7260ada45b3306d23366d53f81ccbeef45060e1c (commit)
       via  0c27d0eedfdd324363903175ef7b1ef8cc6c8733 (commit)
       via  276f5c787220c1ce32db34d21c763f585aed9e2f (commit)
       via  5543f7d2dd17dd52527d3928ac25326307689c98 (commit)
       via  6ae979abda44430817a2ab60cb905d7335ff68fd (commit)
       via  161ab81019294a3951023beb13c9090ba5b7ce79 (commit)
       via  676fdf788a02f45009cc6daa2e657eb0d7bc4744 (commit)
       via  88422c28ee73e1260ae9aa69aedccbe10d5ffba5 (commit)
       via  ff6f99c02f2b1c4b3d03b2783adb45d58d88d9cd (commit)
       via  d4d7d9c9603e5ce05525a0217b345b76cba35ff6 (commit)
       via  34f9972c85c0e55e098199ba17435ec48dc34015 (commit)
       via  541d3c8735b5689db7036f230fe55dd9baaa36d6 (commit)
       via  bd850760a51302ddf9ff42475e78364b5dfa3eac (commit)
       via  fe45e9b80a681fd756f7f108d5e30fd29c4244c6 (commit)
       via  5aab0000226156df45b3aaa50a3e2ee712cc7921 (commit)
       via  095d0e87fecbcf9a8ff9ca2e1d4e0ec142160795 (commit)
      from  ed16a1395534a7a8834a3925b68c70583a3e3304 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad34d8676c908a2647630edba39197d42538453e
Author: David Prévot <taffit at debian.org>
Date:   Mon Feb 25 09:18:24 2013 -0400

    Prepare release of debian-edu-doc 1.4~20130225~6.0.7+r1

commit ea6da74f6547dcbdb336a2312923ac9050ef70bd
Author: David Prévot <taffit at debian.org>
Date:   Mon Feb 25 09:25:55 2013 -0400

    Revert "control: update Build-Depends-Indep"
    
    This reverts commit 676fdf788a02f45009cc6daa2e657eb0d7bc4744.

commit 2b49764f423628c3531f145c084d27c774c49c68
Merge: 2e3b945 dfbe623
Author: David Prévot <taffit at debian.org>
Date:   Mon Feb 25 09:04:30 2013 -0400

    Merge branch 'master' into squeeze
    
    Conflicts:
    	debian/changelog
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
    	documentation/debian-edu-wheezy/images/de/worldmap.png
    	documentation/debian-edu-wheezy/images/es/worldmap.png
    	documentation/debian-edu-wheezy/images/fr/worldmap.png
    	documentation/debian-edu-wheezy/images/worldmap.png

commit 2e3b9452c53cda2e911e0262be3f9069d1c62670
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:37:17 2013 -0400

    Delete debian-edu-wheezy directory

commit 148743e87b21ec46b9316ade27185276f78dca27
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:35:35 2013 -0400

    Revert "Update README and copyright — regenerate files"
    
    This reverts commit 276f5c787220c1ce32db34d21c763f585aed9e2f.

commit e0e3c1cab397ee2949838072eef0a3d089555784
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:35:11 2013 -0400

    Revert "Adapt build system to Wheezy manual"
    
    This reverts commit 0c27d0eedfdd324363903175ef7b1ef8cc6c8733.

commit bc257357e65bdec4b11747c2f7d9e8203e28787b
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:34:54 2013 -0400

    Revert "changelog: document the new Wheezy manual"
    
    This reverts commit 7260ada45b3306d23366d53f81ccbeef45060e1c.

commit b7dea20552e99d99036d6faca29e703e78a46b38
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:33:25 2013 -0400

    Revert "Prepare release of debian-edu-doc 1.5~20130215~7.0"
    
    This reverts commit f9fa3b81f8c3fcbb817b9776d44f947bee37039e.

commit 7fe1c62bcb06ac31a9d888ec68b921813bca74fa
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:30:42 2013 -0400

    Revert "Do not ship README.common-translations in the binary package"
    
    This reverts commit c1072675826c336cebe7be91cd18e9a4ecf38d89.

commit 070dc84d8270e78040f9451a82cf1fbe5c60b707
Merge: d5eb539 c107267
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:28:52 2013 -0400

    Merge branch 'master' into squeeze

commit d5eb5392f8be2f9ae2df4ab18ebad7aad84b51dc
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:28:35 2013 -0400

    Remove useless changelog entry

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |   20 +-
 debian/mail_stats_to_list                          |   15 +-
 .../audacity/README.audacity-manual-translations   |    6 +-
 documentation/audacity/audacity-manual.fr.po       |   10 +-
 documentation/audacity/audacity-manual.pot         |    2 +-
 documentation/common/Makefile.common               |    1 +
 documentation/common/README.common-translations    |    6 +-
 .../README.debian-edu-squeeze-manual-translations  |    6 +-
 .../debian-edu-squeeze-manual.da.po                |  569 ++++++++------
 .../debian-edu-squeeze-manual.de.po                |  496 ++++++------
 .../debian-edu-squeeze-manual.es.po                |  429 ++++++-----
 .../debian-edu-squeeze-manual.fr.po                |  569 ++++++++------
 .../debian-edu-squeeze-manual.it.po                |  803 +++++++++++---------
 .../debian-edu-squeeze-manual.nb.po                |  723 ++++++++++---------
 .../debian-edu-squeeze-manual.pot                  |  232 +++---
 .../debian-edu-squeeze-manual.xml                  |   72 +-
 .../debian-edu-squeeze-manual.zh.po                |  236 +++---
 documentation/debian-edu-squeeze/fixme-status.txt  |    5 +-
 .../debian-edu-squeeze/images/de/worldmap.png      |  Bin 386755 -> 386829 bytes
 .../debian-edu-squeeze/images/es/worldmap.png      |  Bin 386854 -> 386934 bytes
 .../debian-edu-squeeze/images/fr/worldmap.png      |  Bin 386799 -> 386870 bytes
 .../debian-edu-squeeze/images/worldmap.png         |  Bin 386791 -> 386863 bytes
 .../README.rosegarden-manual-translations          |    6 +-
 documentation/rosegarden/rosegarden-manual.es.po   |    8 +-
 documentation/rosegarden/rosegarden-manual.fr.po   |   13 +-
 documentation/rosegarden/rosegarden-manual.nb.po   |    9 +-
 documentation/rosegarden/rosegarden-manual.pot     |    6 +-
 27 files changed, 2329 insertions(+), 1913 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 566ea01..a634613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,24 @@
-debian-edu-doc (1.4~20121218~6.0.6+r2) UNRELEASED; urgency=low
+debian-edu-doc (1.4~20130225~6.0.7+r1) squeeze; urgency=low
 
-  * Update internal doc to the new Git repository.
-
- -- David Prévot <taffit at debian.org>  Fri, 08 Feb 2013 18:31:04 -0400
-
-debian-edu-doc (1.4~20121218~6.0.6+r1) UNRELEASED; urgency=low
+  [ Holger Levsen ]
+  * Adapt debian/mail_stats_to_list to the change to git.
+  * common/Makefile.common: remove *.po~ on clean target.
 
   [ David Prévot ]
   * Update manuals and images from the wiki.
   * Update debian/copyright.
   * README: mention the Danish translation among the complete ones.
+  * Update internal doc to the new Git repository, thanks to Wolfgang Schweer
+    for the review and extra comments.
+  * README: document that the latest po4a version must be used.
 
-  [ Updated squeeze manual translations ]
+  [ Squeeze manual translation updates ]
   * German (Wolfgang Schweer).
   * French (Cédric Boutillier).
   * Italian (Claudio Carboncini).
   * Danish (Joe Hansen).
 
-  [ Holger Levsen ]
-  * Bump version to 6.0.6+r1. 
-
- -- David Prévot <taffit at debian.org>  Wed, 07 Nov 2012 00:07:42 -0400
+ -- David Prévot <taffit at debian.org>  Mon, 25 Feb 2013 09:15:25 -0400
 
 debian-edu-doc (1.4~20120925~6.0.6+r0) unstable; urgency=low
 
diff --git a/debian/mail_stats_to_list b/debian/mail_stats_to_list
index ec806c1..4277ea3 100755
--- a/debian/mail_stats_to_list
+++ b/debian/mail_stats_to_list
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009,2010 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009,2010,2013 Holger Levsen (holger at layer-acht.org)
 # 
 # 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
@@ -27,9 +27,9 @@
 #
 
 cd ~holger/debian-edu-doc
-svn up > /dev/null 2>&1 && svn status 
+git pull > /dev/null 2>&1 && git status 2>&1
 if [ $(echo $?) -ne 0 ] ; then
-	echo "Problem with svn checkout at ravel.debian.org:~holger/debian-edu-doc - please fix." | mail -s "problem with debian-edu-doc status mails" holger at layer-acht.org
+	echo "Problem with git clone at ravel.debian.org:~holger/debian-edu-doc - please fix." | mail -s "problem with debian-edu-doc status mails" holger at layer-acht.org
 	exit 1
 fi
 
@@ -37,8 +37,8 @@ fi
 # loop through manuals
 #
 cd documentation
-# actually only send mails about debian-edu-squeeze - you can add more directories to the loop here
-for i in debian-edu-squeeze ; do
+# actually only send mails about debian-edu-squeeze and debian-edu-wheezy - you can add more directories to the loop here
+for i in debian-edu-squeeze debian-edu-wheezy ; do
 	if [ "$i" != scripts ] && [ "$i" != norwegian ] && [ $(ls $i/$i-manual.*.po > /dev/null 2>&1 ; echo $?) -eq 0 ] && [ "$i" != debian-edu-etch ] ; then 
 		cd $i 
 		TMPFILE=$(mktemp)
@@ -47,7 +47,7 @@ for i in debian-edu-squeeze ; do
 		echo "To understand this mail better, please read /usr/share/doc/debian-edu-doc/README." >> $TMPFILE
 		echo "This mail is automatically send by a cronjob run by Holger Levsen every two weeks. Please send feedback, suggestions, flames and cookies via this list." >> $TMPFILE
 		echo >> $TMPFILE
-		make update > /dev/null 2>&1 
+		#make update > /dev/null 2>&1 
 		make status >> $TMPFILE 2>&1 
 		cat $TMPFILE | mail -s "Content and translation status for the $i manual" debian-edu at lists.debian.org
 		rm $TMPFILE
@@ -56,3 +56,6 @@ for i in debian-edu-squeeze ; do
 done
 cd ..
 
+make clean
+git reset --hard
+
diff --git a/documentation/audacity/README.audacity-manual-translations b/documentation/audacity/README.audacity-manual-translations
index c593642..5980243 100644
--- a/documentation/audacity/README.audacity-manual-translations
+++ b/documentation/audacity/README.audacity-manual-translations
@@ -1,9 +1,9 @@
 README for translators of the audacity-manual
 --------------------------------------------
 
-/!\ Since we're still working on Squeeze, please use Squeeze material,
-    especially po4a: po4a 0.40.2-1 must be used, since the current Sid
-    version doesn't behave the same way.
+/!\ Please use Wheezy material, especially po4a: at least po4a 0.42-1
+    must be used, since the previous Squeeze version didn't behave the
+    same way.
     (You'll face tenths of fuzzy strings if you don't respect that).
 
 Before you start:
diff --git a/documentation/audacity/audacity-manual.fr.po b/documentation/audacity/audacity-manual.fr.po
index 12f6aab..edd4d7b 100644
--- a/documentation/audacity/audacity-manual.fr.po
+++ b/documentation/audacity/audacity-manual.fr.po
@@ -591,9 +591,9 @@ msgid ""
 "Then you either commit the file directly to Subversion (if you have the "
 "rights to do so) or send the file to the mailinglist."
 msgstr ""
-"Ensuite, vous pouvez soit enregistrer directement le fichier dans le "
-"dépôt Subversion (si vous possédez les droits nécessaires), soit "
-"envoyer le fichier à la liste de diffusion."
+"Ensuite, vous pouvez soit enregistrer directement le fichier dans le dépôt "
+"Subversion (si vous possédez les droits nécessaires), soit envoyer le "
+"fichier à la liste de diffusion."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -634,8 +634,8 @@ msgstr "Annexe A - La Licence Publique GNU"
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
-msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la licence GPL. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la licence GPL."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index 95446a6..3d8356d 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -505,7 +505,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index 37cd00e..99d6ff2 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -109,5 +109,6 @@ clean:
 	rm -f *.pdf images/*.pdf images/*/*.pdf
 	rm -f *.html
 	rm -f $(name).*.xml
+	rm -f *.po~
 
 dist-clean:	clean
diff --git a/documentation/common/README.common-translations b/documentation/common/README.common-translations
index f2ef446..702aff9 100644
--- a/documentation/common/README.common-translations
+++ b/documentation/common/README.common-translations
@@ -1,9 +1,9 @@
 README for translators of the ##NAME##
 --------------------------------------------
 
-/!\ Since we're still working on Squeeze, please use Squeeze material,
-    especially po4a: po4a 0.40.2-1 must be used, since the current Sid
-    version doesn't behave the same way.
+/!\ Please use Wheezy material, especially po4a: at least po4a 0.42-1
+    must be used, since the previous Squeeze version didn't behave the
+    same way.
     (You'll face tenths of fuzzy strings if you don't respect that).
 
 Before you start:
diff --git a/documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations b/documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations
index 25de268..4a66dd6 100644
--- a/documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations
+++ b/documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations
@@ -1,9 +1,9 @@
 README for translators of the debian-edu-squeeze-manual
 --------------------------------------------
 
-/!\ Since we're still working on Squeeze, please use Squeeze material,
-    especially po4a: po4a 0.40.2-1 must be used, since the current Sid
-    version doesn't behave the same way.
+/!\ Please use Wheezy material, especially po4a: at least po4a 0.42-1
+    must be used, since the previous Squeeze version didn't behave the
+    same way.
     (You'll face tenths of fuzzy strings if you don't respect that).
 
 Before you start:
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
index b140c28..dbdbdb2 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-01-21 19:41-0400\n"
+"POT-Creation-Date: 2013-02-24 13:55-0400\n"
 "PO-Revision-Date: 2013-01-23 11:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -23,12 +23,12 @@ msgid "en"
 msgstr "da"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
-msgstr "Manual for Debian Edu / Skolelinux Squeeze 6.0.6+r1"
+msgid "Debian Edu / Skolelinux Squeeze 6.0.7+r1 Manual"
+msgstr "Manual for Debian Edu / Skolelinux Squeeze 6.0.7+r1"
 
 #. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
-msgstr "Manual for Debian Edu 6.0.6+r1 kodenavn »Squeeze«"
+msgid "Manual for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
+msgstr "Manual for Debian Edu 6.0.7+r1 kodenavn »Squeeze«"
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/welcome_to_tjener.png"
@@ -39,8 +39,8 @@ msgid "Debian Edu login"
 msgstr "Logind for Debian Edu"
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
-msgstr "Dette er manualen for Debian Edu Squeeze 6.0.6+r1-udgivelsen."
+msgid "This is the manual for the Debian Edu Squeeze 6.0.7+r1 release."
+msgstr "Dette er manualen for Debian Edu Squeeze 6.0.7+r1-udgivelsen."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -1355,8 +1355,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
-msgstr "Hent installationsmediet for Debian Edu 6.0.6+r1 kodenavn »Squeeze«"
+"Download the installation media for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
+msgstr "Hent installationsmediet for Debian Edu 6.0.7+r1 kodenavn »Squeeze«"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "DVD for i386, amd64"
@@ -1374,27 +1374,27 @@ 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1410,27 +1410,27 @@ 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 
 #. 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1442,27 +1442,27 @@ msgstr "Kilderne er tilgængelige via"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -2044,11 +2044,11 @@ msgstr ""
 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.skolelinux.org/skolelinux squeeze local"
 msgstr ""
 "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.skolelinux.org/skolelinux squeeze local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2318,8 +2318,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "d-i    pkgsel/include string my-extra-package(s)]]"
-msgstr "d-i    pkgsel/include string my-extra-package(s)]]"
+msgid "d-i    pkgsel/include string my-extra-package(s)"
+msgstr "d-i    pkgsel/include string my-extra-package(s)"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -3089,7 +3089,7 @@ msgid ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 msgstr ""
 "#!/bin/bash\n"
 "  #\n"
@@ -3106,7 +3106,7 @@ msgstr ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
@@ -3395,14 +3395,14 @@ msgid ""
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 msgstr ""
 "# Vis eksisterende gruppeoversættelse mellem UNIX- og Windowsgrupper.\n"
 "net groupmap list\n"
 "\n"
 "# Tilføj dine nye eller manglende grupper:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3500,7 +3500,7 @@ msgid ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 msgstr ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
 "info: Opret GOSa-maskine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
@@ -3510,7 +3510,7 @@ msgstr ""
 "Indtast adgangskode hvis du ønsker at aktivere disse ændringer, og ^c for at afbryde.\n"
 "\n"
 "Forbindelse til LDAP som cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"indtast adgangskode: █]]"
+"indtast adgangskode: █"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_list.png"
@@ -3994,11 +3994,11 @@ msgstr ""
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 msgstr ""
 "$ sudo rdiff-backup -r <dato>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/bruger \\\n"
-"   /skole/tjener/home0/bruger_<dato>]]"
+"   /skole/tjener/home0/bruger_<dato>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4138,8 +4138,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
-msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
+msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4680,14 +4680,14 @@ msgid ""
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 msgstr ""
 "etckeeper vcs log\n"
 "etckeeper vcs status\n"
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Usage examples"
@@ -4703,8 +4703,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs log]]"
-msgstr "etckeeper vcs log]]"
+msgid "etckeeper vcs log"
+msgstr "etckeeper vcs log"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "See which files are currently not tracked and which are not up-to-date:"
@@ -4713,8 +4713,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs status]]"
-msgstr "etckeeper vcs status]]"
+msgid "etckeeper vcs status"
+msgstr "etckeeper vcs status"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4724,8 +4724,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs commit -a /etc/resolv.conf]]"
-msgstr "etckeeper vcs commit -a /etc/resolv.conf]]"
+msgid "etckeeper vcs commit -a /etc/resolv.conf"
+msgstr "etckeeper vcs commit -a /etc/resolv.conf"
 
 #. type: Content of: <article><section><section><title>
 msgid "Resizing Partitions"
@@ -4840,10 +4840,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 msgstr ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 
 # engelsk fejl G-GB
 #. type: Content of: <article><section><section><section><para>
@@ -4878,12 +4878,12 @@ msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 msgstr ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # efter installation, start en grafisk session for den første bruger \n"
-"  $ startx]]"
+"  $ startx"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using ldapvi"
@@ -4904,8 +4904,8 @@ msgstr "Det følgende skal køres:"
 
 #. type: CDATA
 #, no-wrap
-msgid "ldapvi --ldap-conf -ZD '(cn=admin)']]"
-msgstr "ldapvi --ldap-conf -ZD '(cn=admin)']]"
+msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
+msgstr "ldapvi --ldap-conf -ZD '(cn=admin)'"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5024,10 +5024,10 @@ msgstr "Brug af backports.debian.org er nemt:"
 #, no-wrap
 msgid ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5065,10 +5065,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 msgstr ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 
 #. type: Content of: <article><section><section><para>
 msgid "To quote the apt-cdrom(8) man page:"
@@ -5103,10 +5103,10 @@ msgstr "Kør så disse to kommandoer for at opgradere systemet:"
 #, no-wrap
 msgid ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 msgstr ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 
 #. type: Content of: <article><section><section><title>
 msgid "Java"
@@ -5180,7 +5180,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 msgstr ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5201,7 +5201,7 @@ msgstr ""
 "        echo -e \"the folder $home_path/$home/$shared_folder findes allerede.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir mapper er blevet oprettet\"]]"
+" echo \"$created_dir mapper er blevet oprettet\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Easy access to USB drives and CDROMs/DVDs"
@@ -5273,7 +5273,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 msgstr ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5288,7 +5288,7 @@ msgstr ""
 "        echo -e \"mappen $home_path/$home/$shared_folder findes allerede.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir mapper er blevet oprettet\"]]"
+" echo \"$created_dir mapper er blevet oprettet\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "A warning about removable media on LTSP servers"
@@ -5340,8 +5340,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install killer]]"
-msgstr "apt-get install killer]]"
+msgid "apt-get install killer"
+msgstr "apt-get install killer"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic installation of security upgrades"
@@ -5372,8 +5372,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges]]"
-msgstr "apt-get install unattended-upgrades apt-listchanges]]"
+msgid "apt-get install unattended-upgrades apt-listchanges"
+msgstr "apt-get install unattended-upgrades apt-listchanges"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic shutdown of machines during the night"
@@ -5494,12 +5494,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5517,12 +5517,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 
 #. type: Content of: <article><section><section><title>
 msgid "Access Debian-Edu servers located behind a firewall"
@@ -5667,10 +5667,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 msgstr ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5702,8 +5702,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde]]"
-msgstr "apt-get install gnome lxde]]"
+msgid "apt-get install gnome lxde"
+msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5758,8 +5758,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs]]"
-msgstr "apt-get install libdvdcss2 w32codecs]]"
+msgid "apt-get install libdvdcss2 w32codecs"
+msgstr "apt-get install libdvdcss2 w32codecs"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using the multimedia repository"
@@ -5781,7 +5781,7 @@ msgid ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# installer debian-keyring sikkert:\n"
 "apt-get install debian-keyring\n"
@@ -5792,7 +5792,7 @@ msgstr ""
 "# tilføj arkiv til sources.list - kontroller hjemmesiderne for spejle!\n"
 "echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
 "# opdater listen over tilgængelige pakker:\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -5898,7 +5898,7 @@ msgid ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 msgstr ""
 "# Indhent først information om firmwarepakker\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -5912,7 +5912,7 @@ msgstr ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# kopier den nye initrd til serverens tftpboot-mappe\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
@@ -5997,8 +5997,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
-msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
+msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
+msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6061,13 +6061,13 @@ msgid ""
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 "#tilføj skolens projekters lokale arkiv\n"
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6108,8 +6108,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6121,8 +6121,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6143,8 +6143,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
-msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
+msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6165,13 +6165,13 @@ msgid ""
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 msgstr ""
 "default ltsp\n"
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6234,8 +6234,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
-msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6365,12 +6365,12 @@ msgid ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 msgstr ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid "somewhere below the default settings."
@@ -6388,10 +6388,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 msgstr ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6429,8 +6429,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_SESSION=/usr/bin/startlxde]]"
-msgstr "LDM_SESSION=/usr/bin/startlxde]]"
+msgid "LDM_SESSION=/usr/bin/startlxde"
+msgstr "LDM_SESSION=/usr/bin/startlxde"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6543,8 +6543,8 @@ msgstr "Rediger »/opt/ltsp/i386/etc/lts.conf« og tilføj noget lignende dette:
 
 #. type: CDATA
 #, no-wrap
-msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
-msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
+msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
+msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -6574,7 +6574,7 @@ msgid ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 msgstr ""
 "#!/bin/bash\n"
 " # Vælg tilfældig fra serverlisten indeholdt i parameteren MY_SERVER_LIST\n"
@@ -6589,7 +6589,7 @@ msgstr ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Part 3"
@@ -6699,13 +6699,13 @@ msgid ""
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386  # udfører »chroot /opt/ltsp/i386« med mere, dvs. det forhindrer også dæmoner i at blive startet\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Installing additional software in the LTSP environment"
@@ -6727,14 +6727,14 @@ msgid ""
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
 "## valgfrit, rediger sources.list:\n"
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Slow login and security"
@@ -6762,8 +6762,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_DIRECTX=True]]"
-msgstr "LDM_DIRECTX=True]]"
+msgid "LDM_DIRECTX=True"
+msgstr "LDM_DIRECTX=True"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6832,8 +6832,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
-msgstr "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
+msgstr "X -query ltspserverXX"
 
 #. type: Content of: <article><section><section><para>
 msgid "If you are on the thin client network, run this command:"
@@ -6841,8 +6841,8 @@ msgstr "Hvis du er på netværket med tynde klienter, så kør denne kommando:"
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query 192.168.0.254]]"
-msgstr "X -query 192.168.0.254]]"
+msgid "X -query 192.168.0.254"
+msgstr "X -query 192.168.0.254"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6863,8 +6863,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "* # any host can get a login window]]"
-msgstr "* # enhver vært kan få et logindvindue]]"
+msgid "* # any host can get a login window"
+msgstr "* # enhver vært kan få et logindvindue"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6879,8 +6879,8 @@ msgstr "Tænd så XDMCP i KDM med kommandoen:"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
-msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
+msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 
 #. type: Content of: <article><section><section><para>
 msgid "Finally, restart KDM by running:"
@@ -6888,8 +6888,8 @@ msgstr "Endelig, genstart KDM ved at køre:"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo invoke-rc.d kdm restart]]"
-msgstr "sudo invoke-rc.d kdm restart]]"
+msgid "sudo invoke-rc.d kdm restart"
+msgstr "sudo invoke-rc.d kdm restart"
 
 #. type: Content of: <article><section><section><para>
 msgid "(with thanks to Finn-Arne Johansen)"
@@ -6964,11 +6964,11 @@ msgstr ""
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 msgstr ""
 "/usr/bin/net groupmap add unixgroup=studenter \\\n"
 "             type=domain ntgroup=\"studenter\" \\\n"
-"             comment=\"Alle studenter på skolen\"]]"
+"             comment=\"Alle studenter på skolen\""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -7455,10 +7455,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Remote Desktop"
@@ -8099,7 +8099,7 @@ msgid ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
 "# flyt tar.gz-filen til en arkivmappe på skolens netværks webroot (som standard placeret på tjener):\n"
 "root at tjener:~# \n"
@@ -8108,7 +8108,7 @@ msgstr ""
 "# gå til den nye mappe\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# udtræk filen\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Add the needed packages to the PXE installation image"
@@ -8128,12 +8128,12 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Update the preseed file:"
@@ -8141,8 +8141,8 @@ msgstr "Opdater den forudfyldte fil (preseed):"
 
 #. type: CDATA
 #, no-wrap
-msgid "/usr/sbin/debian-edu-pxeinstall]]"
-msgstr "/usr/sbin/debian-edu-pxeinstall]]"
+msgid "/usr/sbin/debian-edu-pxeinstall"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8172,10 +8172,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 msgstr ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Start the editor like this:"
@@ -8183,8 +8183,8 @@ msgstr "Start redigeringsprogrammet således:"
 
 #. type: CDATA
 #, no-wrap
-msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
-msgstr "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
+msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
+msgstr "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Add the repository key and install the software:"
@@ -8198,14 +8198,14 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "ltsp-chroot -a i386 wget http://www/debian/swbuild.asc\n"
 "ltsp-chroot -a i386 apt-key add swbuild.asc\n"
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -8621,10 +8621,15 @@ msgstr "Nye funktioner i Debian Edu Squeeze"
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
+msgstr "Ændringer i Debian Edu 6.0.7+r1 kodenavn »Squeeze« udgivet 03-03-2012"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
+"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
+"well as the following changes:"
 msgstr ""
-"Ændringer i Debian Edu 6.0.6+r1 kodenavn »Squeeze« *UN*udgivet ??-12-2012"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
@@ -8639,8 +8644,8 @@ msgid "Comply with 3.X kernel"
 msgstr "Overholder 3.x-kernen"
 
 #. 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 "debian-edu-doc fra 1.4~20120310~6.0.4+r0 til 1.4~20120925~6.0.6+r0"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
+msgstr "debian-edu-doc fra 1.4~20120310~6.0.4+r0 til 1.4~20130227~6.0.7+r1"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Minor updates from the wiki"
@@ -8651,23 +8656,31 @@ msgid "Danish translation now complete"
 msgstr "Dansk oversættelse er nu færdig"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
-msgstr "debian-edu-config fra 1.453 til 1.454"
+msgid "debian-edu-config from 1.453 to 1.455"
+msgstr "debian-edu-config fra 1.453 til 1.455"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make ltsp_local_mount script work for multiple devices."
+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"
 msgstr ""
-"Korrektion af Kerberos' brugerpolitik: Adgangskoder udløber ikke efter 2 dage. "
-"Lukker: #664596"
+"Korrektion af Kerberos' brugerpolitik: Adgangskoder udløber ikke efter 2 "
+"dage. Lukker: #664596"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
-"Håndterer »#«-tegn i administrators (root) eller første brugers adgangskode. Lukker "
-"#664976"
+"Håndterer »#«-tegn i administrators (root) eller første brugers adgangskode. "
+"Lukker #664976"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fixes for gosa-sync:"
@@ -8698,8 +8711,8 @@ msgid ""
 "gosa-netgroups plugin: don't erase entries of attribute type "
 "\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
-"Udvidelsesmodul for gosa-netgroups: slet ikke poster med "
-"attributype »memberNisNetgroup«. Lukker: #687256"
+"Udvidelsesmodul for gosa-netgroups: slet ikke poster med attributype "
+"»memberNisNetgroup«. Lukker: #687256"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "First user now uses the same Kerberos policy as all other users"
@@ -8710,21 +8723,13 @@ msgid "Add Danish web page"
 msgstr "Tilføj dansk hjemmeside"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
-msgstr "debian-edu-install fra 1.528 til 1.529"
+msgid "debian-edu-install from 1.528 to 1.530"
+msgstr "debian-edu-install fra 1.528 til 1.530"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Improve preseeding support and documentation"
 msgstr "Forbedr understøttelse og dokumentation vedrørende forudfyldelse"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
@@ -9099,12 +9104,12 @@ msgstr ""
 
 #. 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."
+"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
+"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
-"Manualen for Debian Edu er fuldt oversat til tysk, fransk og italiensk. "
-"Delvist oversatte versioner findes for dansk (ny), norsk bokmål og spansk."
+"Manualen for Debian Edu er fuldt oversat til tysk, fransk, italiensk og "
+"dansk (ny). Delvist oversatte versioner findes for norsk bokmål og spansk."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to many language tasks, especially French and Danish."
@@ -9514,7 +9519,8 @@ 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."
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
 "Den italiensk oversættelse Claudio Carboncini (2007, 2008, 2009, 2010, 2011, "
 "2012, 2013) og er udgivet under GPL2 eller en senere version."
@@ -9542,11 +9548,11 @@ 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013) og er "
-"udgivet under GPL2 eller enhver senere version."
+"Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013) "
+"og er udgivet under GPL2 eller enhver senere version."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
@@ -9573,7 +9579,7 @@ 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) "
+"manual-translations</computeroutput>. The Git 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."
@@ -9581,9 +9587,9 @@ msgstr ""
 "Som i mange andre frie programmer håndteres oversættelser af dette dokument "
 "i PO-filer. Yderligere information om processen kan findes i "
 "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. Subversionarkivet (se nedenfor) "
-"indeholder også denne fil. Tag et kig der og på <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Contribute/Translation/Conventions#\">sprogspecifikke "
+"manual-translations</computeroutput>. Gitarkivet (se nedenfor) indeholder "
+"også denne fil. Tag et kig der og på <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/Contribute/Translation/Conventions#\">sprogspecifikke "
 "konventioner</ulink> hvis du ønsker at hjælpe med at oversætte dette "
 "dokument."
 
@@ -9591,38 +9597,37 @@ msgstr ""
 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 "
+"check out some files from from Git (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 ""
 "For at indsende dine oversættelser skal du være medlem af Alioth-projektet "
 "<computeroutput>debian-edu</computeroutput>. For at oversættte skal du bare "
-"kigge på nogle filer fra Subversion (som kan gøres anonymt) og oprette "
-"rettelser. Send venligst en fejlrapport mod pakken debian-edu-doc og vedhæft "
-"PO-filen til <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">fejlrapporten</ulink>. Du kan se nogle <ulink url=\"http://bugs.debian.org"
-"\">instruktioner om hvordan fejl skal indsendes</ulink> her."
+"kigge på nogle filer fra Git (som kan gøres anonymt) og oprette rettelser. "
+"Send venligst en fejlrapport mod pakken debian-edu-doc og vedhæft PO-filen "
+"til <ulink url=\"http://bugs.debian.org/debian-edu-doc\">fejlrapporten</"
+"ulink>. Du kan se nogle <ulink url=\"http://bugs.debian.org\">instruktioner "
+"om hvordan fejl skal indsendes</ulink> her."
 
 #. 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):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "Du kan anonymt kigge på kilden for <computeroutput>debian-edu-doc</"
 "computeroutput> med den følgende kommando (du skal have pakken "
-"<computeroutput>subversion</computeroutput> installeret for at dette virker):"
+"<computeroutput>git</computeroutput> installeret for at dette virker):"
 
 #. 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>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9638,11 +9643,11 @@ 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."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
-"Når du enten indsender filen direkte til Subversion (hvis du har rettigheder "
-"til dette) eller sender filen til fejlrapporten."
+"Når du enten indsender filen direkte til Git (hvis du har rettigheder til "
+"dette) eller sender filen til fejlrapporten."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9653,8 +9658,8 @@ msgstr ""
 "mappen <computeroutput>debian-edu-doc</computeroutput>:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9679,30 +9684,27 @@ 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\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
-"Grundlæggende information om Alioth (værten hvor Subversionarkivet er "
-"placeret) og Subversion er tilgængelig på <ulink url=\"http://wiki.debian."
-"org/Alioth/Svn\"/>."
+"Grundlæggende information om Alioth (værten hvor Gitarkivet er placeret) og "
+"Git er tilgængelig på <ulink url=\"http://wiki.debian.org/Alioth/Git\"/>."
 
 #. 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."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
-"Hvis du ikke har prøvet Subversion før, så kig i <ulink url=\"http://svnbook."
-"org\">Version Control with Subversion</ulink>; bogen har et kapitel om "
-"<ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">det "
-"grundlæggende arbejdsforløb i Subversion</ulink>. Du kan eventuelt også "
-"kigge på pakken <computeroutput>kdesvn</computeroutput>, hvis du foretrækker "
-"en grafisk brugerfladeklient for Subversion i stedet for at bruge "
-"kommandolinjeklienten."
+"Hvis du ikke har prøvet Git før, så kig i <ulink url=\"http://git-scm.com/"
+"book\">Pro Git</ulink>; bogen har et kapitel om <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">registrering af "
+"ændringer i arkivet</ulink>. Du kan eventuelt også kigge på pakken "
+"<computeroutput>gitk</computeroutput>, som tilbyder en grafisk brugerflade "
+"for Git."
 
 #. type: Content of: <article><section><section><para>
 msgid "Please report any problems."
@@ -9714,8 +9716,8 @@ msgstr "Appendiks A - The GNU General Public License"
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
-msgstr "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note to translators: there is no need to translate the GPL license text."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -10997,6 +10999,103 @@ msgstr ""
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+#~ msgstr ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+
+#~ 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."
+#~ msgstr ""
+#~ "Som i mange andre frie programmer håndteres oversættelser af dette "
+#~ "dokument i PO-filer. Yderligere information om processen kan findes i "
+#~ "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
+#~ "manual-translations</computeroutput>. Subversionarkivet (se nedenfor) "
+#~ "indeholder også denne fil. Tag et kig der og på <ulink url=\"http://wiki."
+#~ "debian.org/DebianEdu/Contribute/Translation/Conventions#"
+#~ "\">sprogspecifikke konventioner</ulink> hvis du ønsker at hjælpe med at "
+#~ "oversætte dette dokument."
+
+#~ 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."
+#~ msgstr ""
+#~ "For at indsende dine oversættelser skal du være medlem af Alioth-"
+#~ "projektet <computeroutput>debian-edu</computeroutput>. For at oversættte "
+#~ "skal du bare kigge på nogle filer fra Subversion (som kan gøres anonymt) "
+#~ "og oprette rettelser. Send venligst en fejlrapport mod pakken debian-edu-"
+#~ "doc og vedhæft PO-filen til <ulink url=\"http://bugs.debian.org/debian-"
+#~ "edu-doc\">fejlrapporten</ulink>. Du kan se nogle <ulink url=\"http://bugs."
+#~ "debian.org\">instruktioner om hvordan fejl skal indsendes</ulink> her."
+
+#~ 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):"
+#~ msgstr ""
+#~ "Du kan anonymt kigge på kilden for <computeroutput>debian-edu-doc</"
+#~ "computeroutput> med den følgende kommando (du skal have pakken "
+#~ "<computeroutput>subversion</computeroutput> installeret for at dette "
+#~ "virker):"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#~ 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 ""
+#~ "Når du enten indsender filen direkte til Subversion (hvis du har "
+#~ "rettigheder til dette) eller sender filen til fejlrapporten."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#~ 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 ""
+#~ "Grundlæggende information om Alioth (værten hvor Subversionarkivet er "
+#~ "placeret) og Subversion er tilgængelig på <ulink url=\"http://wiki.debian."
+#~ "org/Alioth/Svn\"/>."
+
+#~ 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 ""
+#~ "Hvis du ikke har prøvet Subversion før, så kig i <ulink url=\"http://"
+#~ "svnbook.org\">Version Control with Subversion</ulink>; bogen har et "
+#~ "kapitel om <ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html"
+#~ "\">det grundlæggende arbejdsforløb i Subversion</ulink>. Du kan eventuelt "
+#~ "også kigge på pakken <computeroutput>kdesvn</computeroutput>, hvis du "
+#~ "foretrækker en grafisk brugerfladeklient for Subversion i stedet for at "
+#~ "bruge kommandolinjeklienten."
+
+#~ msgid ""
 #~ "Create a user with membership in the \"admins\" group (if not already "
 #~ "existing)"
 #~ msgstr ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
index 25fdddc..c867ef9 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Holger Levsen and others
 # Source URL: http://wiki.debian.org/DebianEdu/Documentation/Squeeze/
 #
-# Wolfgang Schweer <schweer at cityweb.de>, 2012, 2013.
+# Wolfgang Schweer <wschweer at arcor.de>, 2012, 2013.
 # Andreas B. Mundt <andi.mundt at web.de>, 2009, 2010.
 # Holger Levsen <holger at layer-acht.org>, 2007.
 # RalfGesellensetter <ralf at skolelinux.de>, 2007, 2009.
@@ -16,31 +16,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-21 19:41-0400\n"
-"PO-Revision-Date: 2013-01-22 00:12+0100\n"
-"Last-Translator: Wolfgang Schweer <schweer at cityweb.de>\n"
+"POT-Creation-Date: 2013-02-24 13:55-0400\n"
+"PO-Revision-Date: 2013-02-24 23:18+0100\n"
+"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
 msgstr "de"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
-msgstr "Handbuch für Debian Edu / Skolelinux Squeeze 6.0.6+r1"
+msgid "Debian Edu / Skolelinux Squeeze 6.0.7+r1 Manual"
+msgstr "Handbuch für Debian Edu / Skolelinux Squeeze 6.0.7+r1"
 
 #. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
-msgstr "Handbuch für Debian Edu 6.0.6+r1, Codename »Squeeze«"
+msgid "Manual for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
+msgstr "Handbuch für Debian Edu 6.0.7+r1, Codename »Squeeze«"
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/welcome_to_tjener.png"
@@ -51,8 +49,8 @@ msgid "Debian Edu login"
 msgstr "Debian-Edu-Anmeldung"
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
-msgstr "Dies ist das Handbuch für das Release Debian Edu Squeeze 6.0.6+r1."
+msgid "This is the manual for the Debian Edu Squeeze 6.0.7+r1 release."
+msgstr "Dies ist das Handbuch für das Release Debian Edu Squeeze 6.0.7+r1."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -1399,9 +1397,9 @@ 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 6.0.7+r1 Codename \"Squeeze\""
 msgstr ""
-"Herunterladen des Installationsmediums für Debian Edu 6.0.6+r1, Codename "
+"Herunterladen des Installationsmediums für Debian Edu 6.0.7+r1, Codename "
 "»Squeeze«"
 
 #. type: Content of: <article><section><section><section><title>
@@ -1420,27 +1418,27 @@ 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1456,27 +1454,27 @@ 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 
 #. 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1488,27 +1486,27 @@ msgstr "Die Quelltexte sind erhältlich mittels"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -2099,11 +2097,11 @@ msgstr ""
 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.skolelinux.org/skolelinux squeeze local"
 msgstr ""
 "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.skolelinux.org/skolelinux squeeze local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2375,8 +2373,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "d-i    pkgsel/include string my-extra-package(s)]]"
-msgstr "d-i    pkgsel/include string meine_zusätzlichen_Pakete]]"
+msgid "d-i    pkgsel/include string my-extra-package(s)"
+msgstr "d-i    pkgsel/include string meine_zusätzlichen_Pakete"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -3151,7 +3149,7 @@ msgid ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 msgstr ""
 "#!/bin/bash\n"
 "  #\n"
@@ -3166,7 +3164,7 @@ msgstr ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
@@ -3468,14 +3466,14 @@ msgid ""
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 msgstr ""
 "# Listen Sie die existierende Zuordnung zwischen UNIX und Windows-Gruppen auf.\n"
 "net groupmap list\n"
 "\n"
 "# Fügen Sie Ihre neuen oder fehlenden Gruppen hinzu:\n"
 "net groupmap add unixgroup=NEUE_GRUPPE type=domain ntgroup=\"NEUE_GRUPPE\"\\\n"
-"                 comment=\"BESCHREIBUNG DER NEUEN_GRUPPE\"]]"
+"                 comment=\"BESCHREIBUNG DER NEUEN_GRUPPE\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3575,7 +3573,7 @@ msgid ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 msgstr ""
 "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"
@@ -3585,7 +3583,7 @@ msgstr ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_list.png"
@@ -4079,11 +4077,11 @@ msgstr ""
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 msgstr ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4227,8 +4225,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
-msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
+msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4791,14 +4789,14 @@ msgid ""
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 msgstr ""
 "etckeeper vcs log\n"
 "etckeeper vcs status\n"
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Usage examples"
@@ -4814,8 +4812,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs log]]"
-msgstr "etckeeper vcs log]]"
+msgid "etckeeper vcs log"
+msgstr "etckeeper vcs log"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "See which files are currently not tracked and which are not up-to-date:"
@@ -4825,8 +4823,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs status]]"
-msgstr "etckeeper vcs status]]"
+msgid "etckeeper vcs status"
+msgstr "etckeeper vcs status"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4837,8 +4835,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs commit -a /etc/resolv.conf]]"
-msgstr "etckeeper vcs commit -a /etc/resolv.conf]]"
+msgid "etckeeper vcs commit -a /etc/resolv.conf"
+msgstr "etckeeper vcs commit -a /etc/resolv.conf"
 
 #. type: Content of: <article><section><section><title>
 msgid "Resizing Partitions"
@@ -4954,10 +4952,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 msgstr ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0 \n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4994,12 +4992,12 @@ msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 msgstr ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # Nach der Installation eine graphische Arbeitsumgebung für den Erstbenutzer starten\n"
-"  $ startx]]"
+"  $ startx"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using ldapvi"
@@ -5020,8 +5018,8 @@ msgstr "Folgender Befehl muss ausgeführt werden:"
 
 #. type: CDATA
 #, no-wrap
-msgid "ldapvi --ldap-conf -ZD '(cn=admin)']]"
-msgstr "ldapvi --ldap-conf -ZD '(cn=admin)']]"
+msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
+msgstr "ldapvi --ldap-conf -ZD '(cn=admin)'"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5143,10 +5141,10 @@ msgstr "Die Nutzung von backports.debian.org ist einfach:"
 #, no-wrap
 msgid ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5186,10 +5184,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 msgstr ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 
 #. type: Content of: <article><section><section><para>
 msgid "To quote the apt-cdrom(8) man page:"
@@ -5225,10 +5223,10 @@ msgstr "Dann sind diese beiden Befehle für das Upgrade auszuführen:"
 #, no-wrap
 msgid ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 msgstr ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 
 #. type: Content of: <article><section><section><title>
 msgid "Java"
@@ -5305,7 +5303,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 msgstr ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5326,7 +5324,7 @@ msgstr ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir Verzeichnisse wurden angelegt\"]]"
+" echo \"$created_dir Verzeichnisse wurden angelegt\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Easy access to USB drives and CDROMs/DVDs"
@@ -5402,7 +5400,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 msgstr ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5417,7 +5415,7 @@ msgstr ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "A warning about removable media on LTSP servers"
@@ -5471,8 +5469,8 @@ msgstr "Um es zu installieren, führen Sie folgendes Kommando als Root aus:"
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install killer]]"
-msgstr "apt-get install killer]]"
+msgid "apt-get install killer"
+msgstr "apt-get install killer"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic installation of security upgrades"
@@ -5503,8 +5501,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges]]"
-msgstr "apt-get install unattended-upgrades apt-listchanges]]"
+msgid "apt-get install unattended-upgrades apt-listchanges"
+msgstr "apt-get install unattended-upgrades apt-listchanges"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic shutdown of machines during the night"
@@ -5629,12 +5627,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5652,12 +5650,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 
 #. type: Content of: <article><section><section><title>
 msgid "Access Debian-Edu servers located behind a firewall"
@@ -5802,10 +5800,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 msgstr ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5837,8 +5835,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde]]"
-msgstr "apt-get install gnome lxde]]"
+msgid "apt-get install gnome lxde"
+msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5895,8 +5893,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs]]"
-msgstr "apt-get install libdvdcss2 w32codecs]]"
+msgid "apt-get install libdvdcss2 w32codecs"
+msgstr "apt-get install libdvdcss2 w32codecs"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using the multimedia repository"
@@ -5918,7 +5916,7 @@ msgid ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# Den Debian-Keyring sicher installieren:\n"
 "apt-get install debian-keyring\n"
@@ -5929,7 +5927,7 @@ msgstr ""
 "# Das Depot der Datei sources.list hinzufügen - bitte die Homepages wegen Spiegelservern konsultieren!\n"
 "echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
 "# Die List der verfügbaren Pakete aktualisieren:\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -6039,7 +6037,7 @@ msgid ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 msgstr ""
 "# Zunächst Informationen über Firmware-Pakete einholen.\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -6053,7 +6051,7 @@ msgstr ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# Die neue Initrd in das Verzeichnis »tftpboot« des Servers kopieren.\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
@@ -6138,8 +6136,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
-msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
+msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
+msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6204,13 +6202,13 @@ msgid ""
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 "# Ein lokales Depot hinzufügen\n"
 "d-i     apt-setup/local1/repository string      http://example.com/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.com/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.com/key.asc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6251,8 +6249,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6264,8 +6262,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6285,8 +6283,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
-msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
+msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6307,13 +6305,13 @@ msgid ""
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 msgstr ""
 "default ltsp\n"
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6380,8 +6378,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
-msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6514,12 +6512,12 @@ msgid ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 msgstr ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid "somewhere below the default settings."
@@ -6538,10 +6536,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 msgstr ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6580,8 +6578,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_SESSION=/usr/bin/startlxde]]"
-msgstr "LDM_SESSION=/usr/bin/startlxde]]"
+msgid "LDM_SESSION=/usr/bin/startlxde"
+msgstr "LDM_SESSION=/usr/bin/startlxde"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6698,8 +6696,8 @@ msgstr "Ergänzen Sie in »/opt/ltsp/i386/etc/lts.conf« etwas wie:"
 
 #. type: CDATA
 #, no-wrap
-msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
-msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
+msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
+msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -6729,7 +6727,7 @@ msgid ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 msgstr ""
 "#!/bin/bash\n"
 " # Randomise the server list contained in MY_SERVER_LIST parameter\n"
@@ -6744,7 +6742,7 @@ msgstr ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Part 3"
@@ -6854,13 +6852,13 @@ msgid ""
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386  # dies bewirkt \"chroot /opt/ltsp/i386\" und verhindert dort zusätzlich den Start von Daemons\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Installing additional software in the LTSP environment"
@@ -6882,14 +6880,14 @@ msgid ""
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
 "## optional die Datei sources.list bearbeiten:\n"
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Slow login and security"
@@ -6917,8 +6915,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_DIRECTX=True]]"
-msgstr "LDM_DIRECTX=True]]"
+msgid "LDM_DIRECTX=True"
+msgstr "LDM_DIRECTX=True"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6989,8 +6987,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
-msgstr "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
+msgstr "X -query ltspserverXX"
 
 #. type: Content of: <article><section><section><para>
 msgid "If you are on the thin client network, run this command:"
@@ -7000,8 +6998,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query 192.168.0.254]]"
-msgstr "X -query 192.168.0.254]]"
+msgid "X -query 192.168.0.254"
+msgstr "X -query 192.168.0.254"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7023,8 +7021,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "* # any host can get a login window]]"
-msgstr "* # any host can get a login window]]"
+msgid "* # any host can get a login window"
+msgstr "* # any host can get a login window"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7040,8 +7038,8 @@ msgstr "Aktivieren Sie dann XDMCP in KDM mit dem Kommando:"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
-msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
+msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 
 #. type: Content of: <article><section><section><para>
 msgid "Finally, restart KDM by running:"
@@ -7049,8 +7047,8 @@ msgstr "Abschließend starten Sie KDM mit dem folgenden Kommando neu:"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo invoke-rc.d kdm restart]]"
-msgstr "sudo invoke-rc.d kdm restart]]"
+msgid "sudo invoke-rc.d kdm restart"
+msgstr "sudo invoke-rc.d kdm restart"
 
 #. type: Content of: <article><section><section><para>
 msgid "(with thanks to Finn-Arne Johansen)"
@@ -7127,11 +7125,11 @@ msgstr ""
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 msgstr ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"Alle Schüler dieser Schulel\"]]"
+"             comment=\"Alle Schüler dieser Schulel\""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -7628,10 +7626,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Remote Desktop"
@@ -8285,7 +8283,7 @@ msgid ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
 "# Das tar.gz-Archiv verschieben in ein Depot-Verzeichnis des Schulnetz-Webservers (voreingestellt auf »tjener«):\n"
 "root at tjener:~# \n"
@@ -8294,7 +8292,7 @@ msgstr ""
 "# In das neue Verzeichnis wechseln\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# Das Archiv entpacken\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Add the needed packages to the PXE installation image"
@@ -8316,12 +8314,12 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Update the preseed file:"
@@ -8329,8 +8327,8 @@ msgstr "Die Preseed-Datei aktualisieren:"
 
 #. type: CDATA
 #, no-wrap
-msgid "/usr/sbin/debian-edu-pxeinstall]]"
-msgstr "/usr/sbin/debian-edu-pxeinstall]]"
+msgid "/usr/sbin/debian-edu-pxeinstall"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8361,10 +8359,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 msgstr ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Start the editor like this:"
@@ -8372,8 +8370,8 @@ msgstr "Starten Sie den Editor folgendermaßen."
 
 #. type: CDATA
 #, no-wrap
-msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
-msgstr "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
+msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
+msgstr "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Add the repository key and install the software:"
@@ -8388,14 +8386,14 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "ltsp-chroot -a i386 wget http://www/debian/swbuild.asc\n"
 "ltsp-chroot -a i386 apt-key add swbuild.asc\n"
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -8834,11 +8832,20 @@ msgstr "Neuerungen in Debian Edu Squeeze"
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
 msgstr ""
-"Neuerungen in Debian Edu 6.0.6+r1, Codename »Squeeze«, *UN*released as of "
-"2013-0?-??"
+"Neuerungen in Debian Edu 6.0.7+r1, Codename »Squeeze«, freigegeben am "
+"03.03.2013"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
+"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
+"well as the following changes:"
+msgstr ""
+"Debian Edu 6.0.7+r1 Codename »Squeeze« ist ein inkrementelles Update von "
+"Debian Edu 6.0.4+r0, das alle Änderungen zwischen Debian 6.0.4 bis 6.0.7 "
+"sowie die folgenden Änderungen enthält::"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
@@ -8853,22 +8860,32 @@ msgid "Comply with 3.X kernel"
 msgstr "Kompatibel mit Kernelversionen 3.X"
 
 #. 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"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
 msgstr ""
-"debian-edu-doc wurde von  1.4~20120310~6.0.4+r0  auf 1.4~20120925~6.0.6+r0 "
+"debian-edu-doc wurde von  1.4~20120310~6.0.4+r0  auf 1.4~20130227~6.0.7+r1 "
 "aktualisiert"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Minor updates from the wiki"
-msgstr "Geringfügige Aktualisierungen  "
+msgstr "Geringfügige Aktualisierungen"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Danish translation now complete"
-msgstr "Die Übersetzung ins Dänische ist nun vollständig"
+msgstr "Die Übersetzung ins Dänische ist nun vollständig."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
-msgstr "debian-edu-config wurde von 1.453 auf 1.454 aktualisiert"
+msgid "debian-edu-config from 1.453 to 1.455"
+msgstr "debian-edu-config wurde von 1.453 auf 1.455 aktualisiert."
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
+msgstr ""
+"Die Datei /etc/hosts wurde für Diskless Clients berichtigt. Bug #699880 "
+"geschlossen."
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make ltsp_local_mount script work for multiple devices."
+msgstr "Das Skript ltsp_local_mount funktioniert nun für mehrere Geräte."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -8931,21 +8948,13 @@ msgid "Add Danish web page"
 msgstr "Dänische Webseite wurde hinzugefügt"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
-msgstr "debian-edu-install aktualisiert von 1.528 auf 1.529"
+msgid "debian-edu-install from 1.528 to 1.530"
+msgstr "debian-edu-install aktualisiert von 1.528 auf 1.530"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Improve preseeding support and documentation"
 msgstr "Verbesserte Unterstützung von Preseeding, bessere Dokumentation "
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
@@ -9326,13 +9335,13 @@ msgstr ""
 
 #. 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."
+"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
+"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 "Das Benutzerhandbuch für Debian Edu »Squeeze« wurde vollständig ins "
-"Deutsche, Französische und Italienische übersetzt. Teilweise übersetzte "
-"Versionen gibt es in Dänisch (neu), Norwegisch Bokmål und in Spanisch."
+"Deutsche, Französische Italienische und Dänisch (neu) übersetzt. Teilweise "
+"übersetzte Versionen gibt es in Norwegisch Bokmål und in Spanisch."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to many language tasks, especially French and Danish."
@@ -9757,11 +9766,12 @@ 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."
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
 "Die italienische Übersetzung wurde erstellt und ist Copyright von Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013). Sie ist unter der GPL2 oder "
-"späteren Versionen lizenziert."
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013). Sie ist unter der "
+"GPL2 oder späteren Versionen lizenziert."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9785,11 +9795,11 @@ 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013) und ist unter "
-"der GPL2 oder später lizenziert."
+"Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013) und ist "
+"unter der GPL2 oder später lizenziert."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
@@ -9817,7 +9827,7 @@ 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) "
+"manual-translations</computeroutput>. The Git 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."
@@ -9825,49 +9835,47 @@ msgstr ""
 "Wie bei vielen anderen Software-Projekten werden Übersetzungen dieses "
 "Dokuments mit PO-Dateien organisiert. Mehr Information über den Prozess "
 "finden Sie in <computeroutput>usr/share/doc/debian-edu-doc/README.debian-edu-"
-"squeeze-manual-translations</computeroutput>. Das Subversion-Repository "
-"(siehe unten) enthält diese Datei ebenfalls. Werfen Sie einen Blick hinein "
-"und schauen Sie sich ebenso die <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Contribute/Translation/Conventions#\"> sprachabhängigen "
-"Konventionen</ulink> an, wenn Sie bei der Übersetzung mithelfen wollen."
+"squeeze-manual-translations</computeroutput>. Das Git-Repository (siehe "
+"unten) enthält diese Datei ebenfalls. Werfen Sie einen Blick hinein und "
+"schauen Sie sich ebenso die <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Contribute/Translation/Conventions#\"> sprachabhängigen Konventionen</ulink> "
+"an, wenn Sie bei der Übersetzung mithelfen wollen."
 
 #. 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 "
+"check out some files from from Git (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 ""
 "Um Ihre Übersetzungen übermitteln zu können, müssen Sie ein Mitglied des "
 "Alioth-Projektes <computeroutput>debian-edu</computeroutput> sein. Um nur zu "
-"übersetzen, müssen die Dateien einfach (anonym) aus Subversion "
-"heruntergeladen und bearbeitet werden. Anschließend melden Sie einen Fehler "
-"zum Paket »debian-edu-doc« und hängen die PO-Datei an den <ulink url="
-"\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink> an. Hier sind "
-"weitere Informationen zum <ulink url=\"http://bugs.debian.org\">Melden eines "
-"Fehlers</ulink>."
+"übersetzen, müssen die Dateien einfach (anonym) aus Git heruntergeladen und "
+"bearbeitet werden. Anschließend melden Sie einen Fehler zum Paket »debian-"
+"edu-doc« und hängen die PO-Datei an den <ulink url=\"http://bugs.debian.org/"
+"debian-edu-doc\">bugreport</ulink> an. Hier sind weitere Informationen zum "
+"<ulink url=\"http://bugs.debian.org\">Melden eines Fehlers</ulink>."
 
 #. 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):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "Um die <computeroutput>debian-edu-doc</computeroutput> Quellen anonym "
 "auszuchecken, können Sie den folgenden Befehl benutzen (dazu muss das Paket "
-"<computeroutput>subversion</computeroutput> installiert sein):"
+"<computeroutput>git</computeroutput> installiert sein):"
 
 #. 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>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9883,12 +9891,12 @@ 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."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
-"Dann können Sie die Änderung entweder direkt in Subversion einpflegen (wenn "
-"Sie die entsprechenden Rechte dafür haben) oder die Datei an die "
-"Fehlermeldung anhängen."
+"Dann können Sie die Änderung entweder direkt in Git einpflegen (wenn Sie die "
+"entsprechenden Rechte dafür haben) oder die Datei an die Fehlermeldung "
+"anhängen."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9900,8 +9908,8 @@ msgstr ""
 "computeroutput>:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9913,8 +9921,8 @@ msgstr ""
 "translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
 "Übersetzungen aktualisieren wollen."
 
-#.  <remark>
-#. status ignore</remark> 
+#. <remark>
+#. status ignore</remark>
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -9926,29 +9934,27 @@ 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\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
-"Information über Alioth (auf dem sich das Subversion-Repository befindet) "
-"und Subversion ist unter <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/> "
-"verfügbar."
+"Information über Alioth (auf dem sich das Git-Repository befindet) und Git "
+"ist unter <ulink url=\"http://wiki.debian.org/Alioth/Git\"/> verfügbar."
 
 #. 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."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
-"Wenn Subversion für Sie neu ist, schauen Sie sich das <ulink url=\"http://"
-"svnbook.org\">SVN-Book</ulink> an. Es hat ein Kapitel über den <ulink url="
-"\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">grundlegenden Ablauf von "
-"SVN</ulink>. Wenn Sie eine graphische Benutzeroberfläche satt der "
-"Befehlszeile für Subversion verwenden möchten, können Sie das "
-"<computeroutput>kdesvn</computeroutput>-Paket verwenden."
+"Wenn Git für Sie neu ist, dann schauen Sie sich das Buch <ulink url=\"http://"
+"git-scm.com/book\">Pro Git</ulink> an; es hat ein Kapitel über <ulink url="
+"\"http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository"
+"\">das Aufzeichnen von Änderungen im Repository</ulink>. Sie könnten sich "
+"auch das Paket <computeroutput>gitk</computeroutput> ansehen, das eine "
+"graphische Benutzeroberfläche für Git bereitstellt."
 
 #. type: Content of: <article><section><section><para>
 msgid "Please report any problems."
@@ -9960,8 +9966,8 @@ msgstr "Anhang A - The GNU General Public Licence"
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
-msgstr "Für Übersetzer: Die GPL muss nicht übersetzt werden. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Für Übersetzer: Die GPL muss nicht übersetzt werden."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
index 22db15e..3cfa387 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-23 15:07-0400\n"
+"POT-Creation-Date: 2013-02-24 13:55-0400\n"
 "PO-Revision-Date: 2012-06-16 18:34-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -27,12 +27,12 @@ msgid "en"
 msgstr "es"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
-msgstr "Debian Edu / Skolelinux 6.0.6+r1 Squeeze"
+msgid "Debian Edu / Skolelinux Squeeze 6.0.7+r1 Manual"
+msgstr "Debian Edu / Skolelinux 6.0.7+r1 Squeeze"
 
 #. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
-msgstr "Manual para Debian-Edu 6.0.6+r1 rc2 nombre código \"Squeeze\""
+msgid "Manual for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
+msgstr "Manual para Debian-Edu 6.0.7+r1 rc2 nombre código \"Squeeze\""
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/welcome_to_tjener.png"
@@ -43,8 +43,8 @@ msgid "Debian Edu login"
 msgstr "Inicio de sesión Debian Edu"
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
-msgstr "Este es el manual de Debian-Edu Squeeze 6.0.6+r1"
+msgid "This is the manual for the Debian Edu Squeeze 6.0.7+r1 release."
+msgstr "Este es el manual de Debian-Edu Squeeze 6.0.7+r1"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -1675,7 +1675,7 @@ msgstr ""
 #| "Download the installation media for Debian Edu 6.0.3 beta1 Codename "
 #| "\"Squeeze\""
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
 msgstr ""
 "Descargar un formato de instalación para Debian Edu 6.0.3 beta1 \"Squeeze\""
 
@@ -1706,8 +1706,8 @@ msgstr ""
 #| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 #| "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
@@ -1718,8 +1718,8 @@ msgstr ""
 #| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 #| "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
@@ -1730,8 +1730,8 @@ msgstr ""
 #| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/"
 #| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
 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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -1756,8 +1756,8 @@ msgstr ""
 #| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 #| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1768,8 +1768,8 @@ msgstr ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 #| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1780,8 +1780,8 @@ msgstr ""
 #| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/"
 #| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
 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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -1804,8 +1804,8 @@ msgstr "Los archivos fuente estan disponibles vía: "
 #| "edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
 #| "ulink>"
 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
@@ -1818,8 +1818,8 @@ msgstr ""
 #| "edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
 #| "ulink>"
 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
@@ -1831,8 +1831,8 @@ msgstr ""
 #| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/"
 #| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
 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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -2583,11 +2583,11 @@ msgstr ""
 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.skolelinux.org/skolelinux squeeze local"
 msgstr ""
 "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.skolelinux.org/skolelinux squeeze local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2923,8 +2923,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "d-i    pkgsel/include string my-extra-package(s)]]"
-msgstr "d-i    pkgsel/include string my-extra-package(s)]]"
+msgid "d-i    pkgsel/include string my-extra-package(s)"
+msgstr "d-i    pkgsel/include string my-extra-package(s)"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -3737,7 +3737,7 @@ msgid ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -4014,7 +4014,7 @@ msgid ""
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4122,7 +4122,7 @@ msgid ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -4622,7 +4622,7 @@ msgstr ""
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4734,8 +4734,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
-msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
+msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5264,14 +5264,14 @@ msgid ""
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 msgstr ""
 "etckeeper vcs log\n"
 "etckeeper vcs status\n"
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Usage examples"
@@ -5291,8 +5291,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs log]]"
-msgstr "etckeeper vcs log]]"
+msgid "etckeeper vcs log"
+msgstr "etckeeper vcs log"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -5302,8 +5302,8 @@ msgstr "Vea que archivos no están siendo seguidos, o los que no estan al día."
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs status]]"
-msgstr "etckeeper vcs status]]"
+msgid "etckeeper vcs status"
+msgstr "etckeeper vcs status"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5312,9 +5312,9 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "etckeeper vcs status]]"
-msgid "etckeeper vcs commit -a /etc/resolv.conf]]"
-msgstr "etckeeper vcs status]]"
+#| msgid "etckeeper vcs status"
+msgid "etckeeper vcs commit -a /etc/resolv.conf"
+msgstr "etckeeper vcs status"
 
 #. type: Content of: <article><section><section><title>
 msgid "Resizing Partitions"
@@ -5391,7 +5391,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5419,17 +5419,17 @@ msgstr ""
 #| "$ sudo apt-get update\n"
 #| "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 #| "  # after intallation, start a graphical session for user localadmin\n"
-#| "  $ startx]]"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 msgstr ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after intallation, start a graphical session for user localadmin\n"
-"  $ startx]]"
+"  $ startx"
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
@@ -5448,7 +5448,7 @@ msgstr "Lo siguiente necesita ser ejecutado:"
 
 #. type: CDATA
 #, no-wrap
-msgid "ldapvi --ldap-conf -ZD '(cn=admin)']]"
+msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5539,7 +5539,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5570,10 +5570,10 @@ msgstr "Insertar el CD/DVD en la unidad, montarlo y usar el comando apt-cdrom:"
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 msgstr ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 
 #. type: Content of: <article><section><section><para>
 msgid "To quote the apt-cdrom(8) man page:"
@@ -5608,10 +5608,10 @@ msgstr "Luego ejecuta estos dos comandos para actualizar el sistema:"
 #, fuzzy, no-wrap
 msgid ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 msgstr ""
 "apt-get update \n"
-"apt-get dist-upgrade ]]"
+"apt-get dist-upgrade"
 
 #. type: Content of: <article><section><section><title>
 msgid "Java"
@@ -5676,7 +5676,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5732,7 +5732,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5776,8 +5776,8 @@ msgstr "Para instalar ejecuta el siguiente comando como root:"
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install killer]]"
-msgstr "apt-get install killer]]"
+msgid "apt-get install killer"
+msgstr "apt-get install killer"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic installation of security upgrades"
@@ -5800,8 +5800,8 @@ msgstr "Para instalar ejecuta el siguiente comando como root:"
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges]]"
-msgstr "apt-get install unattended-upgrades apt-listchanges]]"
+msgid "apt-get install unattended-upgrades apt-listchanges"
+msgstr "apt-get install unattended-upgrades apt-listchanges"
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
@@ -5888,7 +5888,7 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5904,7 +5904,7 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6057,7 +6057,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6094,8 +6094,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde]]"
-msgstr "apt-get install gnome lxde]]"
+msgid "apt-get install gnome lxde"
+msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6137,8 +6137,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs]]"
-msgstr "apt-get install libdvdcss2 w32codecs]]"
+msgid "apt-get install libdvdcss2 w32codecs"
+msgstr "apt-get install libdvdcss2 w32codecs"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using the multimedia repository"
@@ -6160,7 +6160,7 @@ msgid ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6264,7 +6264,7 @@ msgid ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6347,7 +6347,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
+msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6401,7 +6401,7 @@ msgid ""
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6438,7 +6438,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6449,7 +6449,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6466,7 +6466,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
+msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6486,7 +6486,7 @@ msgid ""
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6541,7 +6541,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6636,7 +6636,7 @@ msgid ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6653,7 +6653,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6682,7 +6682,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_SESSION=/usr/bin/startlxde]]"
+msgid "LDM_SESSION=/usr/bin/startlxde"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6762,7 +6762,7 @@ msgstr "Edita \"/opt/ltsp/i386/etc/lts.conf\" y agrega algo como esto:"
 
 #. type: CDATA
 #, no-wrap
-msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
+msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -6789,7 +6789,7 @@ msgid ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -6870,13 +6870,13 @@ msgid ""
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386  # esto hace \"chroot /opt/ltsp/i386\" y más, también previene que los demonios inicien\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Installing additional software in the LTSP environment"
@@ -6896,14 +6896,14 @@ msgid ""
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
 "## opcionalmente, edita el archivo sources.list:\n"
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Slow login and security"
@@ -6923,7 +6923,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_DIRECTX=True]]"
+msgid "LDM_DIRECTX=True"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6974,7 +6974,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6984,7 +6984,7 @@ msgstr "Ahora estas listas para ejecutar este comando:"
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query 192.168.0.254]]"
+msgid "X -query 192.168.0.254"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7001,7 +7001,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "* # any host can get a login window]]"
+msgid "* # any host can get a login window"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7020,7 +7020,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
+msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7029,8 +7029,8 @@ msgstr "Finalmente, reinicia KDM ejecutando:"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo invoke-rc.d kdm restart]]"
-msgstr "sudo invoke-rc.d kdm restart]]"
+msgid "sudo invoke-rc.d kdm restart"
+msgstr "sudo invoke-rc.d kdm restart"
 
 #. type: Content of: <article><section><section><para>
 msgid "(with thanks to Finn-Arne Johansen)"
@@ -7116,7 +7116,7 @@ msgstr ""
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -7496,7 +7496,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -8013,7 +8013,7 @@ msgid ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -8040,7 +8040,7 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8049,7 +8049,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/usr/sbin/debian-edu-pxeinstall]]"
+msgid "/usr/sbin/debian-edu-pxeinstall"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8082,7 +8082,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8091,7 +8091,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
+msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8106,7 +8106,7 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -8511,13 +8511,19 @@ msgstr "Nuevas características en Debin Edu Squeeze"
 #| msgid ""
 #| "New in Debian Edu 6.0.3 beta2 Codename \"Squeeze\" released 2012-01-07"
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
 msgstr ""
-"Nuevas características en Debian Edu 6.0.6+r1 nombre código \"Squeeze\" "
+"Nuevas características en Debian Edu 6.0.7+r1 nombre código \"Squeeze\" "
 "publicado el 11-03-2012"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
+"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
+"well as the following changes:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
 
@@ -8530,7 +8536,7 @@ msgid "Comply with 3.X kernel"
 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"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8542,7 +8548,15 @@ msgid "Danish translation now complete"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+msgid "debian-edu-config from 1.453 to 1.455"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8595,19 +8609,13 @@ 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"
+msgid "debian-edu-install from 1.528 to 1.530"
 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><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 ""
 "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
@@ -8961,9 +8969,9 @@ msgstr ""
 
 #. 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."
+"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
+"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9359,8 +9367,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released "
-"under the GPL2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
 "La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
 "está bajo la licencia GPL2 o versiones posteriores."
@@ -9391,7 +9399,7 @@ 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) "
+"manual-translations</computeroutput>. The Git 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."
@@ -9402,8 +9410,8 @@ msgstr ""
 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 "
+"check out some files from from Git (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."
@@ -9417,8 +9425,7 @@ msgstr ""
 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):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
 "esta imagen como un archivo <computeroutput>dia</computeroutput>."
@@ -9426,8 +9433,8 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::/skolelinux-cd/squeeze-alpha/"
 "debian-edu-6.0.0+edua1-DVD.iso</computeroutput>"
@@ -9442,8 +9449,8 @@ 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."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -9453,8 +9460,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9473,25 +9480,24 @@ 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\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 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."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
 "¡Si quiere empezar a traducir puede! Lea /usr/share/doc/debian-edu-doc/"
 "README.release-manual-translations con información sobre como crear un "
 "archivo po para su idioma, y como actualizarlo desde <ulink url=\"http://"
-"wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&"
+"wiki.skolelinux.no/DebianEdu/Documentation/Lenny/AllInOne?action=format&"
 "mimetype=xml/docbook\">los fuentes</ulink>."
 
 #. type: Content of: <article><section><section><para>
@@ -9506,7 +9512,7 @@ msgstr "Apéndice A - La Licencia Pública GNU (GPL)"
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -10688,6 +10694,58 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ ". Para trabajar sobre ellas sólo necesita descargarlas anónimamente desde "
+#~ "svn, cree parches y envíelas a <ulink url=\"mailto:debian-edu at l.d.o"
+#~ "\">debian-edu at l.d.o</ulink> o ponga un bug al paquete debian-edu-doc."
+
+#, fuzzy
+#~ 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):"
+#~ msgstr ""
+#~ "El fuente del paquete <computeroutput>debian-edu-doc</"
+#~ "computeroutput>incluye esta imagen como un archivo <computeroutput>dia</"
+#~ "computeroutput>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::/skolelinux-cd/squeeze-alpha/"
+#~ "debian-edu-6.0.0+edua1-DVD.iso</computeroutput>"
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#, fuzzy
+#~ 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 ""
+#~ "¡Si quiere empezar a traducir puede! Lea /usr/share/doc/debian-edu-doc/"
+#~ "README.release-manual-translations con información sobre como crear un "
+#~ "archivo po para su idioma, y como actualizarlo desde <ulink url=\"http://"
+#~ "wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?"
+#~ "action=format&mimetype=xml/docbook\">los fuentes</ulink>."
+
+#, fuzzy
 #~| msgid ""
 #~| "1. Create a user with membership in the \"admins\" group (if not already "
 #~| "existing)"
@@ -10766,10 +10824,10 @@ msgstr ""
 #~ msgid ""
 #~ "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie "
 #~ "it also prevents daemons from being started\n"
-#~ "editor /etc/apt/sources.list]]"
+#~ "editor /etc/apt/sources.list"
 #~ msgstr ""
 #~ "apt-get update \n"
-#~ "apt-get dist-upgrade ]]"
+#~ "apt-get dist-upgrade"
 
 #, fuzzy
 #~| msgid ""
@@ -11579,7 +11637,7 @@ msgstr ""
 #~ "homeDirectory = /skole/tjener/home0/2009/%username%\n"
 #~ "groups = none students 2009\n"
 #~ "loginShell = /bin/bash\n"
-#~ "mailMessageStore = /var/lib/maildirs/%username%]]"
+#~ "mailMessageStore = /var/lib/maildirs/%username%"
 #~ msgstr ""
 #~ "[2009]\n"
 #~ "ou = \"ou=People,%base%\"\n"
@@ -11587,7 +11645,7 @@ msgstr ""
 #~ "homeDirectory = /skole/tjener/home0/2009/%username%\n"
 #~ "groups = none students 2009\n"
 #~ "loginShell = /bin/bash\n"
-#~ "mailMessageStore = /var/lib/maildirs/%username%]]"
+#~ "mailMessageStore = /var/lib/maildirs/%username%"
 
 #~ msgid ""
 #~ "To make this work, the 2009 group has to be created before adding the "
@@ -11669,8 +11727,8 @@ msgstr ""
 #~ msgstr "16-Configure_the_keyboard.png"
 
 #, fuzzy
-#~ msgid "# apt-get update]]"
-#~ msgstr "apt-get dist-upgrade]]"
+#~ msgid "# apt-get update"
+#~ msgstr "apt-get dist-upgrade"
 
 #~ msgid "Now you are ready to run this command:"
 #~ msgstr "Ahora estas listas para ejecutar este comando:"
@@ -12400,8 +12458,8 @@ msgstr ""
 #~ "en modo texto para amd64"
 
 #, fuzzy
-#~ msgid "apt-get install italc-client italc-master]]"
-#~ msgstr "apt-get -f install]]"
+#~ msgid "apt-get install italc-client italc-master"
+#~ msgstr "apt-get -f install"
 
 #, fuzzy
 #~ msgid ""
@@ -12762,11 +12820,11 @@ msgstr ""
 #~ msgid ""
 #~ "Added user: Demo User\n"
 #~ "username: demuse\n"
-#~ "password: somethingsecret]]"
+#~ "password: somethingsecret"
 #~ msgstr ""
 #~ "Usuario agregado: Usuario Demo\n"
 #~ "username: demuse\n"
-#~ "password: secret]]"
+#~ "password: secret"
 
 #~ msgid ""
 #~ "You may miss the option to set a password, that has been set "
@@ -13462,47 +13520,47 @@ msgstr ""
 #~ msgid ""
 #~ "/etc/init.d/squid stop\n"
 #~ "umount /var/spool/squid\n"
-#~ "umount -fl /var ]]"
+#~ "umount -fl /var"
 #~ msgstr ""
 #~ "/etc/init.d/squid stop \n"
 #~ "umount /var/spool/squid\n"
-#~ "umount -fl /var ]]"
+#~ "umount -fl /var"
 
-#~ msgid "e2fsck -f /dev/vg_system/lv_data ]]"
-#~ msgstr "e2fsck -f /dev/vg_system/lv_data ]]"
+#~ msgid "e2fsck -f /dev/vg_system/lv_data"
+#~ msgstr "e2fsck -f /dev/vg_system/lv_data"
 
 #, fuzzy
 #~ msgid "3.) resize the partition:"
 #~ msgstr "Preparar el sistema"
 
-#~ msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
-#~ msgstr "lvextend -L +1GB /dev/vg_system/lv_data ]]"
+#~ msgid "lvextend -L +1GB /dev/vg_system/lv_data"
+#~ msgstr "lvextend -L +1GB /dev/vg_system/lv_data"
 
 #, fuzzy
 #~ msgid "4.) resize the filesystem:"
 #~ msgstr "Preparar el sistema"
 
-#~ msgid "resize2fs /dev/vg_system/lv_data]]"
-#~ msgstr "resize2fs /dev/vg_system/lv_data]]"
+#~ msgid "resize2fs /dev/vg_system/lv_data"
+#~ msgstr "resize2fs /dev/vg_system/lv_data"
 
 #, fuzzy
 #~ msgid ""
 #~ "mount /var\n"
 #~ "mount /var/spool/squid\n"
-#~ "/etc/init.d/squid start ]]"
+#~ "/etc/init.d/squid start"
 #~ msgstr ""
 #~ "mount /var \n"
 #~ "mount /var/spool/squid\n"
-#~ "/etc/init.d/squid start ]]"
+#~ "/etc/init.d/squid start"
 
 #, fuzzy
 #~ msgid ""
 #~ "deb http://ftp.debian.org/debian lenny main\n"
 #~ "deb http://security.debian.org/ lenny/updates main \n"
-#~ "deb http://ftp.skolelinux.org/skolelinux lenny local]]"
+#~ "deb http://ftp.skolelinux.org/skolelinux lenny local"
 #~ msgstr ""
 #~ "deb http://ftp.debian.org/debian etch main contrib non-free \n"
-#~ "deb http://ftp.skolelinux.org/skolelinux etch local]]"
+#~ "deb http://ftp.skolelinux.org/skolelinux etch local"
 
 #, fuzzy
 #~ msgid "And start the upgrade with:"
@@ -13596,13 +13654,12 @@ msgstr ""
 #~ "Errors were encountered while processing:\n"
 #~ " mozilla-firefox-locale-it\n"
 #~ " mozilla-firefox-locale-el\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " mozilla-firefox-locale-it\n"
 #~ " mozilla-firefox-locale-el\n"
 #~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ "]]"
 
 #, fuzzy
 #~ msgid ""
@@ -13618,8 +13675,8 @@ msgstr ""
 #~ "ambos la línea que contiene: <emphasis>update-mozilla-firefox-chrome</"
 #~ "emphasis>. Después reinicie el proceso de actualización con:"
 
-#~ msgid "apt-get -f install]]"
-#~ msgstr "apt-get -f install]]"
+#~ msgid "apt-get -f install"
+#~ msgstr "apt-get -f install"
 
 #, fuzzy
 #~ msgid "Now the upgrade continues:"
@@ -13636,11 +13693,11 @@ msgstr ""
 #~ msgid ""
 #~ "Errors were encountered while processing:\n"
 #~ " slapd\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " /var/cache/apt/archives/courier-authlib-ldap_0.58-4_i386.deb\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 
 #~ msgid ""
 #~ "In order to fix this, rename this directory: <emphasis>/var/backups/"
@@ -13656,10 +13713,10 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "chown -R openldap:openldap /etc/ldap/\n"
-#~ "apt-get -f install]]"
+#~ "apt-get -f install"
 #~ msgstr ""
 #~ "chown -R openldap:openldap /etc/ldap/ \n"
-#~ "apt-get -f install]]"
+#~ "apt-get -f install"
 
 #, fuzzy
 #~ msgid ""
@@ -13672,8 +13729,8 @@ msgstr ""
 #~ "reinicie el proces de dist-upgrade con:"
 
 #, fuzzy
-#~ msgid "aptitude dist-upgrade]]"
-#~ msgstr "apt-get dist-upgrade]]"
+#~ msgid "aptitude dist-upgrade"
+#~ msgstr "apt-get dist-upgrade"
 
 #, fuzzy
 #~ msgid "The next error raising up is this one:"
@@ -13683,18 +13740,18 @@ msgstr ""
 #~ msgid ""
 #~ "Errors were encountered while processing:\n"
 #~ " /var/cache/apt/archives/courier-authlib-ldap_0.58-4_i386.deb\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " /var/cache/apt/archives/courier-authlib-ldap_0.58-4_i386.deb\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 
 #~ msgid "Please remove the package: <emphasis>courier-ldap</emphasis> with"
 #~ msgstr "Elimine el paquete: <emphasis>courier-ldap</emphasis>  con"
 
 #, fuzzy
-#~ msgid "aptitude remove courier-ldap]]"
-#~ msgstr "apt-get remove courier-ldap]]"
+#~ msgid "aptitude remove courier-ldap"
+#~ msgstr "apt-get remove courier-ldap"
 
 #~ msgid ""
 #~ "and wait until it is finished.Then restart the dist-upgrade process again."
@@ -13792,16 +13849,16 @@ msgstr ""
 #~ "su cuenta de administración. Si es la primera vez que visita este sitio "
 #~ "después de la instalación su nombre de usuario es:"
 
-#~ msgid "admin]]"
-#~ msgstr "admin]]"
+#~ msgid "admin"
+#~ msgstr "admin"
 
 #, fuzzy
 #~ msgid "DNS Management with lwat"
 #~ msgstr "Gestión de Usuarios"
 
 #, fuzzy
-#~ msgid "apt-get install mozilla-mplayer ]]"
-#~ msgstr "apt-get -f install]]"
+#~ msgid "apt-get install mozilla-mplayer"
+#~ msgstr "apt-get -f install"
 
 #, fuzzy
 #~ msgid "Other useful plugins"
@@ -13858,11 +13915,11 @@ msgstr ""
 #~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux\"/> etch local}}}"
 #~ msgstr ""
 #~ "deb http://ftp.debian.org/debian etch main contrib non-free \n"
-#~ "deb http://ftp.skolelinux.org/skolelinux etch local]]"
+#~ "deb http://ftp.skolelinux.org/skolelinux etch local"
 
 #, fuzzy
 #~ msgid "aptitude dist-upgrade }}}"
-#~ msgstr "apt-get dist-upgrade]]"
+#~ msgstr "apt-get dist-upgrade"
 
 #, fuzzy
 #~ msgid "E: Sub-process /usr/bin/dpkg returned an error code (1) }}}"
@@ -13870,7 +13927,6 @@ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " slapd\n"
 #~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ "]]"
 
 #, fuzzy
 #~ msgid "E: Sub-process /usr/bin/dpkg returned an error code (1)}}}"
@@ -13878,7 +13934,6 @@ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " slapd\n"
 #~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ "]]"
 
 #~ msgid "<phrase>attachment:network-arch.png</phrase>"
 #~ msgstr "<phrase>attachment:network-arch.png</phrase>"
@@ -13985,10 +14040,8 @@ msgstr ""
 #~ "Funciona tanto con konqueror como con firefox"
 
 #, fuzzy
-#~ msgid ""
-#~ "apt-get remove flashplayer-mozilla\n"
-#~ "]]"
-#~ msgstr "apt-get remove courier-ldap]]"
+#~ msgid "apt-get remove flashplayer-mozilla\n"
+#~ msgstr "apt-get remove courier-ldap"
 
 #, fuzzy
 #~ msgid ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
index f293a94..43af01e 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-01-21 19:41-0400\n"
+"POT-Creation-Date: 2013-02-24 13:55-0400\n"
 "PO-Revision-Date: 2013-01-20 22:51+0100\n"
 "Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -25,12 +25,12 @@ msgid "en"
 msgstr "fr"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
-msgstr "Manuel de Debian Edu / Skolelinux Squeeze 6.0.6+r1"
+msgid "Debian Edu / Skolelinux Squeeze 6.0.7+r1 Manual"
+msgstr "Manuel de Debian Edu / Skolelinux Squeeze 6.0.7+r1"
 
 #. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
-msgstr "Manuel de Debian Edu 6.0.6+r1 nom de code « Squeeze »"
+msgid "Manual for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
+msgstr "Manuel de Debian Edu 6.0.7+r1 nom de code « Squeeze »"
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/welcome_to_tjener.png"
@@ -41,8 +41,8 @@ msgid "Debian Edu login"
 msgstr "Connexion à Debian Edu"
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
-msgstr "Voici le manuel de la version de Debian Edu Squeeze 6.0.6+r1."
+msgid "This is the manual for the Debian Edu Squeeze 6.0.7+r1 release."
+msgstr "Voici le manuel de la version de Debian Edu Squeeze 6.0.7+r1."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -1400,9 +1400,9 @@ 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 6.0.7+r1 Codename \"Squeeze\""
 msgstr ""
-"Téléchargement d'un support d'installation pour Debian Edu 6.0.6+r1 "
+"Téléchargement d'un support d'installation pour Debian Edu 6.0.7+r1 "
 "« Squeeze »"
 
 #. type: Content of: <article><section><section><section><title>
@@ -1421,27 +1421,27 @@ 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1457,27 +1457,27 @@ 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 
 #. 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1489,27 +1489,27 @@ msgstr "Les sources sont disponibles :"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -2104,11 +2104,11 @@ msgstr ""
 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.skolelinux.org/skolelinux squeeze local"
 msgstr ""
 "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.skolelinux.org/skolelinux squeeze local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2384,8 +2384,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "d-i    pkgsel/include string my-extra-package(s)]]"
-msgstr "d-i    pkgsel/include string my-extra-package(s)]]"
+msgid "d-i    pkgsel/include string my-extra-package(s)"
+msgstr "d-i    pkgsel/include string my-extra-package(s)"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -3166,7 +3166,7 @@ msgid ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 msgstr ""
 "#!/bin/bash\n"
 "  #\n"
@@ -3184,7 +3184,7 @@ msgstr ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
@@ -3481,14 +3481,14 @@ msgid ""
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 msgstr ""
 "# Afficher la correspondance entre les groupes UNIX et Windows existants.\n"
 "net groupmap list\n"
 "\n"
 "# Ajouter vos nouveaux groupes ou les groupes manquants :\n"
 "net groupmap add unixgroup=NOUVEAU_GROUPE type=domain ntgroup=\"NOUVEAU_GROUPE\"\\\n"
-"                 comment=\"DESCRIPTION DU NOUVEAU GROUPE\"]]"
+"                 comment=\"DESCRIPTION DU NOUVEAU GROUPE\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3588,7 +3588,7 @@ msgid ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 msgstr ""
 "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"
@@ -3598,7 +3598,7 @@ msgstr ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_list.png"
@@ -4095,11 +4095,11 @@ msgstr ""
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 msgstr ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4242,8 +4242,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
-msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
+msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4687,7 +4687,7 @@ msgstr ""
 "est décrite dans le <ulink url=\"http://wiki.debian.org/DebianEdu/"
 "Documentation/Lenny#\">Manuel pour Debian Edu Lenny</ulink>. Le manuel pour "
 "Lenny contient les instructions pour mettre à jour à partir de la version "
-"précédente, Etch,"
+"précédente, Etch."
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -4810,14 +4810,14 @@ msgid ""
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 msgstr ""
 "etckeeper vcs log\n"
 "etckeeper vcs status\n"
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Usage examples"
@@ -4833,8 +4833,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs log]]"
-msgstr "etckeeper vcs log]]"
+msgid "etckeeper vcs log"
+msgstr "etckeeper vcs log"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "See which files are currently not tracked and which are not up-to-date:"
@@ -4844,8 +4844,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs status]]"
-msgstr "etckeeper vcs status]]"
+msgid "etckeeper vcs status"
+msgstr "etckeeper vcs status"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4856,8 +4856,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs commit -a /etc/resolv.conf]]"
-msgstr "etckeeper vcs commit -a /etc/resolv.conf]]"
+msgid "etckeeper vcs commit -a /etc/resolv.conf"
+msgstr "etckeeper vcs commit -a /etc/resolv.conf"
 
 #. type: Content of: <article><section><section><title>
 msgid "Resizing Partitions"
@@ -4972,10 +4972,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 msgstr ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5012,12 +5012,12 @@ msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 msgstr ""
 "$ sudo apt-get update\n"
 "$ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "# après l'installation, démarrer une session graphique pour le premier utilisateur\n"
-"$ startx]]"
+"$ startx"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using ldapvi"
@@ -5038,8 +5038,8 @@ msgstr "Vous devez exécuter ceci :"
 
 #. type: CDATA
 #, no-wrap
-msgid "ldapvi --ldap-conf -ZD '(cn=admin)']]"
-msgstr "ldapvi --ldap-conf -ZD '(cn=admin)']]"
+msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
+msgstr "ldapvi --ldap-conf -ZD '(cn=admin)'"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5164,10 +5164,10 @@ msgstr "Utiliser backport.debian.org est simple :"
 #, no-wrap
 msgid ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5207,10 +5207,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 msgstr ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 
 #. type: Content of: <article><section><section><para>
 msgid "To quote the apt-cdrom(8) man page:"
@@ -5246,10 +5246,10 @@ msgstr "Exécutez ensuite ces deux commandes pour mettre à jour le système :"
 #, no-wrap
 msgid ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 msgstr ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 
 #. type: Content of: <article><section><section><title>
 msgid "Java"
@@ -5325,7 +5325,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 msgstr ""
 "#!/bin/bash\n"
 " chemin_home=\"/skole/tjener/home0\"\n"
@@ -5345,7 +5345,7 @@ msgstr ""
 "        echo -e \"Le dossier $chemin_home/$home/$dossier existe déjà.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"Le nombre de répertoires créés est $dossiers_crees.\"]]"
+" echo \"Le nombre de répertoires créés est $dossiers_crees.\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Easy access to USB drives and CDROMs/DVDs"
@@ -5420,7 +5420,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 msgstr ""
 "#!/bin/bash\n"
 " chemin_home=\"/skole/tjener/home0\"\n"
@@ -5435,7 +5435,7 @@ msgstr ""
 "        echo -e \"le dossier $chemin_home/$home/$repertoire_partage existe déjà.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"Le nombre de dossiers créés est $dossiers_crees\"]]"
+" echo \"Le nombre de dossiers créés est $dossiers_crees\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "A warning about removable media on LTSP servers"
@@ -5492,8 +5492,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install killer]]"
-msgstr "apt-get install killer]]"
+msgid "apt-get install killer"
+msgstr "apt-get install killer"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic installation of security upgrades"
@@ -5524,8 +5524,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges]]"
-msgstr "apt-get install unattended-upgrades apt-listchanges]]"
+msgid "apt-get install unattended-upgrades apt-listchanges"
+msgstr "apt-get install unattended-upgrades apt-listchanges"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic shutdown of machines during the night"
@@ -5649,12 +5649,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5672,12 +5672,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 
 #. type: Content of: <article><section><section><title>
 msgid "Access Debian-Edu servers located behind a firewall"
@@ -5823,10 +5823,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 msgstr ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5858,8 +5858,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde]]"
-msgstr "apt-get install gnome lxde]]"
+msgid "apt-get install gnome lxde"
+msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5914,8 +5914,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs]]"
-msgstr "apt-get install libdvdcss2 w32codecs]]"
+msgid "apt-get install libdvdcss2 w32codecs"
+msgstr "apt-get install libdvdcss2 w32codecs"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using the multimedia repository"
@@ -5938,7 +5938,7 @@ msgid ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# installez le trousseau debian en toute sécurité :\n"
 "apt-get install debian-keyring\n"
@@ -5949,7 +5949,7 @@ msgstr ""
 "# ajoutez le dépôt au fichier sources.list — cherchez sur la page web un miroir près de chez vous !\n"
 "echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
 "# mettez à jour la liste des paquets disponibles :\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -6059,7 +6059,7 @@ msgid ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 msgstr ""
 "# D'abord renseignez-vous sur les paquets contenant les microprogrammes\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -6073,7 +6073,7 @@ msgstr ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <nom_paquet>\n"
 "\n"
 "# Copiez la nouvelle image initiale (« initrd ») dans le répertoire tftpboot du serveur\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
@@ -6160,8 +6160,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
-msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
+msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
+msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6227,13 +6227,13 @@ msgid ""
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 "#ajout des dépôts locaux des projets skole \n"
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Dépôt Logiciel Example\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6274,8 +6274,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6287,8 +6287,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6309,8 +6309,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
-msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
+msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6331,13 +6331,13 @@ msgid ""
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 msgstr ""
 "default ltsp\n"
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6403,8 +6403,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
-msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6539,12 +6539,12 @@ msgid ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 msgstr ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid "somewhere below the default settings."
@@ -6563,10 +6563,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 msgstr ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6605,8 +6605,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_SESSION=/usr/bin/startlxde]]"
-msgstr "LDM_SESSION=/usr/bin/startlxde]]"
+msgid "LDM_SESSION=/usr/bin/startlxde"
+msgstr "LDM_SESSION=/usr/bin/startlxde"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6722,8 +6722,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
-msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
+msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
+msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -6754,7 +6754,7 @@ msgid ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 msgstr ""
 "#!/bin/bash\n"
 "# Mélanger les éléments de la liste des serveurs contenue dans le paramètre MY_SERVER_LIST\n"
@@ -6769,7 +6769,7 @@ msgstr ""
 "for i in $LISTE_TMP; do\n"
 "    LISTE_MELANGE=\"$LISTE_MELANGE $(echo $i | cut -d_ -f2)\"\n"
 "done\n"
-"echo $LISTE_MELANGE]]"
+"echo $LISTE_MELANGE"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Part 3"
@@ -6882,13 +6882,13 @@ msgid ""
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386  # cela fait un « chroot /opt/ltsp/i386 » et plus, comme par exemple empêcher le démarrage des démons\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Installing additional software in the LTSP environment"
@@ -6910,14 +6910,14 @@ msgid ""
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot\n"
 "## si besoin, éditez sources.list :\n"
 "#vim /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $nouveau_paquet\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Slow login and security"
@@ -6946,8 +6946,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_DIRECTX=True]]"
-msgstr "LDM_DIRECTX=True]]"
+msgid "LDM_DIRECTX=True"
+msgstr "LDM_DIRECTX=True"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7018,8 +7018,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
-msgstr "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
+msgstr "X -query ltspserverXX"
 
 #. type: Content of: <article><section><section><para>
 msgid "If you are on the thin client network, run this command:"
@@ -7029,8 +7029,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query 192.168.0.254]]"
-msgstr "X -query 192.168.0.254]]"
+msgid "X -query 192.168.0.254"
+msgstr "X -query 192.168.0.254"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7052,8 +7052,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "* # any host can get a login window]]"
-msgstr "* # any host can get a login window]]"
+msgid "* # any host can get a login window"
+msgstr "* # any host can get a login window"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7069,8 +7069,8 @@ msgstr "Ensuite, lancez XDMCP dans KDM grâce à la commande :"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
-msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
+msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 
 #. type: Content of: <article><section><section><para>
 msgid "Finally, restart KDM by running:"
@@ -7078,8 +7078,8 @@ msgstr "Finalement, veuillez redémarrer KDM en lançant :"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo invoke-rc.d kdm restart]]"
-msgstr "sudo invoke-rc.d kdm restart]]"
+msgid "sudo invoke-rc.d kdm restart"
+msgstr "sudo invoke-rc.d kdm restart"
 
 #. type: Content of: <article><section><section><para>
 msgid "(with thanks to Finn-Arne Johansen)"
@@ -7156,11 +7156,11 @@ msgstr ""
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 msgstr ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"Tous les élèves de l'école\"]]"
+"             comment=\"Tous les élèves de l'école\""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -7664,10 +7664,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Remote Desktop"
@@ -8328,7 +8328,7 @@ msgid ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
 "# déplacement de l'archive tar.gz dans un répertoire de dépôt\n"
 "# dans la racine web du réseau de l'école (par défaut sur tjeners :\n"
@@ -8337,7 +8337,7 @@ msgstr ""
 "# changement de répertoire vers la racine web\n"
 "cd /etc/debian-edu/www/\n"
 "# extraction du dépôt\n"
-"tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Add the needed packages to the PXE installation image"
@@ -8357,12 +8357,12 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string Dépôt SMART\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Update the preseed file:"
@@ -8370,8 +8370,8 @@ msgstr "Mettez à jour le fichier de préconfiguration :"
 
 #. type: CDATA
 #, no-wrap
-msgid "/usr/sbin/debian-edu-pxeinstall]]"
-msgstr "/usr/sbin/debian-edu-pxeinstall]]"
+msgid "/usr/sbin/debian-edu-pxeinstall"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8402,10 +8402,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 msgstr ""
 "### Dépôt SMART\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Start the editor like this:"
@@ -8413,8 +8413,8 @@ msgstr "Lancez l'éditeur comme ceci :"
 
 #. type: CDATA
 #, no-wrap
-msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
-msgstr "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
+msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
+msgstr "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Add the repository key and install the software:"
@@ -8428,14 +8428,14 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "ltsp-chroot -a i386 wget http://10.0.2.2/dists/swbuild.asc\n"
 "ltsp-chroot -a i386 apt-key add swbuild.asc\n"
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# mettre à jour la base de données dpkg et installer les paquets souhaités\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -8875,11 +8875,16 @@ msgstr "Nouvelles fonctionnalités dans Debian Edu Squeeze"
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
+msgstr ""
+"Modifications de Debian Edu 6.0.7+r1 « Squeeze », publiée le 3 mars 2013"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
+"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
+"well as the following changes:"
 msgstr ""
-"Nouvelles fonctionnalités de Debian Edu 6.0.6+r1 « Squeeze », *non* publiée "
-"le ?? janvier 2013"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
@@ -8894,10 +8899,10 @@ msgid "Comply with 3.X kernel"
 msgstr "mise en conformité avec le noyau 3.X"
 
 #. 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"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
 msgstr ""
 "mise à jour de debian-edu-doc de la version 1.4~20120310~6.0.4+r0 vers la "
-"version 1.4~20120925~6.0.6+r0"
+"version 1.4~20130227~6.0.7+r1"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Minor updates from the wiki"
@@ -8908,9 +8913,17 @@ msgid "Danish translation now complete"
 msgstr "traduction en danois maintenant complète"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+msgid "debian-edu-config from 1.453 to 1.455"
+msgstr ""
+"mise à jour de debian-edu-config de la version 1.453 vers la version 1.455"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr ""
-"mise à jour de debian-edu-config de la version 1.453 vers la version 1.454"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -8972,23 +8985,15 @@ msgid "Add Danish web page"
 msgstr "ajout d'une page web en danois"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
+msgid "debian-edu-install from 1.528 to 1.530"
 msgstr ""
-"mise à jour de debian-edu-install de la version 1.528 à la version 1.529"
+"mise à jour de debian-edu-install de la version 1.528 à la version 1.530"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Improve preseeding support and documentation"
 msgstr ""
 "amélioration de la prise en charge du préamorçage et de la documentation"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
@@ -9016,7 +9021,7 @@ msgid ""
 msgstr ""
 "Remplacement de LWAT par GOsa² en tant qu'interface d'administration LDAP. "
 "Voir plus loin et le chapitre <link linkend=\"GettingStarted\">Démarrage "
-"Rapide</link> du manuel pour plus d'informations sur GOsa²."
+"rapide</link> du manuel pour plus d'informations sur GOsa²."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "See below for a list of updated software."
@@ -9100,7 +9105,7 @@ msgid ""
 "www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
 "for more details."
 msgstr ""
-"Nouvelle version de debian-installer de Debian Squeeze. Consultez le <ulink "
+"Nouvelle version de l'installateur Debian de Squeeze. Consultez le <ulink "
 "url=\"http://www.debian.org/releases/squeeze/installmanual\">manuel "
 "d'installation</ulink> pour plus de détails."
 
@@ -9373,13 +9378,13 @@ msgstr ""
 
 #. 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."
+"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
+"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 "Le manuel de Debian Edu Squeeze est traduit entièrement en allemand, "
-"français et italien. Des traductions partielles existent en danois "
-"(nouveau), espagnol et norvégien Bokmål."
+"français, italien et danois (nouveau). Des traductions partielles existent "
+"en espagnol et norvégien Bokmål."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to many language tasks, especially French and Danish."
@@ -9800,11 +9805,12 @@ 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."
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
 "La traduction italienne, dont les droits d'auteur appartiennent à Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013), est distribuée sous GPL2 ou "
-"toute version ultérieure."
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013), est distribuée sous "
+"GPL2 ou toute version ultérieure."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9829,8 +9835,8 @@ 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
 "(2012, 2013), est distribuée sous GPL2 ou toute version ultérieure."
@@ -9861,7 +9867,7 @@ 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) "
+"manual-translations</computeroutput>. The Git 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."
@@ -9869,25 +9875,25 @@ msgstr ""
 "Les traductions de ce document sont conservées dans des fichiers PO comme "
 "pour de nombreux projets de logiciels libres, lisez <computeroutput>/usr/"
 "share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations</"
-"computeroutput> pour plus d'informations à ce propos. Le dépôt Subversion "
-"(voir ci-dessous) contient également ce fichier. Jetez y un œil, ainsi qu'à "
-"la page traitant des <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Contribute/Translation/Conventions#\">conventions spécifiques à une langue</"
-"ulink> si vous voulez aider à traduire ce document."
+"computeroutput> pour plus d'informations à ce propos. Le dépôt Git (voir ci-"
+"dessous) contient également ce fichier. Jetez y un œil, ainsi qu'à la page "
+"traitant des <ulink url=\"http://wiki.debian.org/DebianEdu/Contribute/"
+"Translation/Conventions#\">conventions spécifiques à une langue</ulink> si "
+"vous voulez aider à traduire ce document."
 
 #. 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 "
+"check out some files from from Git (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 ""
 "Pour enregistrer vos traductions, vous devez être membre du projet Alioth "
 "<computeroutput>debian-edu</computeroutput>. Pour traduire, vous n'avez qu'à "
-"importer quelques fichiers depuis le dépôt Subversion (ce qui peut être fait "
+"importer quelques fichiers depuis le dépôt Git (ce qui peut être fait "
 "anonymement), et créer des rustines (patches). Remplissez un <ulink url="
 "\"http://bugs.debian.org/debian-edu-doc\">rapport de bogue</ulink> sur le "
 "paquet debian-edu-doc et joignez le fichier PO. Vous trouverez <ulink url="
@@ -9898,21 +9904,19 @@ msgstr ""
 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):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "Vous pouvez télécharger le source du paquet <computeroutput>debian-edu-doc</"
 "computeroutput> anonymement à l'aide de la commande suivante (vous devez "
-"avoir installé le paquet <computeroutput>subversion</computeroutput> pour "
-"cela) :"
+"avoir installé le paquet <computeroutput>git</computeroutput> pour cela) :"
 
 #. 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>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9929,12 +9933,12 @@ 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."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
-"Ensuite, soit vous enregistrez directement le fichier dans le dépôt "
-"Subversion (si vous possédez les droits nécessaires), soit vous joignez le "
-"fichier au rapport de bogue."
+"Ensuite, soit vous enregistrez directement le fichier dans le dépôt Git (si "
+"vous possédez les droits nécessaires), soit vous joignez le fichier au "
+"rapport de bogue."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9945,8 +9949,8 @@ msgstr ""
 "suivante dans le répertoire <computeroutput>debian-edu-doc</computeroutput> :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9970,30 +9974,28 @@ 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\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
 "Des informations de base à propos de Alioth (la machine hébergeant notre "
-"dépôt Subversion) et de Subversion sont disponibles à <ulink url=\"http://"
-"wiki.debian.org/Alioth/Svn\"/>."
+"dépôt Git) et de Git sont disponibles à <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
 
 #. 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."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
-"Si vous ne connaissez pas Subversion, consultez le livre <ulink url=\"http://"
-"svnbook.org\">Gestion de versions avec Subversion</ulink>. Il contient un "
-"chapitre concernant le <ulink url=\"http://svnbook.red-bean.com/nightly/fr/"
-"svn.tour.cycle.html\">cycle de travail de base</ulink>. Vous voudrez peut "
-"être également utiliser le paquet <computeroutput>kdesvn</computeroutput> si "
-"vous préférez utiliser un client graphique pour Subversion au lieu de la "
-"ligne de commande."
+"Si vous ne connaissez pas Git, consultez le livre <ulink url=\"http://git-"
+"scm.com/book\">Pro Git</ulink>. Il contient un chapitre concernant l'<ulink "
+"url=\"http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-"
+"Repository\">enregistrement de modifications dans le dépôt</ulink>. Vous "
+"voudrez peut être également utiliser le paquet <computeroutput>gitk</"
+"computeroutput> qui fournit un client graphique pour Git."
 
 #. type: Content of: <article><section><section><para>
 msgid "Please report any problems."
@@ -10005,8 +10007,8 @@ msgstr "Annexe A — La Licence Publique Générale GNU"
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
-msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la licence GPL.]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la licence GPL."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -11317,6 +11319,105 @@ msgstr ""
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
 #~ msgid ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+#~ msgstr ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+
+#~ 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."
+#~ msgstr ""
+#~ "Les traductions de ce document sont conservées dans des fichiers PO comme "
+#~ "pour de nombreux projets de logiciels libres, lisez <computeroutput>/usr/"
+#~ "share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations</"
+#~ "computeroutput> pour plus d'informations à ce propos. Le dépôt Subversion "
+#~ "(voir ci-dessous) contient également ce fichier. Jetez y un œil, ainsi "
+#~ "qu'à la page traitant des <ulink url=\"http://wiki.debian.org/DebianEdu/"
+#~ "Contribute/Translation/Conventions#\">conventions spécifiques à une "
+#~ "langue</ulink> si vous voulez aider à traduire ce document."
+
+#~ 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."
+#~ msgstr ""
+#~ "Pour enregistrer vos traductions, vous devez être membre du projet Alioth "
+#~ "<computeroutput>debian-edu</computeroutput>. Pour traduire, vous n'avez "
+#~ "qu'à importer quelques fichiers depuis le dépôt Subversion (ce qui peut "
+#~ "être fait anonymement), et créer des rustines (patches). Remplissez un "
+#~ "<ulink url=\"http://bugs.debian.org/debian-edu-doc\">rapport de bogue</"
+#~ "ulink> sur le paquet debian-edu-doc et joignez le fichier PO. Vous "
+#~ "trouverez <ulink url=\"http://bugs.debian.org\">ici</ulink> des "
+#~ "explications sur comment soumettre des rapports de bogues."
+
+#~ 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):"
+#~ msgstr ""
+#~ "Vous pouvez télécharger le source du paquet <computeroutput>debian-edu-"
+#~ "doc</computeroutput> anonymement à l'aide de la commande suivante (vous "
+#~ "devez avoir installé le paquet <computeroutput>subversion</"
+#~ "computeroutput> pour cela) :"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#~ 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 ""
+#~ "Ensuite, soit vous enregistrez directement le fichier dans le dépôt "
+#~ "Subversion (si vous possédez les droits nécessaires), soit vous joignez "
+#~ "le fichier au rapport de bogue."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#~ 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 ""
+#~ "Des informations de base à propos de Alioth (la machine hébergeant notre "
+#~ "dépôt Subversion) et de Subversion sont disponibles à <ulink url=\"http://"
+#~ "wiki.debian.org/Alioth/Svn\"/>."
+
+#~ 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 ""
+#~ "Si vous ne connaissez pas Subversion, consultez le livre <ulink url="
+#~ "\"http://svnbook.org\">Gestion de versions avec Subversion</ulink>. Il "
+#~ "contient un chapitre concernant le <ulink url=\"http://svnbook.red-bean."
+#~ "com/nightly/fr/svn.tour.cycle.html\">cycle de travail de base</ulink>. "
+#~ "Vous voudrez peut être également utiliser le paquet "
+#~ "<computeroutput>kdesvn</computeroutput> si vous préférez utiliser un "
+#~ "client graphique pour Subversion au lieu de la ligne de commande."
+
+#~ msgid ""
 #~ "Create a user with membership in the \"admins\" group (if not already "
 #~ "existing)"
 #~ msgstr ""
@@ -11476,11 +11577,11 @@ msgstr ""
 #~ msgid ""
 #~ "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie "
 #~ "it also prevents daemons from being started\n"
-#~ "editor /etc/apt/sources.list]]"
+#~ "editor /etc/apt/sources.list"
 #~ msgstr ""
 #~ "ltsp-chroot -a i386  # cela fait un « chroot /opt/ltsp/i386 » et plus, "
 #~ "comme par exemple empêcher le démarrage des démons\n"
-#~ "editor /etc/apt/sources.list]]"
+#~ "editor /etc/apt/sources.list"
 
 #~ msgid "And now do:"
 #~ msgstr "Et maintenant, exécutez les commandes suivantes :"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
index 765986c..66af63c 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-lenny-manual\n"
-"POT-Creation-Date: 2013-01-23 15:07-0400\n"
+"POT-Creation-Date: 2013-02-24 13:55-0400\n"
 "PO-Revision-Date: 2013-01-23 19:02+0100\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -23,12 +23,12 @@ msgid "en"
 msgstr "it"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
-msgstr "Manuale di Debian Edu / Skolelinux Squeeze 6.0.6+r1"
+msgid "Debian Edu / Skolelinux Squeeze 6.0.7+r1 Manual"
+msgstr "Manuale di Debian Edu / Skolelinux Squeeze 6.0.7+r1"
 
 #. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
-msgstr "Manuale per Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+msgid "Manual for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
+msgstr "Manuale per Debian Edu 6.0.7+r1 Codename Squeeze"
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/welcome_to_tjener.png"
@@ -39,8 +39,8 @@ msgid "Debian Edu login"
 msgstr "Debian Edu login"
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
-msgstr "Questa è la guida  per Debian Edu Squeeze 6.0.6+r1 release."
+msgid "This is the manual for the Debian Edu Squeeze 6.0.7+r1 release."
+msgstr "Questa è la guida  per Debian Edu Squeeze 6.0.7+r1 release."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -1361,10 +1361,10 @@ 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 6.0.7+r1 Codename \"Squeeze\""
 msgstr ""
-"Download del supporto di installazione per Debian Edu 6.0.6+r1 Codename "
-"\"Squeeze\""
+"Download del supporto di installazione per Debian Edu 6.0.7+r1 Codename "
+"Squeeze"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "DVD for i386, amd64"
@@ -1382,27 +1382,27 @@ 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1418,27 +1418,27 @@ 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 
 #. 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1450,27 +1450,27 @@ msgstr "I sorgenti sono disponibili via"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 
 #. 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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 msgstr ""
-"<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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -2057,11 +2057,11 @@ msgstr ""
 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.skolelinux.org/skolelinux squeeze local"
 msgstr ""
 "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.skolelinux.org/skolelinux squeeze local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2324,8 +2324,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "d-i    pkgsel/include string my-extra-package(s)]]"
-msgstr "d-i    pkgsel/include string my-extra-package(s)]]"
+msgid "d-i    pkgsel/include string my-extra-package(s)"
+msgstr "d-i    pkgsel/include string my-extra-package(s)"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -3099,7 +3099,7 @@ msgid ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 msgstr ""
 "#!/bin/bash\n"
 "  #\n"
@@ -3114,7 +3114,7 @@ msgstr ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
@@ -3407,14 +3407,14 @@ msgid ""
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 msgstr ""
 "# List existing group mapping between UNIX and Windows groups.\n"
 "net groupmap list\n"
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3514,7 +3514,7 @@ msgid ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 msgstr ""
 "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"
@@ -3524,7 +3524,7 @@ msgstr ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_list.png"
@@ -4009,11 +4009,11 @@ msgstr ""
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 msgstr ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4153,8 +4153,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
-msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
+msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4704,14 +4704,14 @@ msgid ""
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 msgstr ""
 "etckeeper vcs log\n"
 "etckeeper vcs status\n"
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Usage examples"
@@ -4727,8 +4727,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs log]]"
-msgstr "etckeeper vcs log]]"
+msgid "etckeeper vcs log"
+msgstr "etckeeper vcs log"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "See which files are currently not tracked and which are not up-to-date:"
@@ -4737,8 +4737,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs status]]"
-msgstr "etckeeper vcs status]]"
+msgid "etckeeper vcs status"
+msgstr "etckeeper vcs status"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4748,8 +4748,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs commit -a /etc/resolv.conf]]"
-msgstr "etckeeper vcs commit -a /etc/resolv.conf]]"
+msgid "etckeeper vcs commit -a /etc/resolv.conf"
+msgstr "etckeeper vcs commit -a /etc/resolv.conf"
 
 #. type: Content of: <article><section><section><title>
 msgid "Resizing Partitions"
@@ -4861,10 +4861,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 msgstr ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4898,12 +4898,12 @@ msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 msgstr ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using ldapvi"
@@ -4923,8 +4923,8 @@ msgstr "E' necessario eseguire il seguente comando:"
 
 #. type: CDATA
 #, no-wrap
-msgid "ldapvi --ldap-conf -ZD '(cn=admin)']]"
-msgstr "ldapvi --ldap-conf -ZD '(cn=admin)']]"
+msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
+msgstr "ldapvi --ldap-conf -ZD '(cn=admin)'"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5044,10 +5044,10 @@ msgstr "Usare backports.debian.org è semplice:"
 #, no-wrap
 msgid ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5086,10 +5086,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 msgstr ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 
 #. type: Content of: <article><section><section><para>
 msgid "To quote the apt-cdrom(8) man page:"
@@ -5123,10 +5123,10 @@ msgstr "Eseguire questi due comandi per aggiornare il sistema:"
 #, no-wrap
 msgid ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 msgstr ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 
 #. type: Content of: <article><section><section><title>
 msgid "Java"
@@ -5200,7 +5200,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 msgstr ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5221,7 +5221,7 @@ msgstr ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Easy access to USB drives and CDROMs/DVDs"
@@ -5293,7 +5293,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 msgstr ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5308,7 +5308,7 @@ msgstr ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "A warning about removable media on LTSP servers"
@@ -5360,8 +5360,8 @@ msgstr "Per installarlo eseguire il seguente comando come root:"
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install killer]]"
-msgstr "apt-get install killer]]"
+msgid "apt-get install killer"
+msgstr "apt-get install killer"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic installation of security upgrades"
@@ -5390,8 +5390,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges]]"
-msgstr "apt-get install unattended-upgrades apt-listchanges]]"
+msgid "apt-get install unattended-upgrades apt-listchanges"
+msgstr "apt-get install unattended-upgrades apt-listchanges"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic shutdown of machines during the night"
@@ -5512,12 +5512,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5535,12 +5535,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 
 #. type: Content of: <article><section><section><title>
 msgid "Access Debian-Edu servers located behind a firewall"
@@ -5685,10 +5685,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 msgstr ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5720,8 +5720,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde]]"
-msgstr "apt-get install gnome lxde]]"
+msgid "apt-get install gnome lxde"
+msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5776,8 +5776,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs]]"
-msgstr "apt-get install libdvdcss2 w32codecs]]"
+msgid "apt-get install libdvdcss2 w32codecs"
+msgstr "apt-get install libdvdcss2 w32codecs"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using the multimedia repository"
@@ -5799,7 +5799,7 @@ msgid ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# install the debian-keyring securely:\n"
 "apt-get install debian-keyring\n"
@@ -5810,7 +5810,7 @@ msgstr ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -5917,7 +5917,7 @@ msgid ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 msgstr ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -5931,7 +5931,7 @@ msgstr ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
@@ -6016,8 +6016,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
-msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
+msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
+msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6081,13 +6081,13 @@ msgid ""
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 "#add the skole projects local repository\n"
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6127,8 +6127,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s ../debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s ../debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6140,8 +6140,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s ../debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s ../debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6162,8 +6162,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
-msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
+msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6184,13 +6184,13 @@ msgid ""
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 msgstr ""
 "default ltsp\n"
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6254,8 +6254,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
-msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6388,12 +6388,12 @@ msgid ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 msgstr ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid "somewhere below the default settings."
@@ -6411,10 +6411,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 msgstr ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6451,8 +6451,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_SESSION=/usr/bin/startlxde]]"
-msgstr "LDM_SESSION=/usr/bin/startlxde]]"
+msgid "LDM_SESSION=/usr/bin/startlxde"
+msgstr "LDM_SESSION=/usr/bin/startlxde"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6566,8 +6566,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
-msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
+msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
+msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -6597,7 +6597,7 @@ msgid ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 msgstr ""
 "#!/bin/bash\n"
 " # Randomise the server list contained in MY_SERVER_LIST parameter\n"
@@ -6612,7 +6612,7 @@ msgstr ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Part 3"
@@ -6724,13 +6724,13 @@ msgid ""
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Installing additional software in the LTSP environment"
@@ -6752,14 +6752,14 @@ msgid ""
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Slow login and security"
@@ -6787,8 +6787,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_DIRECTX=True]]"
-msgstr "LDM_DIRECTX=True]]"
+msgid "LDM_DIRECTX=True"
+msgstr "LDM_DIRECTX=True"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6857,8 +6857,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
-msgstr "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
+msgstr "X -query ltspserverXX"
 
 #. type: Content of: <article><section><section><para>
 msgid "If you are on the thin client network, run this command:"
@@ -6867,8 +6867,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query 192.168.0.254]]"
-msgstr "X -query 192.168.0.254]]"
+msgid "X -query 192.168.0.254"
+msgstr "X -query 192.168.0.254"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6889,8 +6889,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "* # any host can get a login window]]"
-msgstr "* # any host can get a login window]]"
+msgid "* # any host can get a login window"
+msgstr "* # any host can get a login window"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6906,8 +6906,8 @@ msgstr "Quindi avvia XDMCP in KDM con il comando:"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
-msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
+msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 
 #. type: Content of: <article><section><section><para>
 msgid "Finally, restart KDM by running:"
@@ -6915,8 +6915,8 @@ msgstr "Alla fine riavvia KDM eseguendo:"
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo invoke-rc.d kdm restart]]"
-msgstr "sudo invoke-rc.d kdm restart]]"
+msgid "sudo invoke-rc.d kdm restart"
+msgstr "sudo invoke-rc.d kdm restart"
 
 #. type: Content of: <article><section><section><para>
 msgid "(with thanks to Finn-Arne Johansen)"
@@ -6990,11 +6990,11 @@ msgstr ""
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 msgstr ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -7484,10 +7484,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Remote Desktop"
@@ -8135,7 +8135,7 @@ msgid ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
 "# move the tar.gz file to a repository directory on the school network's webroot (by default located on tjener):\n"
 "root at tjener:~# \n"
@@ -8144,7 +8144,7 @@ msgstr ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Add the needed packages to the PXE installation image"
@@ -8164,12 +8164,12 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Update the preseed file:"
@@ -8177,8 +8177,8 @@ msgstr "Aggiornare il file di preconfigurazione:"
 
 #. type: CDATA
 #, no-wrap
-msgid "/usr/sbin/debian-edu-pxeinstall]]"
-msgstr "/usr/sbin/debian-edu-pxeinstall]]"
+msgid "/usr/sbin/debian-edu-pxeinstall"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8210,10 +8210,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 msgstr ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Start the editor like this:"
@@ -8221,8 +8221,8 @@ msgstr "Avviare l'editor in questo modo:"
 
 #. type: CDATA
 #, no-wrap
-msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
-msgstr "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
+msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
+msgstr "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Add the repository key and install the software:"
@@ -8236,14 +8236,14 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "ltsp-chroot -a i386 wget http://www/debian/swbuild.asc\n"
 "ltsp-chroot -a i386 apt-key add swbuild.asc\n"
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -8667,12 +8667,22 @@ msgid "New features in Debian Edu Squeeze"
 msgstr "Nuove caratteristiche in Debian Edu Squeeze"
 
 #. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released "
+#| "2013-03-03"
+msgid ""
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
+msgstr ""
+"Nuove caratteristiche in Debian Edu 6.0.7+r1 Codename \"Squeeze\" released "
+"2013-03-03"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
+"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
+"well as the following changes:"
 msgstr ""
-"Nuove caratteristiche in Debian Edu 6.0.6+r1 Codename \"Squeeze\"  "
-"*UN*released as of 2013-0?-??"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
@@ -8687,8 +8697,8 @@ msgid "Comply with 3.X kernel"
 msgstr "Adattato al kernel 3.X"
 
 #. 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 "debian-edu-doc da 1.4~20120310~6.0.4+r0 a 1.4~20120925~6.0.6+r0"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
+msgstr "debian-edu-doc da 1.4~20120310~6.0.4+r0 a 1.4~20130227~6.0.7+r1"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Minor updates from the wiki"
@@ -8699,8 +8709,16 @@ msgid "Danish translation now complete"
 msgstr "Traduzione danese ora completa"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
-msgstr "debian-edu-config da 1.453 a 1.454"
+msgid "debian-edu-config from 1.453 to 1.455"
+msgstr "debian-edu-config da 1.453 a 1.455"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make ltsp_local_mount script work for multiple devices."
+msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -8760,21 +8778,13 @@ msgid "Add Danish web page"
 msgstr "Aggiunta la pagina web danese"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
-msgstr "debian-edu-install da 1.528 a 1.529"
+msgid "debian-edu-install from 1.528 to 1.530"
+msgstr "debian-edu-install da 1.528 a 1.530"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Improve preseeding support and documentation"
 msgstr "Migliorato il supporto per la preconfigurazione e documentazione"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
@@ -9147,12 +9157,12 @@ msgstr ""
 
 #. 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."
+"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
+"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
-"Il Manuale Debian Edu Squeeze è completamente tradotto in tedesco, francese "
-"e italiano. Versioni parzialmente tradotte esistono in  danese (nuovo), "
+"Il Manuale Debian Edu Squeeze è completamente tradotto in tedesco, francese, "
+"italiano e danese (nuovo). Versioni parzialmente tradotte esistono in "
 "norvegese Bokmal e spagnolo."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9592,11 +9602,11 @@ 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"La traduzione in Danese  è protetta da copyright da Joe Hansen (2012, 2013) e "
-"rilasciata sotto licenza GPL2 o successiva."
+"La traduzione in Danese  è protetta da copyright da Joe Hansen (2012, 2013) "
+"e rilasciata sotto licenza GPL2 o successiva."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
@@ -9623,7 +9633,7 @@ 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) "
+"manual-translations</computeroutput>. The Git 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."
@@ -9632,24 +9642,24 @@ msgstr ""
 "progetti di software libero, Maggiori informazioni sul processo di "
 "traduzione possono essere trovate in <computeroutput>usr/share/doc/debian-"
 "edu-doc/README.debian-edu-squeeze-manual-translations</computeroutput>. "
-"Anche il Subversion repository (vedi sotto) contiene questo file. Se vuoi "
-"aiutare a tradurre questo documento dai uno sguardo <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Contribute/Translation/Conventions#\">per specifiche "
+"Anche il Git repository (vedi sotto) contiene questo file. Se vuoi aiutare a "
+"tradurre questo documento dai uno sguardo <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Contribute/Translation/Conventions#\">per specifiche "
 "convenzioni di linguaggio</ulink>."
 
 #. 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 "
+"check out some files from from Git (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 ""
 "Per inviare la vostra traduzione occorre essere membro del progetto Alioth "
 "<computeroutput>debian-edu</computeroutput>. Per tradurre occorre verificare "
-"la presenza di alcuni file attraverso Subversion (dove ci si può collegare "
+"la presenza di alcuni file attraverso Git (dove ci si può collegare "
 "anonimamente) per creare patch. Si prega di inviare un bug relativo al "
 "pacchetto debian-edu-doc e allegare il file PO a <ulink url=\"http://bugs."
 "debian.org/debian-edu-doc\">bugreport</ulink>. Si possono trovare istruzioni "
@@ -9660,20 +9670,19 @@ msgstr ""
 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):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "Puoi esaminare la sorgente di <computeroutput>debian-edu-doc</"
 "computeroutput> da anonimo con il comando seguente (occorre avere il "
-"pacchetto <computeroutput>subversion</computeroutput> istallato):"
+"pacchetto <computeroutput>git</computeroutput> istallato):"
 
 #. 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>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9689,11 +9698,11 @@ 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."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
-"In seguito occorre inviare il file direttamente al Subversion (se si ha i "
-"permessi per fare questo) o mandare il file attraverso bugreport."
+"In seguito occorre inviare il file direttamente al Git (se si ha i permessi "
+"per fare questo) o mandare il file attraverso bugreport."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9704,8 +9713,8 @@ msgstr ""
 "all'interno della directory <computeroutput>debian-edu-doc</computeroutput>:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9729,29 +9738,28 @@ 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\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
-"Informazioni di base su Alioth (l'host dove è localizzato il nostro "
-"Subversion repository) e il Subversion è disponibile a <ulink url=\"http://"
-"wiki.debian.org/Alioth/Svn\"/>."
+"Informazioni di base su Alioth (l'host dove è localizzato il nostro Git "
+"repository) e il Git è disponibile a <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
 
 #. 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."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
-"Se sei nuovo con Subversion, dai uno sguardo a <ulink url=\"http://svnbook."
-"org\">Version Control with Subversion</ulink>, che ha un capitolo su <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Potresti anche guardare il pacchetto "
-"<computeroutput>kdesvn</computeroutput> se si preferisce un'interfaccia GUI "
-"per Subversion client al posto dell'uso della linea di comando."
+"Se non hai mai usato Git, dai uno sguardo al libro <ulink url=\"http://git-"
+"scm.com/book\">Pro Git</ulink> che ha un capitolo su <ulink url=\"http://git-"
+"scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">come "
+"registrare i cambiamenti nel repository</ulink>. Se preferisci "
+"un'interfaccia grafica per Git invece di usare la linea di comando, puoi "
+"provare il pacchetto <computeroutput>gitk</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
 msgid "Please report any problems."
@@ -9763,8 +9771,8 @@ msgstr "Appendix A - The GNU Public License"
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
-msgstr "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note to translators: there is no need to translate the GPL license text."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -11053,6 +11061,102 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+#~ msgstr ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+
+#~ 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."
+#~ msgstr ""
+#~ "Le traduzioni di questo documento sono in file PO come la maggioranza dei "
+#~ "progetti di software libero, Maggiori informazioni sul processo di "
+#~ "traduzione possono essere trovate in <computeroutput>usr/share/doc/debian-"
+#~ "edu-doc/README.debian-edu-squeeze-manual-translations</computeroutput>. "
+#~ "Anche il Subversion repository (vedi sotto) contiene questo file. Se vuoi "
+#~ "aiutare a tradurre questo documento dai uno sguardo <ulink url=\"http://"
+#~ "wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">per "
+#~ "specifiche convenzioni di linguaggio</ulink>."
+
+#~ 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."
+#~ msgstr ""
+#~ "Per inviare la vostra traduzione occorre essere membro del progetto "
+#~ "Alioth <computeroutput>debian-edu</computeroutput>. Per tradurre occorre "
+#~ "verificare la presenza di alcuni file attraverso Subversion (dove ci si "
+#~ "può collegare anonimamente) per creare patch. Si prega di inviare un bug "
+#~ "relativo al pacchetto debian-edu-doc e allegare il file PO a <ulink url="
+#~ "\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. Si possono "
+#~ "trovare istruzioni <ulink url=\"http://bugs.debian.org\">su come si "
+#~ "sottopongoni i bug</ulink> qui."
+
+#~ 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):"
+#~ msgstr ""
+#~ "Puoi esaminare la sorgente di <computeroutput>debian-edu-doc</"
+#~ "computeroutput> da anonimo con il comando seguente (occorre avere il "
+#~ "pacchetto <computeroutput>subversion</computeroutput> istallato):"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#~ 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 ""
+#~ "In seguito occorre inviare il file direttamente al Subversion (se si ha i "
+#~ "permessi per fare questo) o mandare il file attraverso bugreport."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#~ 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 ""
+#~ "Informazioni di base su Alioth (l'host dove è localizzato il nostro "
+#~ "Subversion repository) e il Subversion è disponibile a <ulink url="
+#~ "\"http://wiki.debian.org/Alioth/Svn\"/>."
+
+#~ 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 ""
+#~ "Se sei nuovo con Subversion, dai uno sguardo a <ulink url=\"http://"
+#~ "svnbook.org\">Version Control with Subversion</ulink>, che ha un capitolo "
+#~ "su <ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic "
+#~ "workflow with Subversion</ulink>. Potresti anche guardare il pacchetto "
+#~ "<computeroutput>kdesvn</computeroutput> se si preferisce un'interfaccia "
+#~ "GUI per Subversion client al posto dell'uso della linea di comando."
+
+#~ msgid ""
 #~ "Create a user with membership in the \"admins\" group (if not already "
 #~ "existing)"
 #~ msgstr ""
@@ -11177,18 +11281,18 @@ msgstr ""
 #~| "aptitude update\n"
 #~| "aptitude upgrade\n"
 #~| "aptitude dist-upgrade\n"
-#~| "exit]]"
+#~| "exit"
 #~ msgid ""
 #~ "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie "
 #~ "it also prevents daemons from being started\n"
-#~ "editor /etc/apt/sources.list]]"
+#~ "editor /etc/apt/sources.list"
 #~ msgstr ""
 #~ "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie "
 #~ "it also prevents daemons from being started\n"
 #~ "aptitude update\n"
 #~ "aptitude upgrade\n"
 #~ "aptitude dist-upgrade\n"
-#~ "exit]]"
+#~ "exit"
 
 #, fuzzy
 #~| msgid ""
@@ -12232,7 +12336,7 @@ msgstr ""
 #~ "homeDirectory = /skole/tjener/home0/2009/%username%\n"
 #~ "groups = none students 2009\n"
 #~ "loginShell = /bin/bash\n"
-#~ "mailMessageStore = /var/lib/maildirs/%username%]]"
+#~ "mailMessageStore = /var/lib/maildirs/%username%"
 #~ msgstr ""
 #~ "[2009]\n"
 #~ "ou = \"ou=People,%base%\"\n"
@@ -12240,7 +12344,7 @@ msgstr ""
 #~ "homeDirectory = /skole/tjener/home0/2009/%username%\n"
 #~ "groups = none students 2009\n"
 #~ "loginShell = /bin/bash\n"
-#~ "mailMessageStore = /var/lib/maildirs/%username%]]"
+#~ "mailMessageStore = /var/lib/maildirs/%username%"
 
 #~ msgid ""
 #~ "To make this work, the 2009 group has to be created before adding the "
@@ -12330,17 +12434,17 @@ msgstr ""
 #~ "per essere sicuri che sia presente la linea <computeroutput>non-free</"
 #~ "computeroutput> come in questo esempio:"
 
-#~ msgid "deb http://ftp.debian.org/debian/ lenny main contrib non-free]]"
-#~ msgstr "deb http://ftp.debian.org/debian/ lenny main contrib non-free]]"
+#~ msgid "deb http://ftp.debian.org/debian/ lenny main contrib non-free"
+#~ msgstr "deb http://ftp.debian.org/debian/ lenny main contrib non-free"
 
-#~ msgid "# apt-get update]]"
-#~ msgstr "# apt-get update]]"
+#~ msgid "# apt-get update"
+#~ msgstr "# apt-get update"
 
 #~ msgid "Now you are ready to run this command:"
 #~ msgstr "Ora siamo pronti per eseguire questo comando:"
 
-#~ msgid "# apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts]]"
-#~ msgstr "# apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts]]"
+#~ msgid "# apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts"
+#~ msgstr "# apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts"
 
 #~ msgid "Using stable-updates"
 #~ msgstr "Usare stable-updates"
@@ -12514,13 +12618,13 @@ msgstr ""
 #~ "cp -rv /etc/kde-profile/ $LTSPCHROOT/etc/\n"
 #~ "cp -v /etc/kderc $LTSPCHROOT/etc/\n"
 #~ "cp -v /etc/kde-user-profile $LTSPCHROOT/etc/\n"
-#~ "unset LTSPCHROOT]]"
+#~ "unset LTSPCHROOT"
 #~ msgstr ""
 #~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
 #~ "cp -rv /etc/kde-profile/ $LTSPCHROOT/etc/\n"
 #~ "cp -v /etc/kderc $LTSPCHROOT/etc/\n"
 #~ "cp -v /etc/kde-user-profile $LTSPCHROOT/etc/\n"
-#~ "unset LTSPCHROOT]]"
+#~ "unset LTSPCHROOT"
 
 #~ msgid ""
 #~ "Otherwise replace <computeroutput>i386</computeroutput> with "
@@ -13059,12 +13163,11 @@ msgstr ""
 #, fuzzy
 #~| msgid ""
 #~| "ldapvi --host ldap -ZZ --bind simple --tls allow -D 'cn=admin,ou=People,"
-#~| "dc=skole,dc=skolelinux,dc=no']]"
-#~ msgid ""
-#~ "ldapvi -ZD 'uid=super-admin,ou=People,dc=skole,dc=skolelinux,dc=no']]"
+#~| "dc=skole,dc=skolelinux,dc=no'"
+#~ msgid "ldapvi -ZD 'uid=super-admin,ou=People,dc=skole,dc=skolelinux,dc=no'"
 #~ msgstr ""
 #~ "ldapvi --host ldap -ZZ --bind simple --tls allow -D 'cn=admin,ou=People,"
-#~ "dc=skole,dc=skolelinux,dc=no']]"
+#~ "dc=skole,dc=skolelinux,dc=no'"
 
 #~ msgid "FIXME: install swi-prolog by default?"
 #~ msgstr "FIXME: install swi-prolog by default?"
@@ -13155,11 +13258,11 @@ msgstr ""
 #~ msgid ""
 #~ "subnet 10.0.0.0 netmask 255.0.0.0 {\n"
 #~ "        range 10.0.2.100 10.0.3.242;\n"
-#~ "        }]]"
+#~ "        }"
 #~ msgstr ""
 #~ "subnet 10.0.0.0 netmask 255.0.0.0 {\n"
 #~ "        range 10.0.2.100 10.0.3.242;\n"
-#~ "        }]]"
+#~ "        }"
 
 #~ msgid "you have to add this under \"range\":"
 #~ msgstr "occorre aggiungere sotto \"range\":"
@@ -13169,13 +13272,13 @@ msgstr ""
 #~ "next-server xxx;\n"
 #~ "option root-path \"/opt/ltsp/i386\";\n"
 #~ "option log-servers ltspserver01;\n"
-#~ "use-host-decl-names on;]]"
+#~ "use-host-decl-names on;"
 #~ msgstr ""
 #~ "filename \"/var/lib/tftpboot/ltsp/i386/pxelinux.0\";\n"
 #~ "next-server xxx;\n"
 #~ "option root-path \"/opt/ltsp/i386\";\n"
 #~ "option log-servers ltspserver01;\n"
-#~ "use-host-decl-names on;]]"
+#~ "use-host-decl-names on;"
 
 #~ msgid ""
 #~ "Next-server should be the IP-address or hostname of the server you chose "
@@ -13221,8 +13324,8 @@ msgstr ""
 #~ "FIXME: explain how to install and use italc - <ulink url=\"http://bugs."
 #~ "debian.org/511387#\">511387</ulink> explains this quite well actually."
 
-#~ msgid "apt-get install italc-client italc-master]]"
-#~ msgstr "apt-get install italc-client italc-master]]"
+#~ msgid "apt-get install italc-client italc-master"
+#~ msgstr "apt-get install italc-client italc-master"
 
 #~ msgid ""
 #~ "<placeholder type=\"inlinemediaobject\" id=\"0\"/> <emphasis role=\"strong"
@@ -13672,11 +13775,11 @@ msgstr ""
 #~ msgid ""
 #~ "Added user: Demo User\n"
 #~ "username: demuse\n"
-#~ "password: somethingsecret]]"
+#~ "password: somethingsecret"
 #~ msgstr ""
 #~ "Added user: Demo User\n"
 #~ "username: demuse\n"
-#~ "password: somethingsecret]]"
+#~ "password: somethingsecret"
 
 #~ msgid ""
 #~ "You may miss the option to set a password, that has been set "
@@ -13830,10 +13933,10 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapmodify -x -Z -W -D cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no -f "
-#~ "ext_static.ldif]]"
+#~ "ext_static.ldif"
 #~ msgstr ""
 #~ "ldapmodify -x -Z -W -D cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no -f "
-#~ "ext_static.ldif]]"
+#~ "ext_static.ldif"
 
 #~ msgid ""
 #~ "When prompted, enter the LDAP admin password. You now have 40 extra "
@@ -13918,11 +14021,11 @@ msgstr ""
 #~ msgid ""
 #~ "RHOST=admin.example.net\n"
 #~ "RPORT=1234\n"
-#~ "RUSER=backdoor]]"
+#~ "RUSER=backdoor"
 #~ msgstr ""
 #~ "RHOST=admin.example.net\n"
 #~ "RPORT=1234\n"
-#~ "RUSER=backdoor]]"
+#~ "RUSER=backdoor"
 
 #~ msgid ""
 #~ "FIXME: paragraph about access from outside need to be completed and "
@@ -14130,22 +14233,22 @@ msgstr ""
 #~ "etcinsvk log\n"
 #~ "etcinsvk status\n"
 #~ "etcinsvk commit\n"
-#~ "etcinsvk ignore]]"
+#~ "etcinsvk ignore"
 #~ msgstr ""
 #~ "etcinsvk diff\n"
 #~ "etcinsvk log\n"
 #~ "etcinsvk status\n"
 #~ "etcinsvk commit\n"
-#~ "etcinsvk ignore]]"
+#~ "etcinsvk ignore"
 
-#~ msgid "etcinsvk diff -r6 | less]]"
-#~ msgstr "etcinsvk diff -r6 | less]]"
+#~ msgid "etcinsvk diff -r6 | less"
+#~ msgstr "etcinsvk diff -r6 | less"
 
 #~ msgid "To see the list of changes done in /etc/, use this command:"
 #~ msgstr "Per vedere i cambiamenti fatti in /etc/, usare questo comando:"
 
-#~ msgid "etcinsvk log | less]]"
-#~ msgstr "etcinsvk log | less]]"
+#~ msgid "etcinsvk log | less"
+#~ msgstr "etcinsvk log | less"
 
 #~ msgid ""
 #~ "Here check revision numbers by date and time. To see all changes done "
@@ -14154,8 +14257,8 @@ msgstr ""
 #~ "Qui si controlla il numero della revisione attraverso la data e l'ora, Si "
 #~ "possono vedere tutti i cambiamenti fatti dalla revisione N:"
 
-#~ msgid "etcinsvk diff -rN | less]]"
-#~ msgstr "etcinsvk diff -rN | less]]"
+#~ msgid "etcinsvk diff -rN | less"
+#~ msgstr "etcinsvk diff -rN | less"
 
 #~ msgid ""
 #~ "To see the changes done to a specific file between specific revisions, "
@@ -14164,8 +14267,8 @@ msgstr ""
 #~ "Per vedere i cambiamenti effettuati su un determinato file tra revisioni "
 #~ "specifiche occorre specificare file e revisioni:"
 
-#~ msgid "etcinsvk diff -r46 -r64 /etc/resolv.conf | less]]"
-#~ msgstr "etcinsvk diff -r46 -r64 /etc/resolv.conf | less]]"
+#~ msgid "etcinsvk diff -r46 -r64 /etc/resolv.conf | less"
+#~ msgstr "etcinsvk diff -r46 -r64 /etc/resolv.conf | less"
 
 #~ msgid ""
 #~ "To revert a change, use the diff command to look at the change, and edit "
@@ -14176,8 +14279,8 @@ msgstr ""
 #~ "cambiato e modificarlo, o utilizzare un comando come questo che fa tutto "
 #~ "automaticamente:"
 
-#~ msgid "( cd /etc && etcinsvk diff -r6 /etc/resolv.conf | patch -p0 -R )]]"
-#~ msgstr "( cd /etc && etcinsvk diff -r6 /etc/resolv.conf | patch -p0 -R )]]"
+#~ msgid "( cd /etc && etcinsvk diff -r6 /etc/resolv.conf | patch -p0 -R )"
+#~ msgstr "( cd /etc && etcinsvk diff -r6 /etc/resolv.conf | patch -p0 -R )"
 
 #~ msgid ""
 #~ "If you don't want a specific file to be tracked in svk, you can tell to "
@@ -14192,8 +14295,8 @@ msgstr ""
 #~ "wiki.debian.org/htdocs/debwiki/img/smile.png\" depth=\"16\"/></"
 #~ "imageobject>"
 
-#~ msgid "etcinsvk ignore /etc/path/to/file/to/be/ignored]]"
-#~ msgstr "etcinsvk ignore /etc/path/to/file/to/be/ignored]]"
+#~ msgid "etcinsvk ignore /etc/path/to/file/to/be/ignored"
+#~ msgstr "etcinsvk ignore /etc/path/to/file/to/be/ignored"
 
 #~ msgid "Then make your changes, safe and quit the editor. That's it!"
 #~ msgstr "Modificare, salvare e uscire dall'editor. Questo è tutto!"
@@ -14399,7 +14502,7 @@ msgstr ""
 #~ " run slapd. Do not forget to specify those options if you\n"
 #~ " want to look to debugging output:\n"
 #~ " slapd -h 'ldap:/// ldaps:///' -g openldap -u openldap -f /etc/ldap/slapd."
-#~ "conf                     -4]]"
+#~ "conf                     -4"
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d slapd start\n"
 #~ " Starting OpenLDAP: slapd - failed.\n"
@@ -14413,7 +14516,7 @@ msgstr ""
 #~ " run slapd. Do not forget to specify those options if you\n"
 #~ " want to look to debugging output:\n"
 #~ " slapd -h 'ldap:/// ldaps:///' -g openldap -u openldap -f /etc/ldap/slapd."
-#~ "conf                     -4]]"
+#~ "conf                     -4"
 
 #~ msgid ""
 #~ "And searching <computeroutput>/var/log/syslog</computeroutput> yelds "
@@ -14506,7 +14609,7 @@ msgstr ""
 #~ " ldap-method dynamic;\n"
 #~ "            ^\n"
 #~ " Configuration file errors encountered -- exiting\n"
-#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed.]]"
+#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed."
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d dhcp3-server start\n"
 #~ " dhcpd self-test failed. Please fix the config file.\n"
@@ -14531,7 +14634,7 @@ msgstr ""
 #~ " ldap-method dynamic;\n"
 #~ "            ^\n"
 #~ " Configuration file errors encountered -- exiting\n"
-#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed.]]"
+#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed."
 
 #~ msgid ""
 #~ "Then installing <computeroutput>dhcp3-server-ldap</computeroutput> is "
@@ -14543,10 +14646,10 @@ msgstr ""
 
 #~ msgid ""
 #~ "tjener:~# apt-get -q=2 update\n"
-#~ " tjener:~# apt-get -q=2 install dhcp3-server-ldap]]"
+#~ " tjener:~# apt-get -q=2 install dhcp3-server-ldap"
 #~ msgstr ""
 #~ "tjener:~# apt-get -q=2 update\n"
-#~ " tjener:~# apt-get -q=2 install dhcp3-server-ldap]]"
+#~ " tjener:~# apt-get -q=2 install dhcp3-server-ldap"
 
 #~ msgid ""
 #~ "tjener:~# invoke-rc.d dhcp3-server start\n"
@@ -14560,7 +14663,7 @@ msgstr ""
 #~ " Successfully logged into LDAP server ldap\n"
 #~ " Cannot find host LDAP entry dhcp (&(objectClass=dhcpServer)(cn=dhcp))\n"
 #~ " Configuration file errors encountered -- exiting\n"
-#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed.]]"
+#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed."
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d dhcp3-server start\n"
 #~ " dhcpd self-test failed. Please fix the config file.\n"
@@ -14573,7 +14676,7 @@ msgstr ""
 #~ " Successfully logged into LDAP server ldap\n"
 #~ " Cannot find host LDAP entry dhcp (&(objectClass=dhcpServer)(cn=dhcp))\n"
 #~ " Configuration file errors encountered -- exiting\n"
-#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed.]]"
+#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed."
 
 #~ msgid ""
 #~ "Then DHCP configuration needs loading into LDAP. Two ways to do it are:"
@@ -14680,7 +14783,7 @@ msgstr ""
 #~ " tjener:/etc/ldap# invoke-rc.d dhcp3-server start\n"
 #~ "  * Starting DHCP server "
 #~ "dhcpd3                                            [ ok ]\n"
-#~ " tjener:/etc/ldap#]]"
+#~ " tjener:/etc/ldap#"
 #~ msgstr ""
 #~ "tjener:~# cd /usr/share/doc/dhcp3-server-ldap/\n"
 #~ " tjener:/usr/share/doc/dhcp3-server-ldap# gunzip dhcpd-conf-to-ldap.pl."
@@ -14720,7 +14823,7 @@ msgstr ""
 #~ " tjener:/etc/ldap# invoke-rc.d dhcp3-server start\n"
 #~ "  * Starting DHCP server "
 #~ "dhcpd3                                            [ ok ]\n"
-#~ " tjener:/etc/ldap#]]"
+#~ " tjener:/etc/ldap#"
 
 #~ msgid "To load The fresh configuration into the database:"
 #~ msgstr "Per caricare la nuova configurazione nel data base:"
@@ -14747,13 +14850,13 @@ msgstr ""
 #~ " * Starting Squid HTTP proxy squid\n"
 #~ " 2009/08/23 00:20:56| ACL name 'localnet' not defined!\n"
 #~ " FATAL: Bungled squid.conf line 2577: http_access allow localnet\n"
-#~ " Squid Cache (Version 2.7.STABLE3): Terminated abnormally.]]"
+#~ " Squid Cache (Version 2.7.STABLE3): Terminated abnormally."
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d squid start\n"
 #~ " * Starting Squid HTTP proxy squid\n"
 #~ " 2009/08/23 00:20:56| ACL name 'localnet' not defined!\n"
 #~ " FATAL: Bungled squid.conf line 2577: http_access allow localnet\n"
-#~ " Squid Cache (Version 2.7.STABLE3): Terminated abnormally.]]"
+#~ " Squid Cache (Version 2.7.STABLE3): Terminated abnormally."
 
 #~ msgid ""
 #~ "It's complaint is self explanatory. Two options to overcome this are:"
@@ -14777,13 +14880,11 @@ msgstr ""
 #~ msgid ""
 #~ "tjener:~# cd /etc/squid/\n"
 #~ " tjener:/etc/squid# mv squid.conf etch-squid.conf\n"
-#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid."
-#~ "conf]]"
+#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid.conf"
 #~ msgstr ""
 #~ "tjener:~# cd /etc/squid/\n"
 #~ " tjener:/etc/squid# mv squid.conf etch-squid.conf\n"
-#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid."
-#~ "conf]]"
+#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid.conf"
 
 #~ msgid ""
 #~ "To have the default Debian Edu configuration run <computeroutput>cfengine-"
@@ -14854,12 +14955,12 @@ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
 #~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
 #~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
-#~ "(sambaPwdLastSet=0)))' uid  | less]]"
+#~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
 #~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
 #~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
-#~ "(sambaPwdLastSet=0)))' uid  | less]]"
+#~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
 #~ "To add the '<computeroutput>sambaPwdLastSet</computeroutput>' attribute "
@@ -14876,7 +14977,7 @@ msgstr ""
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
 #~ "ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
-#~ "            -f /etc/ldap/fixamba.ldif]]"
+#~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
 #~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
@@ -14885,7 +14986,7 @@ msgstr ""
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
 #~ "ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
-#~ "            -f /etc/ldap/fixamba.ldif]]"
+#~ "            -f /etc/ldap/fixamba.ldif"
 
 #~ msgid ""
 #~ "If users with '<computeroutput>sambaPwdLastSet = 0</computeroutput>' were "
@@ -14903,7 +15004,7 @@ msgstr ""
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
 #~ "ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
-#~ "           -f /etc/ldap/fixamba.ldif]]"
+#~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
 #~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
@@ -14912,7 +15013,7 @@ msgstr ""
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
 #~ "ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
-#~ "           -f /etc/ldap/fixamba.ldif]]"
+#~ "           -f /etc/ldap/fixamba.ldif"
 
 #~ msgid ""
 #~ "See also <ulink url=\"http://wiki.debian.org/DebianEdu/Status/Lenny/"
@@ -14938,11 +15039,11 @@ msgstr ""
 #~ msgid ""
 #~ ";RFC2782\n"
 #~ "_ldap._tcp                      IN      SRV     0 100 389 tjener\n"
-#~ "_syslog._udp                    IN      SRV     0 100 514 tjener]]"
+#~ "_syslog._udp                    IN      SRV     0 100 514 tjener"
 #~ msgstr ""
 #~ ";RFC2782\n"
 #~ "_ldap._tcp                      IN      SRV     0 100 389 tjener\n"
-#~ "_syslog._udp                    IN      SRV     0 100 514 tjener]]"
+#~ "_syslog._udp                    IN      SRV     0 100 514 tjener"
 
 #~ msgid "powerdns"
 #~ msgstr "powerdns"
@@ -14962,11 +15063,11 @@ msgstr ""
 #~ msgid ""
 #~ "tjener:~# apt-get -q=2 update\n"
 #~ " tjener:~# apt-get -q=2 install pdns-server pdns-recursor pdns-backend-"
-#~ "ldap]]"
+#~ "ldap"
 #~ msgstr ""
 #~ "tjener:~# apt-get -q=2 update\n"
 #~ " tjener:~# apt-get -q=2 install pdns-server pdns-recursor pdns-backend-"
-#~ "ldap]]"
+#~ "ldap"
 
 #~ msgid "In <computeroutput>/etc/ldap/slapd.conf</computeroutput>:"
 #~ msgstr "In <computeroutput>/etc/ldap/slapd.conf</computeroutput>:"
@@ -14987,10 +15088,10 @@ msgstr ""
 
 #~ msgid ""
 #~ "# PowerDNS index\n"
-#~ " index associatedDomain         pres,eq,sub]]"
+#~ " index associatedDomain         pres,eq,sub"
 #~ msgstr ""
 #~ "# PowerDNS index\n"
-#~ " index associatedDomain         pres,eq,sub]]"
+#~ " index associatedDomain         pres,eq,sub"
 
 #~ msgid ""
 #~ "Restart slapd <computeroutput>invoke-rc.d slapd restart</computeroutput>."
@@ -15023,14 +15124,14 @@ msgstr ""
 #~ " >                 -f '/etc/ldap/dns_skole.ldif'\n"
 #~ " tjener:~# ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                 -f '/etc/ldap/dns_arpa.ldif']]"
+#~ " >                 -f '/etc/ldap/dns_arpa.ldif'"
 #~ msgstr ""
 #~ "tjener:~# ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' "
 #~ "\\\n"
 #~ " >                 -f '/etc/ldap/dns_skole.ldif'\n"
 #~ " tjener:~# ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                 -f '/etc/ldap/dns_arpa.ldif']]"
+#~ " >                 -f '/etc/ldap/dns_arpa.ldif'"
 
 #~ msgid ""
 #~ "To <ulink url=\"http://www.linuxnetworks.de/doc/index.php/"
@@ -15074,12 +15175,12 @@ msgstr ""
 #~ "tjener:/tmp# dpkg-deb -x pdns-backend-ldap_2.9.20-8+etch1_i386.deb \\\n"
 #~ " >                     pdns-backend-ldap_2.9.20\n"
 #~ " tjener:/tmp# cp pdns-backend-ldap_2.9.20/usr/bin/zone2ldap /usr/bin/"
-#~ "zone2ldap]]"
+#~ "zone2ldap"
 #~ msgstr ""
 #~ "tjener:/tmp# dpkg-deb -x pdns-backend-ldap_2.9.20-8+etch1_i386.deb \\\n"
 #~ " >                     pdns-backend-ldap_2.9.20\n"
 #~ " tjener:/tmp# cp pdns-backend-ldap_2.9.20/usr/bin/zone2ldap /usr/bin/"
-#~ "zone2ldap]]"
+#~ "zone2ldap"
 
 #~ msgid ""
 #~ "Apparently PowerDNS in Lenny (2.9.21.2) doesn't understand <ulink url="
@@ -15109,13 +15210,13 @@ msgstr ""
 #~ "layout=tree \\\n"
 #~ " >                   --named-conf='/etc/bind/debian-edu/named-bind9.conf' "
 #~ "--resume \\\n"
-#~ " >               > /etc/ldap/skole-zone2ldap]]"
+#~ " >               > /etc/ldap/skole-zone2ldap"
 #~ msgstr ""
 #~ "tjener:~# zone2ldap --basedn='ou=hosts,dc=skole,dc=skolelinux,dc=no' --"
 #~ "layout=tree \\\n"
 #~ " >                   --named-conf='/etc/bind/debian-edu/named-bind9.conf' "
 #~ "--resume \\\n"
-#~ " >               > /etc/ldap/skole-zone2ldap]]"
+#~ " >               > /etc/ldap/skole-zone2ldap"
 
 #~ msgid ""
 #~ "Before the data in the new ldif file can be added to the database the "
@@ -15132,7 +15233,7 @@ msgstr ""
 #~ " objectClass: organizationalUnit\n"
 #~ " objectClass: domainRelatedObject\n"
 #~ " ou: hosts\n"
-#~ " associatedDomain: intern]]"
+#~ " associatedDomain: intern"
 #~ msgstr ""
 #~ "tjener:~# ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no'\n"
@@ -15141,7 +15242,7 @@ msgstr ""
 #~ " objectClass: organizationalUnit\n"
 #~ " objectClass: domainRelatedObject\n"
 #~ " ou: hosts\n"
-#~ " associatedDomain: intern]]"
+#~ " associatedDomain: intern"
 
 #~ msgid ""
 #~ "The format of the ldif file created by <computeroutput>zone2ldap</"
@@ -15153,20 +15254,20 @@ msgstr ""
 #~ msgid ""
 #~ "tjener:~# ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                    -f /etc/ldap/skole-zone2ldap]]"
+#~ " >                    -f /etc/ldap/skole-zone2ldap"
 #~ msgstr ""
 #~ "tjener:~# ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                    -f /etc/ldap/skole-zone2ldap]]"
+#~ " >                    -f /etc/ldap/skole-zone2ldap"
 
 #~ msgid ""
 #~ "tjener:~# invoke-rc.d bind9 stop\n"
 #~ " tjener:~# invoke-rc.d pdns start\n"
-#~ " tjener:~# invoke-rc.d pdns-recursor start]]"
+#~ " tjener:~# invoke-rc.d pdns-recursor start"
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d bind9 stop\n"
 #~ " tjener:~# invoke-rc.d pdns start\n"
-#~ " tjener:~# invoke-rc.d pdns-recursor start]]"
+#~ " tjener:~# invoke-rc.d pdns-recursor start"
 
 #~ msgid ""
 #~ "After testing the new PowerDNS setup Bind9 may be disabled/removed/purged."
@@ -15257,11 +15358,11 @@ msgstr ""
 #~ msgid ""
 #~ "Package: flashplugin-nonfree\n"
 #~ "Pin: release a=lenny-backports\n"
-#~ "Pin-priority: 999]]"
+#~ "Pin-priority: 999"
 #~ msgstr ""
 #~ "Package: flashplugin-nonfree\n"
 #~ "Pin: release a=lenny-backports\n"
-#~ "Pin-priority: 999]]"
+#~ "Pin-priority: 999"
 
 #~ msgid ""
 #~ "as the <computeroutput>flashplugin-nonfree</computeroutput> package is "
@@ -15347,7 +15448,7 @@ msgstr ""
 #~ "# update the list of available packages:\n"
 #~ "aptitude update\n"
 #~ "# Install the keyring package for backports\n"
-#~ "aptitude install debian-backports-keyring ]]"
+#~ "aptitude install debian-backports-keyring"
 #~ msgstr ""
 #~ "# install the debian-keyring securily:\n"
 #~ "aptitude install debian-keyring\n"
@@ -15363,7 +15464,7 @@ msgstr ""
 #~ "# update the list of available packages:\n"
 #~ "aptitude update\n"
 #~ "# Install the keyring package for backports\n"
-#~ "aptitude install debian-backports-keyring ]]"
+#~ "aptitude install debian-backports-keyring"
 
 #~ msgid ""
 #~ "It is possible to save energy and money by turning off client machines at "
@@ -15565,29 +15666,29 @@ msgstr ""
 #~ msgid ""
 #~ "/etc/init.d/squid stop\n"
 #~ "umount /var/spool/squid\n"
-#~ "umount -fl /var ]]"
+#~ "umount -fl /var"
 #~ msgstr ""
 #~ "/etc/init.d/squid stop\n"
 #~ "umount /var/spool/squid\n"
-#~ "umount -fl /var ]]"
+#~ "umount -fl /var"
 
 #~ msgid "2.) fsck the partition:"
 #~ msgstr "2.) fsck della partizione:"
 
-#~ msgid "e2fsck -f /dev/vg_system/lv_data ]]"
-#~ msgstr "e2fsck -f /dev/vg_system/lv_data ]]"
+#~ msgid "e2fsck -f /dev/vg_system/lv_data"
+#~ msgstr "e2fsck -f /dev/vg_system/lv_data"
 
 #~ msgid "3.) resize the partition:"
 #~ msgstr "3.) ridimensionare la partizione:"
 
-#~ msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
-#~ msgstr "lvextend -L +1GB /dev/vg_system/lv_data ]]"
+#~ msgid "lvextend -L +1GB /dev/vg_system/lv_data"
+#~ msgstr "lvextend -L +1GB /dev/vg_system/lv_data"
 
 #~ msgid "4.) resize the filesystem:"
 #~ msgstr "4.) ridimensionare il filesystem:"
 
-#~ msgid "resize2fs /dev/vg_system/lv_data]]"
-#~ msgstr "resize2fs /dev/vg_system/lv_data]]"
+#~ msgid "resize2fs /dev/vg_system/lv_data"
+#~ msgstr "resize2fs /dev/vg_system/lv_data"
 
 #~ msgid "5.) mount the partitions again:"
 #~ msgstr "5.) montare le partizioni di nuovo:"
@@ -15595,20 +15696,20 @@ msgstr ""
 #~ msgid ""
 #~ "mount /var\n"
 #~ "mount /var/spool/squid\n"
-#~ "/etc/init.d/squid start ]]"
+#~ "/etc/init.d/squid start"
 #~ msgstr ""
 #~ "mount /var\n"
 #~ "mount /var/spool/squid\n"
-#~ "/etc/init.d/squid start ]]"
+#~ "/etc/init.d/squid start"
 
 #~ msgid ""
 #~ "deb http://ftp.debian.org/debian lenny main\n"
 #~ "deb http://security.debian.org/ lenny/updates main \n"
-#~ "deb http://ftp.skolelinux.org/skolelinux lenny local]]"
+#~ "deb http://ftp.skolelinux.org/skolelinux lenny local"
 #~ msgstr ""
 #~ "deb http://ftp.debian.org/debian lenny main\n"
 #~ "deb http://security.debian.org/ lenny/updates main \n"
-#~ "deb http://ftp.skolelinux.org/skolelinux lenny local]]"
+#~ "deb http://ftp.skolelinux.org/skolelinux lenny local"
 
 #~ msgid "And start the upgrade with:"
 #~ msgstr "Ora incominciamo ad aggiornare con:"
@@ -15732,12 +15833,12 @@ msgstr ""
 #~ "Errors were encountered while processing:\n"
 #~ " mozilla-firefox-locale-it\n"
 #~ " mozilla-firefox-locale-el\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing:\n"
 #~ " mozilla-firefox-locale-it\n"
 #~ " mozilla-firefox-locale-el\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 
 #~ msgid ""
 #~ "To fix this you have to edit these two files: <emphasis>/var/lib/dpkg/"
@@ -15753,8 +15854,8 @@ msgstr ""
 #~ "mozilla-firefox-chrome</emphasis>. Poi occorre riavviare il processo di "
 #~ "aggiornamento con:"
 
-#~ msgid "apt-get -f install]]"
-#~ msgstr "apt-get -f install]]"
+#~ msgid "apt-get -f install"
+#~ msgstr "apt-get -f install"
 
 #~ msgid "Now the upgrade continues:"
 #~ msgstr "Ora l'aggiornamento continua:"
@@ -15772,11 +15873,11 @@ msgstr ""
 #~ msgid ""
 #~ "Errors were encountered while processing:\n"
 #~ " slapd\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing:\n"
 #~ " slapd\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 
 #~ msgid ""
 #~ "In order to fix this, rename this directory: <emphasis>/var/backups/"
@@ -15792,10 +15893,10 @@ msgstr ""
 
 #~ msgid ""
 #~ "chown -R openldap:openldap /etc/ldap/\n"
-#~ "apt-get -f install]]"
+#~ "apt-get -f install"
 #~ msgstr ""
 #~ "chown -R openldap:openldap /etc/ldap/\n"
-#~ "apt-get -f install]]"
+#~ "apt-get -f install"
 
 #~ msgid ""
 #~ "Then the installation should finish <emphasis role=\"strong\">without</"
@@ -15806,8 +15907,8 @@ msgstr ""
 #~ "emphasis>errori.  Se adesso molti pacchetti non risultano aggiornati "
 #~ "occorre riavviare dist-upgrade di nuovo con:"
 
-#~ msgid "aptitude dist-upgrade]]"
-#~ msgstr "aptitude dist-upgrade]]"
+#~ msgid "aptitude dist-upgrade"
+#~ msgstr "aptitude dist-upgrade"
 
 #~ msgid "The next error raising up is this one:"
 #~ msgstr "Il prossimo errore è questo:"
@@ -15815,18 +15916,18 @@ msgstr ""
 #~ msgid ""
 #~ "Errors were encountered while processing:\n"
 #~ " /var/cache/apt/archives/courier-authlib-ldap_0.58-4_i386.deb\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing:\n"
 #~ " /var/cache/apt/archives/courier-authlib-ldap_0.58-4_i386.deb\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 
 #~ msgid "Please remove the package: <emphasis>courier-ldap</emphasis> with"
 #~ msgstr ""
 #~ "Occorre rimuovere il pacchetto: <emphasis>courier-ldap</emphasis> con"
 
-#~ msgid "aptitude remove courier-ldap]]"
-#~ msgstr "aptitude remove courier-ldap]]"
+#~ msgid "aptitude remove courier-ldap"
+#~ msgstr "aptitude remove courier-ldap"
 
 #~ msgid ""
 #~ "and wait until it is finished.Then restart the dist-upgrade process again."
@@ -15849,8 +15950,8 @@ msgstr ""
 #~ "Il solo compito rimasto è che l'utente di bind9 è cambiato, bisogna così "
 #~ "cambiare il proprietario di tutti i file di configurazione di bind."
 
-#~ msgid "chown bind:root -R /etc/bind ]]"
-#~ msgstr "chown bind:root -R /etc/bind ]]"
+#~ msgid "chown bind:root -R /etc/bind"
+#~ msgstr "chown bind:root -R /etc/bind"
 
 #~ msgid "Samba groupmaps handeling changed"
 #~ msgstr "I gruppi di Samba sono cambiati"
@@ -15881,11 +15982,11 @@ msgstr ""
 #~ msgid ""
 #~ "/usr/bin/net groupmap add rid=512 unixgroup=admins \\\n"
 #~ "             type=domain ntgroup=\"Domain Admins\" \\\n"
-#~ "             comment=\"All system administrators in the school\"]]"
+#~ "             comment=\"All system administrators in the school\""
 #~ msgstr ""
 #~ "/usr/bin/net groupmap add rid=512 unixgroup=admins \\\n"
 #~ "             type=domain ntgroup=\"Domain Admins\" \\\n"
-#~ "             comment=\"All system administrators in the school\"]]"
+#~ "             comment=\"All system administrators in the school\""
 
 #~ msgid ""
 #~ "If you want your Windows computers to be aware of what groups users are "
@@ -15989,8 +16090,8 @@ msgstr ""
 #~ "etch. Se si è installato il sistema prima di questa versione occorre "
 #~ "inizializzare svk una volta con il seguente comando come root:"
 
-#~ msgid "debian-edu-etc-svk init]]"
-#~ msgstr "debian-edu-etc-svk init]]"
+#~ msgid "debian-edu-etc-svk init"
+#~ msgstr "debian-edu-etc-svk init"
 
 #~ msgid ""
 #~ "This adds all files in /etc to svk and also activates the hourly commit "
@@ -16112,8 +16213,8 @@ msgstr ""
 #~ "amministratore. Se si accede per la prima volta dopo l'installazione, il "
 #~ "nome di login è:"
 
-#~ msgid "admin]]"
-#~ msgstr "admin]]"
+#~ msgid "admin"
+#~ msgstr "admin"
 
 #~ msgid ""
 #~ "and the password is the password you entered during the installation for "
@@ -16183,7 +16284,7 @@ msgstr ""
 #~ msgid ""
 #~ "should be added to the server in the {{{/opt/ltsp/i386/etc/lts.conf]]] "
 #~ "file."
-#~ msgstr "dovrebbe essere aggiunta nel file {{{/opt/ltsp/i386/etc/lts.conf]]]"
+#~ msgstr "dovrebbe essere aggiunta nel file {{{/opt/ltsp/i386/etc/lts.conf]"
 
 #~ msgid ""
 #~ "If the main-server profile is selected together with the thin-client-"
@@ -16228,8 +16329,8 @@ msgstr ""
 #~ "Per esempio per aumentare home0 a 30GB si può usare i seguenti comandi:"
 
 #, fuzzy
-#~ msgid "apt-get install mozilla-mplayer ]]"
-#~ msgstr "apt-get install killer]]"
+#~ msgid "apt-get install mozilla-mplayer"
+#~ msgstr "apt-get install killer"
 
 #~ msgid "Other useful plugins"
 #~ msgstr "Altri plugin utili"
@@ -16241,8 +16342,8 @@ msgstr ""
 #~ "Dopo aver aggiunto il repository per il multimedia (vedi <link linkend="
 #~ "\"Usingthemultimediarepository\">sotto</link>):"
 
-#~ msgid "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins]]"
-#~ msgstr "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins]]"
+#~ msgid "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins"
+#~ msgstr "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins"
 
 #~ msgid ""
 #~ "</inlinemediaobject> Due to a bug in LWAT if you want your Windows "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
index 59491e3..5faff7a 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-01-23 15:07-0400\n"
+"POT-Creation-Date: 2013-02-24 13:55-0400\n"
 "PO-Revision-Date: 2012-03-10 18:32+0100\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -24,12 +24,12 @@ msgid "en"
 msgstr "nb"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
-msgstr "Debian Edu / Skolelinux Squeeze 6.0.6+r1 utgivelsesmanual"
+msgid "Debian Edu / Skolelinux Squeeze 6.0.7+r1 Manual"
+msgstr "Debian Edu / Skolelinux Squeeze 6.0.7+r1 utgivelsesmanual"
 
 #. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
-msgstr "Utgivelsesmanual for Debian Edu 6.0.6+r1 kodenavn \"Squeeze\""
+msgid "Manual for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
+msgstr "Utgivelsesmanual for Debian Edu 6.0.7+r1 kodenavn Squeeze"
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/welcome_to_tjener.png"
@@ -40,8 +40,8 @@ msgid "Debian Edu login"
 msgstr "Skolelinux innlogging"
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
-msgstr "Dette er utgivelsesmanualen for Debian Edu Squeeze versjon 6.0.6+r1."
+msgid "This is the manual for the Debian Edu Squeeze 6.0.7+r1 release."
+msgstr "Dette er utgivelsesmanualen for Debian Edu Squeeze versjon 6.0.7+r1."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -1639,11 +1639,10 @@ msgstr ""
 "lenny/installmanual\"> manualen til Debian Installer</ulink>."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
 msgstr ""
-"Last ned et installasjonsmedium for Debian Edu 5.0.4+edu0 Kodenavn \"Lenny\""
+"Last ned et installasjonsmedium for Debian Edu 6.0.7+r1 Kodenavn Squeeze"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
@@ -1668,8 +1667,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1677,8 +1676,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-DVD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1686,8 +1685,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1709,8 +1708,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1718,8 +1717,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-CD.iso</ulink>"
 msgstr ""
 "<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1727,8 +1726,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1748,8 +1747,8 @@ msgstr "Kildekoden er tilgjengelig via"
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1757,8 +1756,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-source-DVD.iso</ulink>"
 msgstr ""
 "<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1766,8 +1765,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -2456,12 +2455,11 @@ msgstr ""
 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.skolelinux.org/skolelinux squeeze local"
 msgstr ""
 "deb http://ftp.debian.org/debian/ etch main \n"
 "deb http://security.debian.org/ etch/updates main \n"
 "deb http://ftp.skolelinux.org/skolelinux etch local\n"
-"]]"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2767,8 +2765,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "d-i    pkgsel/include string my-extra-package(s)]]"
-msgstr "d-i    pkgsel/include string my-extra-package(s)]]"
+msgid "d-i    pkgsel/include string my-extra-package(s)"
+msgstr "d-i    pkgsel/include string my-extra-package(s)"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
@@ -3599,7 +3597,7 @@ msgid ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -3879,14 +3877,14 @@ msgid ""
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 msgstr ""
 "# List existing group mapping between UNIX and Windows groups.\n"
 "net groupmap list\n"
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -3978,7 +3976,7 @@ msgid ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -4569,11 +4567,11 @@ msgstr ""
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 msgstr ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -4737,8 +4735,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
-msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
+msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -5282,7 +5280,7 @@ msgid ""
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5300,10 +5298,8 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "etckeeper vcs log]]"
-msgstr ""
-"debian-edu-etc-svk commit /etc/resolv.conf \n"
-"]]"
+msgid "etckeeper vcs log"
+msgstr "debian-edu-etc-svk commit /etc/resolv.conf \n"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "See which files are currently not tracked and which are not up-to-date:"
@@ -5311,10 +5307,8 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "etckeeper vcs status]]"
-msgstr ""
-"debian-edu-etc-svk commit /etc/resolv.conf \n"
-"]]"
+msgid "etckeeper vcs status"
+msgstr "debian-edu-etc-svk commit /etc/resolv.conf \n"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5323,10 +5317,8 @@ msgstr "For å melde inn en fil manuelt, fordi du ikke vil vente en time:"
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "etckeeper vcs commit -a /etc/resolv.conf]]"
-msgstr ""
-"debian-edu-etc-svk commit /etc/resolv.conf \n"
-"]]"
+msgid "etckeeper vcs commit -a /etc/resolv.conf"
+msgstr "debian-edu-etc-svk commit /etc/resolv.conf \n"
 
 #. type: Content of: <article><section><section><title>
 msgid "Resizing Partitions"
@@ -5459,10 +5451,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 msgstr ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5489,7 +5481,7 @@ msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5509,7 +5501,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ldapvi --ldap-conf -ZD '(cn=admin)']]"
+msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5621,8 +5613,8 @@ msgstr "Bruk av backports.org"
 #, fuzzy, no-wrap
 msgid ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
-msgstr "deb http://ftp.debian.org/debian/ lenny main contrib non-free]]"
+"apt-get update"
+msgstr "deb http://ftp.debian.org/debian/ lenny main contrib non-free"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5652,7 +5644,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5681,10 +5673,10 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 msgstr ""
 "aptitude update \n"
-"aptitude dist-upgrade ]]"
+"aptitude dist-upgrade"
 
 #. type: Content of: <article><section><section><title>
 msgid "Java"
@@ -5767,7 +5759,7 @@ msgstr ""
 #| "  . echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 #| " . fi\n"
 #| "done\n"
-#| "echo \"$created_dir folders has been created\"]]"
+#| "echo \"$created_dir folders has been created\""
 msgid ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5788,7 +5780,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 msgstr ""
 "home_path=\"/skole/tjener/home0\";\n"
 " shared_folder=\"assignments\";\n"
@@ -5808,7 +5800,7 @@ msgstr ""
 "  . echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 " . fi\n"
 "done\n"
-"echo \"$created_dir folders has been created\"]]"
+"echo \"$created_dir folders has been created\""
 
 #. type: Content of: <article><section><section><title>
 msgid "Easy access to USB drives and CDROMs/DVDs"
@@ -5885,7 +5877,7 @@ msgstr ""
 #| "    echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 #| "  fi\n"
 #| "done\n"
-#| "echo \"$created_dir folders has been created\"]]"
+#| "echo \"$created_dir folders has been created\""
 msgid ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5900,7 +5892,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 msgstr ""
 "home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; permissions=\"775\"; created_dir=0;\n"
 "for home in $(ls $home_path); do\n"
@@ -5910,7 +5902,7 @@ msgstr ""
 "    echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "  fi\n"
 "done\n"
-"echo \"$created_dir folders has been created\"]]"
+"echo \"$created_dir folders has been created\""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "A warning about removable media on LTSP servers"
@@ -5967,8 +5959,8 @@ msgstr "For å installere, kjør følgende som root:"
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install killer]]"
-msgstr "apt-get install killer]]"
+msgid "apt-get install killer"
+msgstr "apt-get install killer"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic installation of security upgrades"
@@ -5991,7 +5983,7 @@ msgstr "For å installere, kjør følgende som root:"
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges]]"
+msgid "apt-get install unattended-upgrades apt-listchanges"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6146,12 +6138,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6169,12 +6161,12 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 msgstr ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
@@ -6320,10 +6312,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 msgstr ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6353,8 +6345,8 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "apt-get install gnome lxde]]"
-msgstr "apt-get install killer]]"
+msgid "apt-get install gnome lxde"
+msgstr "apt-get install killer"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6411,8 +6403,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs]]"
-msgstr "apt-get install libdvdcss2 w32codecs]]"
+msgid "apt-get install libdvdcss2 w32codecs"
+msgstr "apt-get install libdvdcss2 w32codecs"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using the multimedia repository"
@@ -6436,7 +6428,7 @@ msgid ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# innstaller debian nøkkelringen sikkert:\n"
 "aptitude install debian-keyring\n"
@@ -6447,7 +6439,7 @@ msgstr ""
 "# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for speil!\n"
 "echo \"deb http://deb-multimedia.org lenny main\" >> /etc/apt/sources.list\n"
 "# oppdater listen over tilgjengelige pakker:\n"
-"aptitude update]]"
+"aptitude update"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -6546,7 +6538,7 @@ msgid ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6647,8 +6639,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
-msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
+msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
+msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -6711,7 +6703,7 @@ msgid ""
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6761,8 +6753,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -6778,8 +6770,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -6801,8 +6793,8 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6821,7 +6813,7 @@ msgid ""
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6885,7 +6877,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7005,12 +6997,12 @@ msgid ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 msgstr ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid "somewhere below the default settings."
@@ -7026,10 +7018,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 msgstr ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -7070,7 +7062,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_SESSION=/usr/bin/startlxde]]"
+msgid "LDM_SESSION=/usr/bin/startlxde"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7194,8 +7186,8 @@ msgstr "Rediger \"/opt/ltsp/i386/etc/lts.conf\" og legg til noe som dette:"
 
 #. type: CDATA
 #, no-wrap
-msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
-msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
+msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
+msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
@@ -7230,7 +7222,7 @@ msgid ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 msgstr ""
 "#!/bin/bash\n"
 "# Randomize the server list contained in MY_SERVER_LIST parameter\n"
@@ -7246,7 +7238,6 @@ msgstr ""
 "SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 "done\n"
 "echo $SHUFFLED_LIST\n"
-"]]"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Part 3"
@@ -7378,14 +7369,13 @@ msgid ""
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 msgstr ""
 "chroot /opt/ltsp/i386\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
 "exit\n"
-"]]"
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
@@ -7406,14 +7396,13 @@ msgid ""
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 msgstr ""
 "chroot /opt/ltsp/i386\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
 "exit\n"
-"]]"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Slow login and security"
@@ -7449,8 +7438,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_DIRECTX=True]]"
-msgstr "LDM_DIRECTX=True]]"
+msgid "LDM_DIRECTX=True"
+msgstr "LDM_DIRECTX=True"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -7523,10 +7512,8 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "X -query ltspserverXX]]"
-msgstr ""
-"X -query ltspserverXX\n"
-"]]"
+msgid "X -query ltspserverXX"
+msgstr "X -query ltspserverXX\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -7536,10 +7523,8 @@ msgstr "Hvis du er i tynnklientnettet, kjøre denne kommandoen:"
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "X -query 192.168.0.254]]"
-msgstr ""
-"X -query 192.168.0.254\n"
-"]]"
+msgid "X -query 192.168.0.254"
+msgstr "X -query 192.168.0.254\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -7567,10 +7552,8 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "* # any host can get a login window]]"
-msgstr ""
-"* # any host can get a login window\n"
-"]]"
+msgid "* # any host can get a login window"
+msgstr "* # any host can get a login window\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -7589,10 +7572,8 @@ msgstr "Slå så på xdmcp i kdm med kommandoen:"
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
-msgstr ""
-"sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true\n"
-"]]"
+msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -7602,10 +7583,8 @@ msgstr "Til slutt restartes kdm ved å kjøre:"
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "sudo invoke-rc.d kdm restart]]"
-msgstr ""
-"sudo invoke-rc.d kdm restart\n"
-"]]"
+msgid "sudo invoke-rc.d kdm restart"
+msgstr "sudo invoke-rc.d kdm restart\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -7703,12 +7682,11 @@ msgstr ""
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 msgstr ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
 "             comment=\"All students in the school\"\n"
-"]]"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
@@ -8377,10 +8355,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
@@ -8936,7 +8914,7 @@ msgid ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -8961,7 +8939,7 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8970,7 +8948,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/usr/sbin/debian-edu-pxeinstall]]"
+msgid "/usr/sbin/debian-edu-pxeinstall"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -9005,7 +8983,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -9016,7 +8994,7 @@ msgstr "Start registereditoren"
 
 #. type: CDATA
 #, no-wrap
-msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
+msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -9031,7 +9009,7 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -9496,12 +9474,18 @@ msgstr ""
 #. type: Content of: <article><section><section><title>
 #, fuzzy
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
 msgstr ""
 "Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Lenny - utgitt  08.02.2010"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
+"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
+"well as the following changes:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
 
@@ -9514,7 +9498,7 @@ msgid "Comply with 3.X kernel"
 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"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9526,7 +9510,15 @@ msgid "Danish translation now complete"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+msgid "debian-edu-config from 1.453 to 1.455"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9579,19 +9571,13 @@ 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"
+msgid "debian-edu-install from 1.528 to 1.530"
 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><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>
 #, fuzzy
 msgid ""
@@ -9922,9 +9908,9 @@ msgstr ""
 
 #. 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."
+"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
+"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -10290,8 +10276,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released "
-"under the GPL2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
 "Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
 "opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
@@ -10321,7 +10307,7 @@ 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) "
+"manual-translations</computeroutput>. The Git 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."
@@ -10336,8 +10322,8 @@ msgstr ""
 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 "
+"check out some files from from Git (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."
@@ -10353,25 +10339,23 @@ msgstr ""
 #| msgid ""
 #| "You can checkout 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):"
+#| "<computeroutput>git</computeroutput> package installed for this to work):"
 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):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "Du kan hente ut kilden for <computeroutput>debian-edu-doc</computeroutput> "
-"anonymt med denne kommandoen (du må ha pakken <computeroutput>subversion</"
+"anonymt med denne kommandoen (du må ha pakken <computeroutput>git</"
 "computeroutput> installert for at dette skal fungere):"
 
 #. 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>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -10389,8 +10373,8 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 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."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
 "Så kan du enten melde filen inn direkte til svn (hvis du har rettigheter til "
 "det) eller sender filen til e-postlisten."
@@ -10404,8 +10388,8 @@ msgstr ""
 "inne i mappen <computeroutput>debian-edu-doc</computeroutput>:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -10431,24 +10415,23 @@ msgstr ""
 #| msgid ""
 #| "Basic information about Alioth (the host where our SVN repository is "
 #| "located) and SVN is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Svn\"/>."
+#| "Alioth/Git\"/>."
 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\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
 "Elementær informasjon om Alioth (verten for vårt SVN-pakkelager) og SVN er "
-"tilgjengelig på <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/>."
+"tilgjengelig på <ulink url=\"http://wiki.debian.org/Alioth/Git\"/>."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 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."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
 "Les /usr/share/doc/debian-edu-doc/README.release-manual-translations for å "
 "finne informasjon om hvordan lage en ny .po-fil for ditt språk hvis det ikke "
@@ -10466,8 +10449,8 @@ msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
-msgstr "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note to translators: there is no need to translate the GPL license text."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -11804,6 +11787,101 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "Oversettelser av dette dokumentet er plassert i .po-filer som i mange "
+#~ "friprogramvareprosjekter, les <computeroutput>usr/share/doc/debian-edu-"
+#~ "doc/README.release-manual-translations</computeroutput> for mer "
+#~ "informasjon om dette. Du må også lese dette hvis du vil starte å "
+#~ "oversette dette dokumentet."
+
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "For å melde inn oversettelser, så må du være medlem av alioth-prosjektet "
+#~ "<computeroutput>debian-edu</computeroutput>. For å oversette, trenger du "
+#~ "bare å hente ut noen filer fra svn (som kan gjøres anonymt), lage patcher "
+#~ "og sende disse til [<ulink url='mailto:debian-edu at lists.debian."
+#~ "org'>debian-edu at lists.debian.org</ulink>]."
+
+#, fuzzy
+#~| msgid ""
+#~| "You can checkout 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):"
+#~ 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):"
+#~ msgstr ""
+#~ "Du kan hente ut kilden for <computeroutput>debian-edu-doc</"
+#~ "computeroutput> anonymt med denne kommandoen (du må ha pakken "
+#~ "<computeroutput>subversion</computeroutput> installert for at dette skal "
+#~ "fungere):"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Så kan du enten melde filen inn direkte til svn (hvis du har rettigheter "
+#~ "til det) eller sender filen til e-postlisten."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Basic information about Alioth (the host where our SVN repository is "
+#~| "located) and SVN is available at <ulink url=\"http://wiki.debian.org/"
+#~| "Alioth/Svn\"/>."
+#~ 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 ""
+#~ "Elementær informasjon om Alioth (verten for vårt SVN-pakkelager) og SVN "
+#~ "er tilgjengelig på <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/>."
+
+#, fuzzy
+#~ 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 ""
+#~ "Les /usr/share/doc/debian-edu-doc/README.release-manual-translations for "
+#~ "å finne informasjon om hvordan lage en ny .po-fil for ditt språk hvis det "
+#~ "ikke finnes noen ennå, og hvordan oppdatere oversettelser."
+
+#, fuzzy
 #~| msgid ""
 #~| "1. Create a user with membership in the \"admins\" group (if not already "
 #~| "existing)"
@@ -11937,14 +12015,13 @@ msgstr ""
 #~ msgid ""
 #~ "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie "
 #~ "it also prevents daemons from being started\n"
-#~ "editor /etc/apt/sources.list]]"
+#~ "editor /etc/apt/sources.list"
 #~ msgstr ""
 #~ "chroot /opt/ltsp/i386\n"
 #~ "aptitude update\n"
 #~ "aptitude upgrade\n"
 #~ "aptitude dist-upgrade\n"
 #~ "exit\n"
-#~ "]]"
 
 #, fuzzy
 #~| msgid ""
@@ -12683,7 +12760,7 @@ msgstr ""
 #~ "homeDirectory = /skole/tjener/home0/2009/%username%\n"
 #~ "groups = none students 2009\n"
 #~ "loginShell = /bin/bash\n"
-#~ "mailMessageStore = /var/lib/maildirs/%username%]]"
+#~ "mailMessageStore = /var/lib/maildirs/%username%"
 #~ msgstr ""
 #~ "[2009]\n"
 #~ "ou = \"ou=People,%base%\"\n"
@@ -12691,7 +12768,7 @@ msgstr ""
 #~ "homeDirectory = /skole/tjener/home0/2009/%username%\n"
 #~ "groups = none students 2009\n"
 #~ "loginShell = /bin/bash\n"
-#~ "mailMessageStore = /var/lib/maildirs/%username%]]"
+#~ "mailMessageStore = /var/lib/maildirs/%username%"
 
 #~ msgid ""
 #~ "To make this work, the 2009 group has to be created before adding the "
@@ -12796,17 +12873,17 @@ msgstr ""
 #~ "for å sørge for at pakken innstalleres fra <computeroutput>non-free</"
 #~ "computeroutput>. Det trengs da en linje som dette:"
 
-#~ msgid "deb http://ftp.debian.org/debian/ lenny main contrib non-free]]"
-#~ msgstr "deb http://ftp.debian.org/debian/ lenny main contrib non-free]]"
+#~ msgid "deb http://ftp.debian.org/debian/ lenny main contrib non-free"
+#~ msgstr "deb http://ftp.debian.org/debian/ lenny main contrib non-free"
 
-#~ msgid "# apt-get update]]"
-#~ msgstr "# apt-get update]]"
+#~ msgid "# apt-get update"
+#~ msgstr "# apt-get update"
 
 #~ msgid "Now you are ready to run this command:"
 #~ msgstr "Nå er du klar for å kjøre denne kommandoen:"
 
-#~ msgid "# apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts]]"
-#~ msgstr "# apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts]]"
+#~ msgid "# apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts"
+#~ msgstr "# apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts"
 
 #, fuzzy
 #~| msgid "FIXME: this is so generic its almost useless"
@@ -12989,13 +13066,13 @@ msgstr ""
 #~ "cp -rv /etc/kde-profile/ $LTSPCHROOT/etc/\n"
 #~ "cp -v /etc/kderc $LTSPCHROOT/etc/\n"
 #~ "cp -v /etc/kde-user-profile $LTSPCHROOT/etc/\n"
-#~ "unset LTSPCHROOT]]"
+#~ "unset LTSPCHROOT"
 #~ msgstr ""
 #~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
 #~ "cp -rv /etc/kde-profile/ $LTSPCHROOT/etc/\n"
 #~ "cp -v /etc/kderc $LTSPCHROOT/etc/\n"
 #~ "cp -v /etc/kde-user-profile $LTSPCHROOT/etc/\n"
-#~ "unset LTSPCHROOT]]"
+#~ "unset LTSPCHROOT"
 
 #, fuzzy
 #~ msgid ""
@@ -13592,12 +13669,11 @@ msgstr ""
 #~ msgstr "endring av sambaoppsett"
 
 #, fuzzy
-#~ msgid ""
-#~ "ldapvi -ZD 'uid=super-admin,ou=People,dc=skole,dc=skolelinux,dc=no']]"
+#~ msgid "ldapvi -ZD 'uid=super-admin,ou=People,dc=skole,dc=skolelinux,dc=no'"
 #~ msgstr ""
 #~ "tjener:~# ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                    -f /etc/ldap/skole-zone2ldap]]"
+#~ " >                    -f /etc/ldap/skole-zone2ldap"
 
 #, fuzzy
 #~ msgid "FIXME: install swi-prolog by default?"
@@ -13679,12 +13755,11 @@ msgstr ""
 #~ msgid ""
 #~ "subnet 10.0.0.0 netmask 255.0.0.0 {\n"
 #~ "        range 10.0.2.100 10.0.3.242;\n"
-#~ "        }]]"
+#~ "        }"
 #~ msgstr ""
 #~ "subnet 10.0.2.0 netmask 255.255.254.0 {\n"
 #~ "        range 10.0.2.100 10.0.3.242;\n"
 #~ "        }\n"
-#~ "]]"
 
 #~ msgid "you have to add this under \"range\":"
 #~ msgstr "du må legge til dette under \"range\":"
@@ -13695,14 +13770,13 @@ msgstr ""
 #~ "next-server xxx;\n"
 #~ "option root-path \"/opt/ltsp/i386\";\n"
 #~ "option log-servers ltspserver01;\n"
-#~ "use-host-decl-names on;]]"
+#~ "use-host-decl-names on;"
 #~ msgstr ""
 #~ "filename \"/var/lib/tftpboot/ltsp/i386/pxelinux.0\";\n"
 #~ "next-server xxx;\n"
 #~ "option root-path \"/opt/ltsp/i386\";\n"
 #~ "option log-servers ltspserver01;\n"
 #~ "use-host-decl-names on;\n"
-#~ "]]"
 
 #~ msgid ""
 #~ "Next-server should be the IP-address or hostname of the server you chose "
@@ -13742,8 +13816,8 @@ msgstr ""
 #~ "FIXME: explain how to install and use italc - <ulink url=\"http://bugs."
 #~ "debian.org/511387\">511387</ulink> explains this quite well actually."
 
-#~ msgid "apt-get install italc-client italc-master]]"
-#~ msgstr "apt-get install italc-client italc-master]]"
+#~ msgid "apt-get install italc-client italc-master"
+#~ msgstr "apt-get install italc-client italc-master"
 
 #, fuzzy
 #~ msgid ""
@@ -14122,12 +14196,11 @@ msgstr ""
 #~ msgid ""
 #~ "Added user: Demo User\n"
 #~ "username: demuse\n"
-#~ "password: somethingsecret]]"
+#~ "password: somethingsecret"
 #~ msgstr ""
 #~ "La til bruker: Demo Bruker\n"
 #~ "Brukernavn: dembru\n"
 #~ "passord: noehemmelig\n"
-#~ "]]"
 
 #~ msgid ""
 #~ "You may miss the option to set a password, that has been set "
@@ -14273,11 +14346,11 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "ldapmodify -x -Z -W -D cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no -f "
-#~ "ext_static.ldif]]"
+#~ "ext_static.ldif"
 #~ msgstr ""
 #~ "tjener:~# ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                    -f /etc/ldap/skole-zone2ldap]]"
+#~ " >                    -f /etc/ldap/skole-zone2ldap"
 
 #~ msgid ""
 #~ "When prompted, enter the LDAP admin password. You now have 40 extra "
@@ -14358,11 +14431,11 @@ msgstr ""
 #~ msgid ""
 #~ "RHOST=admin.example.net\n"
 #~ "RPORT=1234\n"
-#~ "RUSER=backdoor]]"
+#~ "RUSER=backdoor"
 #~ msgstr ""
 #~ "RHOST=admin.example.net\n"
 #~ "RPORT=1234\n"
-#~ "RUSER=backdoor]]"
+#~ "RUSER=backdoor"
 
 #~ msgid ""
 #~ "FIXME: paragraph about access from outside need to be completed and "
@@ -14578,20 +14651,17 @@ msgstr ""
 #~ "etcinsvk log\n"
 #~ "etcinsvk status\n"
 #~ "etcinsvk commit\n"
-#~ "etcinsvk ignore]]"
+#~ "etcinsvk ignore"
 #~ msgstr ""
 #~ "debian-edu-etc-svk diff\n"
 #~ " debian-edu-etc-svk log\n"
 #~ " debian-edu-etc-svk status\n"
 #~ " debian-edu-etc-svk commit\n"
 #~ " debian-edu-etc-svk ignore\n"
-#~ "]]"
 
 #, fuzzy
-#~ msgid "etcinsvk diff -r6 | less]]"
-#~ msgstr ""
-#~ "debian-edu-etc-svk diff -r6 | less \n"
-#~ "]]"
+#~ msgid "etcinsvk diff -r6 | less"
+#~ msgstr "debian-edu-etc-svk diff -r6 | less \n"
 
 #~ msgid "To see the list of changes done in /etc/, use this command:"
 #~ msgstr ""
@@ -14599,10 +14669,8 @@ msgstr ""
 #~ "kommandoen:"
 
 #, fuzzy
-#~ msgid "etcinsvk log | less]]"
-#~ msgstr ""
-#~ "debian-edu-etc-svk log | less \n"
-#~ "]]"
+#~ msgid "etcinsvk log | less"
+#~ msgstr "debian-edu-etc-svk log | less \n"
 
 #, fuzzy
 #~ msgid ""
@@ -14613,10 +14681,8 @@ msgstr ""
 #~ "endringer siden revisjon N skriv:"
 
 #, fuzzy
-#~ msgid "etcinsvk diff -rN | less]]"
-#~ msgstr ""
-#~ "debian-edu-etc-svk diff -rN | less \n"
-#~ "]]"
+#~ msgid "etcinsvk diff -rN | less"
+#~ msgstr "debian-edu-etc-svk diff -rN | less \n"
 
 #~ msgid ""
 #~ "To see the changes done to a specific file between specific revisions, "
@@ -14626,10 +14692,8 @@ msgstr ""
 #~ "revisjoner, oppgi filen og begge revisjonene:"
 
 #, fuzzy
-#~ msgid "etcinsvk diff -r46 -r64 /etc/resolv.conf | less]]"
-#~ msgstr ""
-#~ "debian-edu-etc-svk diff -r46 -r64 /etc/resolv.conf | less \n"
-#~ "]]"
+#~ msgid "etcinsvk diff -r46 -r64 /etc/resolv.conf | less"
+#~ msgstr "debian-edu-etc-svk diff -r46 -r64 /etc/resolv.conf | less \n"
 
 #~ msgid ""
 #~ "To revert a change, use the diff command to look at the change, and edit "
@@ -14641,11 +14705,10 @@ msgstr ""
 #~ "kommando som dette for å gjøre det automatisk:"
 
 #, fuzzy
-#~ msgid "( cd /etc && etcinsvk diff -r6 /etc/resolv.conf | patch -p0 -R )]]"
+#~ msgid "( cd /etc && etcinsvk diff -r6 /etc/resolv.conf | patch -p0 -R )"
 #~ msgstr ""
 #~ "( cd /etc && debian-edu-etc-svk diff -r6 /etc/resolv.conf | patch -p1 -"
 #~ "R )\n"
-#~ "]]"
 
 #, fuzzy
 #~ msgid ""
@@ -14661,10 +14724,8 @@ msgstr ""
 #~ "imageobject>"
 
 #, fuzzy
-#~ msgid "etcinsvk ignore /etc/path/to/file/to/be/ignored]]"
-#~ msgstr ""
-#~ "debian-edu-etc-svk ignore /etc/path/to/file/to/be/ignored \n"
-#~ "]]"
+#~ msgid "etcinsvk ignore /etc/path/to/file/to/be/ignored"
+#~ msgstr "debian-edu-etc-svk ignore /etc/path/to/file/to/be/ignored \n"
 
 #, fuzzy
 #~ msgid "Then make your changes, safe and quit the editor. That's it!"
@@ -14825,12 +14886,11 @@ msgstr ""
 #~ msgid ""
 #~ "deb http://ftp.debian.org/debian/ lenny main \n"
 #~ "deb http://security.debian.org/ lenny/updates main \n"
-#~ "deb http://ftp.skolelinux.org/skolelinux lenny local]]"
+#~ "deb http://ftp.skolelinux.org/skolelinux lenny local"
 #~ msgstr ""
 #~ "deb http://ftp.debian.org/debian/ lenny main \n"
 #~ "deb http://security.debian.org/ lenny/updates main \n"
 #~ "deb http://ftp.skolelinux.org/skolelinux lenny local\n"
-#~ "]]"
 
 #~ msgid ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-"
@@ -14875,7 +14935,7 @@ msgstr ""
 #~ " run slapd. Do not forget to specify those options if you\n"
 #~ " want to look to debugging output:\n"
 #~ " slapd -h 'ldap:/// ldaps:///' -g openldap -u openldap -f /etc/ldap/slapd."
-#~ "conf                     -4]]"
+#~ "conf                     -4"
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d slapd start\n"
 #~ " Starting OpenLDAP: slapd - failed.\n"
@@ -14889,7 +14949,7 @@ msgstr ""
 #~ " run slapd. Do not forget to specify those options if you\n"
 #~ " want to look to debugging output:\n"
 #~ " slapd -h 'ldap:/// ldaps:///' -g openldap -u openldap -f /etc/ldap/slapd."
-#~ "conf                     -4]]"
+#~ "conf                     -4"
 
 #~ msgid ""
 #~ "And searching <computeroutput>/var/log/syslog</computeroutput> yelds "
@@ -14984,7 +15044,7 @@ msgstr ""
 #~ " ldap-method dynamic;\n"
 #~ "            ^\n"
 #~ " Configuration file errors encountered -- exiting\n"
-#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed.]]"
+#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed."
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d dhcp3-server start\n"
 #~ " dhcpd self-test failed. Please fix the config file.\n"
@@ -15009,7 +15069,7 @@ msgstr ""
 #~ " ldap-method dynamic;\n"
 #~ "            ^\n"
 #~ " Configuration file errors encountered -- exiting\n"
-#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed.]]"
+#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed."
 
 #~ msgid ""
 #~ "Then installing <computeroutput>dhcp3-server-ldap</computeroutput> is "
@@ -15020,10 +15080,10 @@ msgstr ""
 
 #~ msgid ""
 #~ "tjener:~# apt-get -q=2 update\n"
-#~ " tjener:~# apt-get -q=2 install dhcp3-server-ldap]]"
+#~ " tjener:~# apt-get -q=2 install dhcp3-server-ldap"
 #~ msgstr ""
 #~ "tjener:~# apt-get -q=2 update\n"
-#~ " tjener:~# apt-get -q=2 install dhcp3-server-ldap]]"
+#~ " tjener:~# apt-get -q=2 install dhcp3-server-ldap"
 
 #~ msgid ""
 #~ "tjener:~# invoke-rc.d dhcp3-server start\n"
@@ -15037,7 +15097,7 @@ msgstr ""
 #~ " Successfully logged into LDAP server ldap\n"
 #~ " Cannot find host LDAP entry dhcp (&(objectClass=dhcpServer)(cn=dhcp))\n"
 #~ " Configuration file errors encountered -- exiting\n"
-#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed.]]"
+#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed."
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d dhcp3-server start\n"
 #~ " dhcpd self-test failed. Please fix the config file.\n"
@@ -15050,7 +15110,7 @@ msgstr ""
 #~ " Successfully logged into LDAP server ldap\n"
 #~ " Cannot find host LDAP entry dhcp (&(objectClass=dhcpServer)(cn=dhcp))\n"
 #~ " Configuration file errors encountered -- exiting\n"
-#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed.]]"
+#~ " invoke-rc.d: initscript dhcp3-server, action \"start\" failed."
 
 #~ msgid ""
 #~ "Then DHCP configuration needs loading into LDAP. Two ways to do it are:"
@@ -15157,7 +15217,7 @@ msgstr ""
 #~ " tjener:/etc/ldap# invoke-rc.d dhcp3-server start\n"
 #~ "  * Starting DHCP server "
 #~ "dhcpd3                                            [ ok ]\n"
-#~ " tjener:/etc/ldap#]]"
+#~ " tjener:/etc/ldap#"
 #~ msgstr ""
 #~ "tjener:~# cd /usr/share/doc/dhcp3-server-ldap/\n"
 #~ " tjener:/usr/share/doc/dhcp3-server-ldap# gunzip dhcpd-conf-to-ldap.pl."
@@ -15197,7 +15257,7 @@ msgstr ""
 #~ " tjener:/etc/ldap# invoke-rc.d dhcp3-server start\n"
 #~ "  * Starting DHCP server "
 #~ "dhcpd3                                            [ ok ]\n"
-#~ " tjener:/etc/ldap#]]"
+#~ " tjener:/etc/ldap#"
 
 #~ msgid "To load The fresh configuration into the database:"
 #~ msgstr "For å laste en friks konfigurasjon inn i datbasen:"
@@ -15225,13 +15285,13 @@ msgstr ""
 #~ " * Starting Squid HTTP proxy squid\n"
 #~ " 2009/08/23 00:20:56| ACL name 'localnet' not defined!\n"
 #~ " FATAL: Bungled squid.conf line 2577: http_access allow localnet\n"
-#~ " Squid Cache (Version 2.7.STABLE3): Terminated abnormally.]]"
+#~ " Squid Cache (Version 2.7.STABLE3): Terminated abnormally."
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d squid start\n"
 #~ " * Starting Squid HTTP proxy squid\n"
 #~ " 2009/08/23 00:20:56| ACL name 'localnet' not defined!\n"
 #~ " FATAL: Bungled squid.conf line 2577: http_access allow localnet\n"
-#~ " Squid Cache (Version 2.7.STABLE3): Terminated abnormally.]]"
+#~ " Squid Cache (Version 2.7.STABLE3): Terminated abnormally."
 
 #~ msgid ""
 #~ "It's complaint is self explanatory. Two options to overcome this are:"
@@ -15254,13 +15314,11 @@ msgstr ""
 #~ msgid ""
 #~ "tjener:~# cd /etc/squid/\n"
 #~ " tjener:/etc/squid# mv squid.conf etch-squid.conf\n"
-#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid."
-#~ "conf]]"
+#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid.conf"
 #~ msgstr ""
 #~ "tjener:~# cd /etc/squid/\n"
 #~ " tjener:/etc/squid# mv squid.conf etch-squid.conf\n"
-#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid."
-#~ "conf]]"
+#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid.conf"
 
 #~ msgid ""
 #~ "To have the default Debian Edu configuration run <computeroutput>cfengine-"
@@ -15330,12 +15388,12 @@ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
 #~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
 #~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
-#~ "(sambaPwdLastSet=0)))' uid  | less]]"
+#~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
 #~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
 #~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
-#~ "(sambaPwdLastSet=0)))' uid  | less]]"
+#~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
 #~ "To add the '<computeroutput>sambaPwdLastSet</computeroutput>' attribute "
@@ -15352,7 +15410,7 @@ msgstr ""
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
 #~ "ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
-#~ "            -f /etc/ldap/fixamba.ldif]]"
+#~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
 #~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
@@ -15361,7 +15419,7 @@ msgstr ""
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
 #~ "ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
-#~ "            -f /etc/ldap/fixamba.ldif]]"
+#~ "            -f /etc/ldap/fixamba.ldif"
 
 #~ msgid ""
 #~ "If users with '<computeroutput>sambaPwdLastSet = 0</computeroutput>' were "
@@ -15378,7 +15436,7 @@ msgstr ""
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
 #~ "ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
-#~ "           -f /etc/ldap/fixamba.ldif]]"
+#~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
 #~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
@@ -15387,7 +15445,7 @@ msgstr ""
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
 #~ "ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
-#~ "           -f /etc/ldap/fixamba.ldif]]"
+#~ "           -f /etc/ldap/fixamba.ldif"
 
 #, fuzzy
 #~ msgid ""
@@ -15412,11 +15470,11 @@ msgstr ""
 #~ msgid ""
 #~ ";RFC2782\n"
 #~ "_ldap._tcp                      IN      SRV     0 100 389 tjener\n"
-#~ "_syslog._udp                    IN      SRV     0 100 514 tjener]]"
+#~ "_syslog._udp                    IN      SRV     0 100 514 tjener"
 #~ msgstr ""
 #~ ";RFC2782\n"
 #~ "_ldap._tcp                      IN      SRV     0 100 389 tjener\n"
-#~ "_syslog._udp                    IN      SRV     0 100 514 tjener]]"
+#~ "_syslog._udp                    IN      SRV     0 100 514 tjener"
 
 #~ msgid "powerdns"
 #~ msgstr "PowerDNS"
@@ -15437,11 +15495,11 @@ msgstr ""
 #~ msgid ""
 #~ "tjener:~# apt-get -q=2 update\n"
 #~ " tjener:~# apt-get -q=2 install pdns-server pdns-recursor pdns-backend-"
-#~ "ldap]]"
+#~ "ldap"
 #~ msgstr ""
 #~ "tjener:~# apt-get -q=2 update\n"
 #~ " tjener:~# apt-get -q=2 install pdns-server pdns-recursor pdns-backend-"
-#~ "ldap]]"
+#~ "ldap"
 
 #, fuzzy
 #~ msgid "In <computeroutput>/etc/ldap/slapd.conf</computeroutput>:"
@@ -15464,10 +15522,10 @@ msgstr ""
 
 #~ msgid ""
 #~ "# PowerDNS index\n"
-#~ " index associatedDomain         pres,eq,sub]]"
+#~ " index associatedDomain         pres,eq,sub"
 #~ msgstr ""
 #~ "# PowerDNS index\n"
-#~ " index associatedDomain         pres,eq,sub]]"
+#~ " index associatedDomain         pres,eq,sub"
 
 #, fuzzy
 #~ msgid ""
@@ -15500,14 +15558,14 @@ msgstr ""
 #~ " >                 -f '/etc/ldap/dns_skole.ldif'\n"
 #~ " tjener:~# ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                 -f '/etc/ldap/dns_arpa.ldif']]"
+#~ " >                 -f '/etc/ldap/dns_arpa.ldif'"
 #~ msgstr ""
 #~ "tjener:~# ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' "
 #~ "\\\n"
 #~ " >                 -f '/etc/ldap/dns_skole.ldif'\n"
 #~ " tjener:~# ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                 -f '/etc/ldap/dns_arpa.ldif']]"
+#~ " >                 -f '/etc/ldap/dns_arpa.ldif'"
 
 #~ msgid ""
 #~ "To <ulink url=\"http://www.linuxnetworks.de/doc/index.php/"
@@ -15551,12 +15609,12 @@ msgstr ""
 #~ "tjener:/tmp# dpkg-deb -x pdns-backend-ldap_2.9.20-8+etch1_i386.deb \\\n"
 #~ " >                     pdns-backend-ldap_2.9.20\n"
 #~ " tjener:/tmp# cp pdns-backend-ldap_2.9.20/usr/bin/zone2ldap /usr/bin/"
-#~ "zone2ldap]]"
+#~ "zone2ldap"
 #~ msgstr ""
 #~ "tjener:/tmp# dpkg-deb -x pdns-backend-ldap_2.9.20-8+etch1_i386.deb \\\n"
 #~ " >                     pdns-backend-ldap_2.9.20\n"
 #~ " tjener:/tmp# cp pdns-backend-ldap_2.9.20/usr/bin/zone2ldap /usr/bin/"
-#~ "zone2ldap]]"
+#~ "zone2ldap"
 
 #~ msgid ""
 #~ "Apparently PowerDNS in Lenny (2.9.21.2) doesn't understand <ulink url="
@@ -15586,13 +15644,13 @@ msgstr ""
 #~ "layout=tree \\\n"
 #~ " >                   --named-conf='/etc/bind/debian-edu/named-bind9.conf' "
 #~ "--resume \\\n"
-#~ " >               > /etc/ldap/skole-zone2ldap]]"
+#~ " >               > /etc/ldap/skole-zone2ldap"
 #~ msgstr ""
 #~ "tjener:~# zone2ldap --basedn='ou=hosts,dc=skole,dc=skolelinux,dc=no' --"
 #~ "layout=tree \\\n"
 #~ " >                   --named-conf='/etc/bind/debian-edu/named-bind9.conf' "
 #~ "--resume \\\n"
-#~ " >               > /etc/ldap/skole-zone2ldap]]"
+#~ " >               > /etc/ldap/skole-zone2ldap"
 
 #~ msgid ""
 #~ "Before the data in the new ldif file can be added to the database the "
@@ -15609,7 +15667,7 @@ msgstr ""
 #~ " objectClass: organizationalUnit\n"
 #~ " objectClass: domainRelatedObject\n"
 #~ " ou: hosts\n"
-#~ " associatedDomain: intern]]"
+#~ " associatedDomain: intern"
 #~ msgstr ""
 #~ "tjener:~# ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no'\n"
@@ -15618,7 +15676,7 @@ msgstr ""
 #~ " objectClass: organizationalUnit\n"
 #~ " objectClass: domainRelatedObject\n"
 #~ " ou: hosts\n"
-#~ " associatedDomain: intern]]"
+#~ " associatedDomain: intern"
 
 #~ msgid ""
 #~ "The format of the ldif file created by <computeroutput>zone2ldap</"
@@ -15630,20 +15688,20 @@ msgstr ""
 #~ msgid ""
 #~ "tjener:~# ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                    -f /etc/ldap/skole-zone2ldap]]"
+#~ " >                    -f /etc/ldap/skole-zone2ldap"
 #~ msgstr ""
 #~ "tjener:~# ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
 #~ "dc=no' \\\n"
-#~ " >                    -f /etc/ldap/skole-zone2ldap]]"
+#~ " >                    -f /etc/ldap/skole-zone2ldap"
 
 #~ msgid ""
 #~ "tjener:~# invoke-rc.d bind9 stop\n"
 #~ " tjener:~# invoke-rc.d pdns start\n"
-#~ " tjener:~# invoke-rc.d pdns-recursor start]]"
+#~ " tjener:~# invoke-rc.d pdns-recursor start"
 #~ msgstr ""
 #~ "tjener:~# invoke-rc.d bind9 stop\n"
 #~ " tjener:~# invoke-rc.d pdns start\n"
-#~ " tjener:~# invoke-rc.d pdns-recursor start]]"
+#~ " tjener:~# invoke-rc.d pdns-recursor start"
 
 #~ msgid ""
 #~ "After testing the new PowerDNS setup Bind9 may be disabled/removed/purged."
@@ -15738,11 +15796,11 @@ msgstr ""
 #~ msgid ""
 #~ "Package: flashplugin-nonfree\n"
 #~ "Pin: release a=lenny-backports\n"
-#~ "Pin-priority: 999]]"
+#~ "Pin-priority: 999"
 #~ msgstr ""
 #~ "Package: flashplugin-nonfree\n"
 #~ "Pin: release a=lenny-backports\n"
-#~ "Pin-priority: 999]]"
+#~ "Pin-priority: 999"
 
 #~ msgid ""
 #~ "as the <computeroutput>flashplugin-nonfree</computeroutput> package is "
@@ -15800,7 +15858,7 @@ msgstr ""
 #~ "# update the list of available packages:\n"
 #~ "aptitude update\n"
 #~ "# Install the keyring package for backports\n"
-#~ "aptitude install debian-backports-keyring ]]"
+#~ "aptitude install debian-backports-keyring"
 #~ msgstr ""
 #~ "# installer debian-keyring sikkert:\n"
 #~ "aptitude install debian-keyring\n"
@@ -15815,7 +15873,6 @@ msgstr ""
 #~ "non-free\" >> /etc/apt/sources.list\n"
 #~ "# oppdater oversikten over tilgjengelige pakker:\n"
 #~ "aptitude update\n"
-#~ "]]"
 
 #~ msgid ""
 #~ "It is possible to save energy and money by turning off client machines at "
@@ -16023,29 +16080,29 @@ msgstr ""
 #~ msgid ""
 #~ "/etc/init.d/squid stop\n"
 #~ "umount /var/spool/squid\n"
-#~ "umount -fl /var ]]"
+#~ "umount -fl /var"
 #~ msgstr ""
 #~ "/etc/init.d/squid stop \n"
 #~ "umount /var/spool/squid\n"
-#~ "umount -fl /var ]]"
+#~ "umount -fl /var"
 
 #~ msgid "2.) fsck the partition:"
 #~ msgstr "2.) kjør fsck på partisjonen:"
 
-#~ msgid "e2fsck -f /dev/vg_system/lv_data ]]"
-#~ msgstr "e2fsck -f /dev/vg_system/lv_data ]]"
+#~ msgid "e2fsck -f /dev/vg_system/lv_data"
+#~ msgstr "e2fsck -f /dev/vg_system/lv_data"
 
 #~ msgid "3.) resize the partition:"
 #~ msgstr "3.) endre størrelse på partisjonen:"
 
-#~ msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
-#~ msgstr "lvextend -L +1GB /dev/vg_system/lv_data ]]"
+#~ msgid "lvextend -L +1GB /dev/vg_system/lv_data"
+#~ msgstr "lvextend -L +1GB /dev/vg_system/lv_data"
 
 #~ msgid "4.) resize the filesystem:"
 #~ msgstr "4.) endre størrelse på filsystemet:"
 
-#~ msgid "resize2fs /dev/vg_system/lv_data]]"
-#~ msgstr "resize2fs /dev/vg_system/lv_data]]"
+#~ msgid "resize2fs /dev/vg_system/lv_data"
+#~ msgstr "resize2fs /dev/vg_system/lv_data"
 
 #~ msgid "5.) mount the partitions again:"
 #~ msgstr "5.) monter partisjonene igjen:"
@@ -16054,22 +16111,21 @@ msgstr ""
 #~ msgid ""
 #~ "mount /var\n"
 #~ "mount /var/spool/squid\n"
-#~ "/etc/init.d/squid start ]]"
+#~ "/etc/init.d/squid start"
 #~ msgstr ""
 #~ "mount /var \n"
 #~ "mount /var/spool/squid\n"
-#~ "/etc/init.d/squid start ]]"
+#~ "/etc/init.d/squid start"
 
 #, fuzzy
 #~ msgid ""
 #~ "deb http://ftp.debian.org/debian lenny main\n"
 #~ "deb http://security.debian.org/ lenny/updates main \n"
-#~ "deb http://ftp.skolelinux.org/skolelinux lenny local]]"
+#~ "deb http://ftp.skolelinux.org/skolelinux lenny local"
 #~ msgstr ""
 #~ "deb http://ftp.debian.org/debian/ etch main \n"
 #~ "deb http://security.debian.org/ etch/updates main \n"
 #~ "deb http://ftp.skolelinux.org/skolelinux etch local\n"
-#~ "]]"
 
 #~ msgid "And start the upgrade with:"
 #~ msgstr "Nå kan du starte oppgraderingen med:"
@@ -16194,13 +16250,12 @@ msgstr ""
 #~ "Errors were encountered while processing:\n"
 #~ " mozilla-firefox-locale-it\n"
 #~ " mozilla-firefox-locale-el\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " mozilla-firefox-locale-it\n"
 #~ " mozilla-firefox-locale-el\n"
 #~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ "]]"
 
 #, fuzzy
 #~ msgid ""
@@ -16216,8 +16271,8 @@ msgstr ""
 #~ "begge linjen som inneholder: <emphasis>update-mozilla-firefox-chrome</"
 #~ "emphasis>. Så kan du starte oppgraderingsprosessen på nytt:"
 
-#~ msgid "apt-get -f install]]"
-#~ msgstr "apt-get -f install]]"
+#~ msgid "apt-get -f install"
+#~ msgstr "apt-get -f install"
 
 #~ msgid "Now the upgrade continues:"
 #~ msgstr "Nå skal oppgraderingen fortsette:"
@@ -16236,11 +16291,11 @@ msgstr ""
 #~ msgid ""
 #~ "Errors were encountered while processing:\n"
 #~ " slapd\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " /var/cache/apt/archives/courier-authlib-ldap_0.58-4_i386.deb\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 
 #~ msgid ""
 #~ "In order to fix this, rename this directory: <emphasis>/var/backups/"
@@ -16256,10 +16311,10 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "chown -R openldap:openldap /etc/ldap/\n"
-#~ "apt-get -f install]]"
+#~ "apt-get -f install"
 #~ msgstr ""
 #~ "chown -R openldap:openldap /etc/ldap/ \n"
-#~ "apt-get -f install]]"
+#~ "apt-get -f install"
 
 #~ msgid ""
 #~ "Then the installation should finish <emphasis role=\"strong\">without</"
@@ -16270,8 +16325,8 @@ msgstr ""
 #~ "emphasis> feil. Siden mange pakker nå ikke er oppgraderte bør du starte "
 #~ "dist-upgrade prosessen igjen med:"
 
-#~ msgid "aptitude dist-upgrade]]"
-#~ msgstr "aptitude dist-upgrade]]"
+#~ msgid "aptitude dist-upgrade"
+#~ msgstr "aptitude dist-upgrade"
 
 #, fuzzy
 #~ msgid "The next error raising up is this one:"
@@ -16281,18 +16336,18 @@ msgstr ""
 #~ msgid ""
 #~ "Errors were encountered while processing:\n"
 #~ " /var/cache/apt/archives/courier-authlib-ldap_0.58-4_i386.deb\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 #~ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " /var/cache/apt/archives/courier-authlib-ldap_0.58-4_i386.deb\n"
-#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
+#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)"
 
 #~ msgid "Please remove the package: <emphasis>courier-ldap</emphasis> with"
 #~ msgstr ""
 #~ "Du må fjerne pakken: <emphasis>courier-ldap</emphasis> med kommandoen"
 
-#~ msgid "aptitude remove courier-ldap]]"
-#~ msgstr "aptitude remove courier-ldap]]"
+#~ msgid "aptitude remove courier-ldap"
+#~ msgstr "aptitude remove courier-ldap"
 
 #~ msgid ""
 #~ "and wait until it is finished.Then restart the dist-upgrade process again."
@@ -16317,8 +16372,8 @@ msgstr ""
 #~ "Det eneste gjenstående oppgraderingsproblemet er at brukeren til bind9 er "
 #~ "endret, så du må kjøre chown på alle bind-oppsettsfiler."
 
-#~ msgid "chown bind:root -R /etc/bind ]]"
-#~ msgstr "chown bind:root -R /etc/bind ]]"
+#~ msgid "chown bind:root -R /etc/bind"
+#~ msgstr "chown bind:root -R /etc/bind"
 
 #~ msgid "Samba groupmaps handeling changed"
 #~ msgstr "Håndtering av samba gruppekart (groupmaps) er endret"
@@ -16350,12 +16405,11 @@ msgstr ""
 #~ msgid ""
 #~ "/usr/bin/net groupmap add rid=512 unixgroup=admins \\\n"
 #~ "             type=domain ntgroup=\"Domain Admins\" \\\n"
-#~ "             comment=\"All system administrators in the school\"]]"
+#~ "             comment=\"All system administrators in the school\""
 #~ msgstr ""
 #~ "/usr/bin/net groupmap add rid=512 unixgroup=admins \\\n"
 #~ "             type=domain ntgroup=\"Domain Admins\" \\\n"
 #~ "             comment=\"All system administrators in the school\"\n"
-#~ "]]"
 
 #, fuzzy
 #~ msgid ""
@@ -16444,10 +16498,8 @@ msgstr ""
 #~ "med følgende kommando kjørt som root:"
 
 #, fuzzy
-#~ msgid "debian-edu-etc-svk init]]"
-#~ msgstr ""
-#~ "debian-edu-etc-svk init\n"
-#~ "]]"
+#~ msgid "debian-edu-etc-svk init"
+#~ msgstr "debian-edu-etc-svk init\n"
 
 #~ msgid ""
 #~ "This adds all files in /etc to svk and also activates the hourly commit "
@@ -16560,8 +16612,8 @@ msgstr ""
 #~ "administrasjonskontoen din. Hvis du besøker denne siden for første gang "
 #~ "etter installasjon er innloggingsnavnet der:"
 
-#~ msgid "admin]]"
-#~ msgstr "admin]]"
+#~ msgid "admin"
+#~ msgstr "admin"
 
 #~ msgid ""
 #~ "and the password is the password you entered during the installation for "
@@ -16621,8 +16673,8 @@ msgstr ""
 #~ msgstr "F.eks., for å utvide home0 til 30GB bruker du følgende kommandoer:"
 
 #, fuzzy
-#~ msgid "apt-get install mozilla-mplayer ]]"
-#~ msgstr "apt-get -f install]]"
+#~ msgid "apt-get install mozilla-mplayer"
+#~ msgstr "apt-get -f install"
 
 #~ msgid "Other useful plugins"
 #~ msgstr "Andre nyttige programtillegg"
@@ -16634,10 +16686,8 @@ msgstr ""
 #~ msgstr "Etter å ha lagt til multimediaarkivet (se nedenfor):"
 
 #, fuzzy
-#~ msgid "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins]]"
-#~ msgstr ""
-#~ "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins\n"
-#~ "]]"
+#~ msgid "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins"
+#~ msgstr "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins\n"
 
 #, fuzzy
 #~ msgid ""
@@ -16683,10 +16733,8 @@ msgstr ""
 #~ msgstr "og foreta en endring i /etc/apt/sources.list"
 
 #, fuzzy
-#~ msgid "deb http://ftp.skolelinux.org/skolelinux/ lenny-test local]]"
-#~ msgstr ""
-#~ "deb http://ftp.skolelinux.org/skolelinux/ etch-test local\n"
-#~ "]]"
+#~ msgid "deb http://ftp.skolelinux.org/skolelinux/ lenny-test local"
+#~ msgstr "deb http://ftp.skolelinux.org/skolelinux/ etch-test local\n"
 
 #, fuzzy
 #~ msgid ""
@@ -16776,13 +16824,12 @@ msgstr ""
 #~ "host static00 {\n"
 #~ "  hardware ethernet 00:00:00:00:00:00;\n"
 #~ "  fixed-address static00;\n"
-#~ "}]]"
+#~ "}"
 #~ msgstr ""
 #~ "host static00 {\n"
 #~ "  hardware ethernet 00:00:00:00:00:00;\n"
 #~ "  fixed-address static00;\n"
 #~ "}\n"
-#~ "]]"
 
 #~ msgid ""
 #~ "You need to replace the all-zero MAC-address with the correct one of your "
@@ -16796,13 +16843,12 @@ msgstr ""
 #~ "host static00 {\n"
 #~ "  hardware ethernet 00:40:05:AF:4E:C6;\n"
 #~ "  fixed-address static00;\n"
-#~ "}]]"
+#~ "}"
 #~ msgstr ""
 #~ "host static00 {\n"
 #~ "  hardware ethernet 00:40:05:AF:4E:C6;\n"
 #~ "  fixed-address static00;\n"
 #~ "}\n"
-#~ "]]"
 
 #~ msgid ""
 #~ "</inlinemediaobject> Don't forget to restart the dhcpd as described above "
@@ -16853,7 +16899,7 @@ msgstr ""
 #~ "\n"
 #~ "wget http://ftp.de.debian.org/debian/pool/main/s/swi-prolog/swi-"
 #~ "prolog_5.2.13-1_i386.deb\n"
-#~ "dpkg -i swi-prolog_5.2.13-1_i386.deb]]"
+#~ "dpkg -i swi-prolog_5.2.13-1_i386.deb"
 #~ msgstr ""
 #~ "# swi-prolog er avhengig av libreadline4, som heller ikke ligger i etch\n"
 #~ "wget http://ftp.de.debian.org/debian/pool/main/r/readline4/"
@@ -16863,7 +16909,6 @@ msgstr ""
 #~ "wget http://ftp.de.debian.org/debian/pool/main/s/swi-prolog/swi-"
 #~ "prolog_5.2.13-1_i386.deb\n"
 #~ "dpkg -i swi-prolog_5.2.13-1_i386.deb\n"
-#~ "]]"
 
 #, fuzzy
 #~ msgid "Manual for Debian Edu Etch 5.0.3+edu0 Codename \"Lenny\""
@@ -16940,9 +16985,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "{{{deb <ulink url=\"http://ftp.debian.org/debian\"/> etch main"
-#~ msgstr ""
-#~ "deb http://volatile.debian.org/debian-volatile etch/volatile main\n"
-#~ "]]"
+#~ msgstr "deb http://volatile.debian.org/debian-volatile etch/volatile main\n"
 
 #, fuzzy
 #~ msgid ""
@@ -16951,11 +16994,11 @@ msgstr ""
 #~ msgstr ""
 #~ "deb http://ftp.debian.org/debian etch main \n"
 #~ "deb http://security.debian.org/ etch/updates main \n"
-#~ "deb http://ftp.skolelinux.org/skolelinux etch local]]"
+#~ "deb http://ftp.skolelinux.org/skolelinux etch local"
 
 #, fuzzy
 #~ msgid "aptitude dist-upgrade }}}"
-#~ msgstr "aptitude dist-upgrade]]"
+#~ msgstr "aptitude dist-upgrade"
 
 #, fuzzy
 #~ msgid "E: Sub-process /usr/bin/dpkg returned an error code (1) }}}"
@@ -16963,7 +17006,6 @@ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " slapd\n"
 #~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ "]]"
 
 #, fuzzy
 #~ msgid "E: Sub-process /usr/bin/dpkg returned an error code (1)}}}"
@@ -16971,7 +17013,6 @@ msgstr ""
 #~ "Errors were encountered while processing: \n"
 #~ " slapd\n"
 #~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ "]]"
 
 #~ msgid "<phrase>attachment:network-arch.png</phrase>"
 #~ msgstr "<phrase>attachment:network-arch.png</phrase>"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index da30680..d9ebf4a 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-01-23 15:13-0400\n"
+"POT-Creation-Date: 2013-02-24 13:55-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,11 +21,11 @@ msgid "en"
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
+msgid "Debian Edu / Skolelinux Squeeze 6.0.7+r1 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 6.0.7+r1 Codename \"Squeeze\""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
@@ -37,7 +37,7 @@ msgid "Debian Edu login"
 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 Squeeze 6.0.7+r1 release."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -1021,7 +1021,7 @@ 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 6.0.7+r1 Codename \"Squeeze\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1037,20 +1037,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-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1065,20 +1065,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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1091,20 +1091,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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -1541,7 +1541,7 @@ msgstr ""
 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.skolelinux.org/skolelinux squeeze local"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -1748,7 +1748,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "d-i    pkgsel/include string my-extra-package(s)]]"
+msgid "d-i    pkgsel/include string my-extra-package(s)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2364,7 +2364,7 @@ msgid ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -2599,7 +2599,7 @@ msgid ""
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2667,7 +2667,7 @@ msgid ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -3036,7 +3036,7 @@ msgstr ""
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3135,7 +3135,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
+msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3535,7 +3535,7 @@ msgid ""
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -3550,7 +3550,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs log]]"
+msgid "etckeeper vcs log"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3559,7 +3559,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs status]]"
+msgid "etckeeper vcs status"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3569,7 +3569,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs commit -a /etc/resolv.conf]]"
+msgid "etckeeper vcs commit -a /etc/resolv.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -3647,7 +3647,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3675,7 +3675,7 @@ msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -3694,7 +3694,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ldapvi --ldap-conf -ZD '(cn=admin)']]"
+msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3785,7 +3785,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3816,7 +3816,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3845,7 +3845,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -3911,7 +3911,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -3967,7 +3967,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -4010,7 +4010,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install killer]]"
+msgid "apt-get install killer"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4033,7 +4033,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges]]"
+msgid "apt-get install unattended-upgrades apt-listchanges"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4118,7 +4118,7 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4134,7 +4134,7 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4252,7 +4252,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4278,7 +4278,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde]]"
+msgid "apt-get install gnome lxde"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4318,7 +4318,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs]]"
+msgid "apt-get install libdvdcss2 w32codecs"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4341,7 +4341,7 @@ msgid ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4425,7 +4425,7 @@ msgid ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4490,7 +4490,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
+msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4535,7 +4535,7 @@ msgid ""
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4566,7 +4566,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4577,7 +4577,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4594,7 +4594,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
+msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4614,7 +4614,7 @@ msgid ""
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4662,7 +4662,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4756,7 +4756,7 @@ msgid ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4773,7 +4773,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4802,7 +4802,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_SESSION=/usr/bin/startlxde]]"
+msgid "LDM_SESSION=/usr/bin/startlxde"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4881,7 +4881,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
+msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -4908,7 +4908,7 @@ msgid ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -4988,7 +4988,7 @@ msgid ""
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -5009,7 +5009,7 @@ msgid ""
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5030,7 +5030,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_DIRECTX=True]]"
+msgid "LDM_DIRECTX=True"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5081,7 +5081,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5090,7 +5090,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query 192.168.0.254]]"
+msgid "X -query 192.168.0.254"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5107,7 +5107,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "* # any host can get a login window]]"
+msgid "* # any host can get a login window"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5122,7 +5122,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
+msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5131,7 +5131,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo invoke-rc.d kdm restart]]"
+msgid "sudo invoke-rc.d kdm restart"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5188,7 +5188,7 @@ msgstr ""
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -5555,7 +5555,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6034,7 +6034,7 @@ msgid ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -6053,7 +6053,7 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6062,7 +6062,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/usr/sbin/debian-edu-pxeinstall]]"
+msgid "/usr/sbin/debian-edu-pxeinstall"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6089,7 +6089,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6098,7 +6098,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
+msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6113,7 +6113,7 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6430,8 +6430,14 @@ 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?-??"
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
+"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
+"well as the following changes:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -6447,7 +6453,7 @@ msgid "Comply with 3.X kernel"
 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"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6459,7 +6465,15 @@ msgid "Danish translation now complete"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+msgid "debian-edu-config from 1.453 to 1.455"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6512,19 +6526,13 @@ 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"
+msgid "debian-edu-install from 1.528 to 1.530"
 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><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 ""
 "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
@@ -6818,9 +6826,9 @@ msgstr ""
 
 #. 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."
+"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
+"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7168,7 +7176,7 @@ 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) "
+"manual-translations</computeroutput>. The Git 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."
@@ -7178,8 +7186,8 @@ msgstr ""
 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 "
+"check out some files from from Git (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."
@@ -7189,14 +7197,13 @@ msgstr ""
 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):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 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>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7209,8 +7216,8 @@ 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."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7220,7 +7227,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7240,19 +7247,18 @@ 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\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 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."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7265,7 +7271,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
index 32e53cc..2dc1440 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
@@ -1,12 +1,12 @@
 <?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 Squeeze 6.0.7+r1 Manual <?dbtimestamp?></title></articleinfo>
 <section id="AboutDebianEdu">
-<title>Manual for Debian Edu 6.0.6+r1 Codename "Squeeze"
+<title>Manual for Debian Edu 6.0.7+r1 Codename "Squeeze"
 </title>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/welcome_to_tjener.png"/></imageobject><textobject><phrase>Debian Edu login</phrase></textobject></inlinemediaobject> 
 </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 Squeeze 6.0.7+r1 release.  
 </para>
 <para>The version at <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze"/> is a wiki and updated frequently.  
 </para>
@@ -420,8 +420,8 @@
 </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_6.0.7.2B-r1_Codename_.22Squeeze.22">
+<title>Download the installation media for Debian Edu 6.0.7+r1 Codename "Squeeze"
 </title>
 
 <section id="Installation--DVD_for_i386.2C_amd64">
@@ -430,11 +430,11 @@
 <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>
 <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-6.0.7+r1-DVD.iso">debian-edu-6.0.7+r1-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-6.0.7+r1-DVD.iso">debian-edu-6.0.7+r1-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-6.0.7+r1-DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -444,11 +444,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-6.0.7+r1-CD.iso">debian-edu-6.0.7+r1-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-6.0.7+r1-CD.iso">debian-edu-6.0.7+r1-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-6.0.7+r1-CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -458,11 +458,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-6.0.7+r1-source-DVD.iso">debian-edu-6.0.7+r1-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-6.0.7+r1-source-DVD.iso">debian-edu-6.0.7+r1-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-6.0.7+r1-source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -2905,11 +2905,14 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <title>New features in Debian Edu Squeeze
 </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?-??
+<section id="Features--Changes_for_Debian_Edu_6.0.7.2B-r1_Codename_.22Squeeze.22_released_2013-03-03">
+<title>Changes for Debian Edu 6.0.7+r1 Codename "Squeeze" released 2013-03-03
 </title>
 <itemizedlist>
 <listitem>
+<para>Debian Edu 6.0.7+r1 Codename "Squeeze" is an incremental update to Debian Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as well as the following changes: 
+</para></listitem>
+<listitem>
 <para>sitesummary was updated from 0.1.3 to 0.1.8 
 </para>
 <itemizedlist>
@@ -2920,7 +2923,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <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>debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1 
 </para>
 <itemizedlist>
 <listitem>
@@ -2930,10 +2933,16 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>Danish translation now complete 
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para>debian-edu-config from 1.453 to 1.454 
+<para>debian-edu-config from 1.453 to 1.455 
 </para>
 <itemizedlist>
 <listitem>
+<para>Fix /etc/hosts for LTSP diskless workstations. Closes: #699880 
+</para></listitem>
+<listitem>
+<para>Make ltsp_local_mount script work for multiple devices. 
+</para></listitem>
+<listitem>
 <para>Correct Kerberos user policy: don't expire password after 2 days. Closes: #664596 
 </para></listitem>
 <listitem>
@@ -2969,15 +2978,12 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>Add Danish web page 
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para>debian-edu-install from 1.528 to 1.529 
+<para>debian-edu-install from 1.528 to 1.530 
 </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">
@@ -3159,7 +3165,7 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 <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>The Debian Edu Squeeze Manual is fully translated to German, French, Italian and Danish (new). Partly translated versions exist for Norwegian Bokmal and Spanish. 
 </para></listitem>
 <listitem>
 <para>Improvements to many language tasks, especially French and Danish. 
@@ -3349,32 +3355,32 @@ 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-squeeze-manual-translations</computeroutput>. The Git 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>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 Git (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>
-<para>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): 
+<para>You can check out the <computeroutput>debian-edu-doc</computeroutput> source anonymously with the following command (you need to have the <computeroutput>git</computeroutput> package installed for this to work): 
 </para>
 <itemizedlist><listitem override="none">
-<para><computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc</computeroutput> 
+<para><computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc.git</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>
-<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>Then you either commit the file directly to Git (if you have the rights to do so) or send the file to the bugreport. 
 </para>
 <para>To update your local copy of the repository use the following command inside the <computeroutput>debian-edu-doc</computeroutput> directory: 
 </para>
 <itemizedlist><listitem override="none">
-<para><computeroutput>svn up</computeroutput> 
+<para><computeroutput>git pull</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>
 <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> --> 
 </para>
-<para>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"/>. 
+<para>Basic information about Alioth (the host where our Git repository is located) and Git is available at <ulink url="http://wiki.debian.org/Alioth/Git"/>. 
 </para>
-<para>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. 
+<para>If you are new to Git, look at the <ulink url="http://git-scm.com/book">Pro Git</ulink> book; it has a chapter on the <ulink url="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository">recording changes to the repository</ulink>. Also you might want to look at the <computeroutput>gitk</computeroutput> package that provides a GUI for Git. 
 </para>
 <para>Please report any problems. 
 </para>
@@ -3385,8 +3391,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_6.0.7.2B-r1_Codename_.22Squeeze.22">
+<title>Manual for Debian Edu 6.0.7+r1 Codename "Squeeze"
 </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>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
index b87605e..d840c9a 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.zh\n"
-"POT-Creation-Date: 2013-01-23 15:07-0400\n"
+"POT-Creation-Date: 2013-02-24 13:55-0400\n"
 "PO-Revision-Date: 2011-03-28 20:21+0800\n"
 "Last-Translator: Andrew Lee <ajqlee at debian.org>\n"
 "Language-Team: zh-l10n <zh-l10n at lists.linux.org.tw>\n"
@@ -24,12 +24,12 @@ msgstr "zh_tw"
 
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
+msgid "Debian Edu / Skolelinux Squeeze 6.0.7+r1 Manual"
 msgstr "\"Debian Edu / Skolelinux Lenny 5.0.1+edu0~alpha 使用手冊\""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+msgid "Manual for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
 msgstr "Debian Edu 5.0.3+edu0 代號 \"Lenny\" 使用手冊"
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
@@ -42,7 +42,7 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
+msgid "This is the manual for the Debian Edu Squeeze 6.0.7+r1 release."
 msgstr ""
 "這是一本 Debian Edu Lenny 5.0.3+edu0 版本(<emphasis>尚未完成</emphasis>) 的手"
 "冊."
@@ -1337,7 +1337,7 @@ msgstr ""
 #. type: Content of: <article><section><section><title>
 #, fuzzy
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 6.0.7+r1 Codename \"Squeeze\""
 msgstr "Debian Edu 5.0.3+edu0 代號 \"Lenny\" 使用手冊"
 
 #. type: Content of: <article><section><section><section><title>
@@ -1353,20 +1353,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-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-DVD."
+"iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-"
+"DVD.iso debian-edu-6.0.7+r1-DVD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1381,20 +1381,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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-CD."
+"iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-"
+"CD.iso debian-edu-6.0.7+r1-CD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1407,20 +1407,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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-"
+"source-DVD.iso\">debian-edu-6.0.7+r1-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-6.0.7+r1-"
+"source-DVD.iso debian-edu-6.0.7+r1-source-DVD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -1867,7 +1867,7 @@ msgstr ""
 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.skolelinux.org/skolelinux squeeze local"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2082,7 +2082,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "d-i    pkgsel/include string my-extra-package(s)]]"
+msgid "d-i    pkgsel/include string my-extra-package(s)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2796,7 +2796,7 @@ msgid ""
 "  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\"]]"
+"  kadmin.local -q \"modpol -maxlife 0secs users\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -3034,7 +3034,7 @@ msgid ""
 "\n"
 "# Add your new or otherwise missing groups:\n"
 "net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
-"                 comment=\"DESCRIPTION OF NEW GROUP\"]]"
+"                 comment=\"DESCRIPTION OF NEW GROUP\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3105,7 +3105,7 @@ msgid ""
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
+"enter password: █"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -3502,7 +3502,7 @@ msgstr ""
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
-"   /skole/tjener/home0/user_<date>]]"
+"   /skole/tjener/home0/user_<date>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3607,7 +3607,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]"
+msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4038,7 +4038,7 @@ msgid ""
 "etckeeper vcs diff\n"
 "etckeeper vcs add .\n"
 "etckeeper vcs commit -a\n"
-"man etckeeper]]"
+"man etckeeper"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -4053,7 +4053,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs log]]"
+msgid "etckeeper vcs log"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4062,7 +4062,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs status]]"
+msgid "etckeeper vcs status"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4072,7 +4072,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "etckeeper vcs commit -a /etc/resolv.conf]]"
+msgid "etckeeper vcs commit -a /etc/resolv.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4150,7 +4150,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
-"resize2fs /dev/vg_system/skole+tjener+home0]]"
+"resize2fs /dev/vg_system/skole+tjener+home0"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4178,7 +4178,7 @@ msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
 "  # after installation, start a graphical session for the first user \n"
-"  $ startx]]"
+"  $ startx"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4197,7 +4197,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ldapvi --ldap-conf -ZD '(cn=admin)']]"
+msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4288,7 +4288,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4319,7 +4319,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
-"apt-cdrom add -m]]"
+"apt-cdrom add -m"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4348,7 +4348,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt-get update\n"
-"apt-get upgrade]]"
+"apt-get upgrade"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4414,7 +4414,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders have been created\"]]"
+" echo \"$created_dir folders have been created\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4470,7 +4470,7 @@ msgid ""
 "        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
-" echo \"$created_dir folders has been created\"]]"
+" echo \"$created_dir folders has been created\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -4513,7 +4513,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install killer]]"
+msgid "apt-get install killer"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4536,7 +4536,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges]]"
+msgid "apt-get install unattended-upgrades apt-listchanges"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4621,7 +4621,7 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  sitesummary-nodes -w]]"
+"  sitesummary-nodes -w"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4637,7 +4637,7 @@ msgid ""
 "#!/bin/sh\n"
 "  PATH=/usr/sbin:$PATH\n"
 "  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts]]"
+"  netgroup -h shutdown-at-night-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4771,7 +4771,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
-"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\"]]"
+"THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4800,7 +4800,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde]]"
+msgid "apt-get install gnome lxde"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4840,7 +4840,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs]]"
+msgid "apt-get install libdvdcss2 w32codecs"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4863,7 +4863,7 @@ msgid ""
 "# 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"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4957,7 +4957,7 @@ msgid ""
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
 "# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels]]"
+"ltsp-update-kernels"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5026,7 +5026,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$]]"
+msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5071,7 +5071,7 @@ msgid ""
 "d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
-"d-i     apt-setup/local1/key    string          http://example.org/key.asc]]"
+"d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5102,7 +5102,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5113,7 +5113,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5130,7 +5130,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]"
+msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5150,7 +5150,7 @@ msgid ""
 "\n"
 "label ltsp\n"
 "kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3]]"
+"append ro initrd=initrd.img boot=nfs quiet 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5204,7 +5204,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5299,7 +5299,7 @@ msgid ""
 "[192.168.0.10]\n"
 "X_MODE_0 = 1280x1024\n"
 "X_HORZSYNC = \"60-70\"\n"
-"X_VERTREFRESH = \"59-62\"]]"
+"X_VERTREFRESH = \"59-62\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5316,7 +5316,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
-"XSERVER = nvidia]]"
+"XSERVER = nvidia"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5345,7 +5345,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_SESSION=/usr/bin/startlxde]]"
+msgid "LDM_SESSION=/usr/bin/startlxde"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5424,7 +5424,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\"]]"
+msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -5451,7 +5451,7 @@ msgid ""
 " for i in $TMP_LIST; do\n"
 "     SHUFFLED_LIST=\"$SHUFFLED_LIST $(echo $i | cut -d_ -f2)\"\n"
 " done\n"
-" echo $SHUFFLED_LIST]]"
+" echo $SHUFFLED_LIST"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -5531,7 +5531,7 @@ msgid ""
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
-"exit]]"
+"exit"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -5552,7 +5552,7 @@ msgid ""
 "#editor /etc/apt/sources.list\n"
 "aptitude update\n"
 "aptitude install $new_package\n"
-"exit]]"
+"exit"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5573,7 +5573,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "LDM_DIRECTX=True]]"
+msgid "LDM_DIRECTX=True"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5624,7 +5624,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5633,7 +5633,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query 192.168.0.254]]"
+msgid "X -query 192.168.0.254"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5650,7 +5650,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "* # any host can get a login window]]"
+msgid "* # any host can get a login window"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5668,7 +5668,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]"
+msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5677,7 +5677,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo invoke-rc.d kdm restart]]"
+msgid "sudo invoke-rc.d kdm restart"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5734,7 +5734,7 @@ msgstr ""
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
 "             type=domain ntgroup=\"students\" \\\n"
-"             comment=\"All students in the school\"]]"
+"             comment=\"All students in the school\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -6101,7 +6101,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6599,7 +6599,7 @@ msgid ""
 "# change into the new directory\n"
 "root at tjener:~# cd /etc/debian-edu/www/debian\n"
 "# extract the file\n"
-"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz]]"
+"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -6618,7 +6618,7 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6627,7 +6627,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "/usr/sbin/debian-edu-pxeinstall]]"
+msgid "/usr/sbin/debian-edu-pxeinstall"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6654,7 +6654,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
-"deb http://www/debian/ stable non-free]]"
+"deb http://www/debian/ stable non-free"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6663,7 +6663,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list]]"
+msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6678,7 +6678,7 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers]]"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7046,11 +7046,17 @@ msgstr ""
 #. type: Content of: <article><section><section><title>
 #, fuzzy
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
 msgstr "Debian Edu 5.0.3+edu0 代號 \"Lenny\" 使用手冊"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
+"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
+"well as the following changes:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
 
@@ -7063,7 +7069,7 @@ msgid "Comply with 3.X kernel"
 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"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7075,7 +7081,15 @@ msgid "Danish translation now complete"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+msgid "debian-edu-config from 1.453 to 1.455"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7128,19 +7142,13 @@ 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"
+msgid "debian-edu-install from 1.528 to 1.530"
 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><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>
 #, fuzzy
 msgid ""
@@ -7449,9 +7457,9 @@ msgstr ""
 
 #. 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."
+"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
+"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7785,8 +7793,8 @@ 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."
+"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><title>
@@ -7810,7 +7818,7 @@ 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) "
+"manual-translations</computeroutput>. The Git 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."
@@ -7820,8 +7828,8 @@ msgstr ""
 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 "
+"check out some files from from Git (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."
@@ -7832,16 +7840,15 @@ msgstr ""
 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):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "(此 <computeroutput>debian-edu-doc</computeroutput> 的來源檔套件(source "
 "package) 中包含了這個 <computeroutput>dia</computeroutput> 檔案。)"
 
 #. 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>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7854,8 +7861,8 @@ 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."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7865,7 +7872,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7885,19 +7892,18 @@ 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\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 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."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7910,7 +7916,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-squeeze/fixme-status.txt b/documentation/debian-edu-squeeze/fixme-status.txt
index 35ae06b..1083f1c 100644
--- a/documentation/debian-edu-squeeze/fixme-status.txt
+++ b/documentation/debian-edu-squeeze/fixme-status.txt
@@ -6,9 +6,6 @@ http://wiki.debian.org/DebianEdu/Documentation/Squeeze//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/Squeeze//Features
-FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead. 
 ====================
-6 FIXMEs left to fix
+5 FIXMEs left to fix
 ====================
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 68cbbe3..2cf9c19 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index a43be9c..25c31c0 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index ba375a8..2fbab26 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 8ac837c..5594c2d 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/rosegarden/README.rosegarden-manual-translations b/documentation/rosegarden/README.rosegarden-manual-translations
index bfd198d..468eb40 100644
--- a/documentation/rosegarden/README.rosegarden-manual-translations
+++ b/documentation/rosegarden/README.rosegarden-manual-translations
@@ -1,9 +1,9 @@
 README for translators of the rosegarden-manual
 --------------------------------------------
 
-/!\ Since we're still working on Squeeze, please use Squeeze material,
-    especially po4a: po4a 0.40.2-1 must be used, since the current Sid
-    version doesn't behave the same way.
+/!\ Please use Wheezy material, especially po4a: at least po4a 0.42-1
+    must be used, since the previous Squeeze version didn't behave the
+    same way.
     (You'll face tenths of fuzzy strings if you don't respect that).
 
 Before you start:
diff --git a/documentation/rosegarden/rosegarden-manual.es.po b/documentation/rosegarden/rosegarden-manual.es.po
index 338b85a..09592bd 100644
--- a/documentation/rosegarden/rosegarden-manual.es.po
+++ b/documentation/rosegarden/rosegarden-manual.es.po
@@ -242,11 +242,11 @@ msgstr ""
 msgid ""
 "@audio - rtprio 99\n"
 "@audio - memlock 500000\n"
-"@audio - nice -10]]"
+"@audio - nice -10"
 msgstr ""
 "@audio - rtprio 99\n"
 "@audio - memlock 500000\n"
-"@audio - nice -10]]"
+"@audio - nice -10"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -2941,7 +2941,7 @@ msgid ""
 "   Paste function in the context menu (right click).\n"
 "   Your Samples have been assigned to the instrument name you made.\n"
 "   (Hint: This works like a link; whenever you change sample properties,\n"
-"    this will also take effect in your instrument.)]]"
+"    this will also take effect in your instrument.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject>
@@ -3143,7 +3143,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/rosegarden/rosegarden-manual.fr.po b/documentation/rosegarden/rosegarden-manual.fr.po
index dc7487e..0bab517 100644
--- a/documentation/rosegarden/rosegarden-manual.fr.po
+++ b/documentation/rosegarden/rosegarden-manual.fr.po
@@ -272,15 +272,14 @@ msgstr ""
 "fonctionnent mieux quand celles-ci sont désactivées dans jack :"
 
 #. type: CDATA
-#, no-wrap
 msgid ""
 "@audio - rtprio 99\n"
 "@audio - memlock 500000\n"
-"@audio - nice -10]]"
+"@audio - nice -10"
 msgstr ""
 "@audio - rtprio 99\n"
 "@audio - memlock 500000\n"
-"@audio - nice -10]]"
+"@audio - nice -10"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -3218,7 +3217,7 @@ msgid ""
 "   Paste function in the context menu (right click).\n"
 "   Your Samples have been assigned to the instrument name you made.\n"
 "   (Hint: This works like a link; whenever you change sample properties,\n"
-"    this will also take effect in your instrument.)]]"
+"    this will also take effect in your instrument.)"
 msgstr ""
 "1. Fichier, créer nouveau\n"
 "2. Clic droit sur « sans titre », choisir « Propriétés » (renommez-le à votre guise)\n"
@@ -3235,7 +3234,7 @@ msgstr ""
 "   insérer ces échantillons dans « Instruments/Vos instruments » en les copiant/collant grâce au clic droit.\n"
 "   Les échantillons sont maintenant assignés à l'instrument.\n"
 "   (Note : Cela fonctionne comme un lien ; l'instrument est affecté par\n"
-"   les modifications des paramètres de l'échantillon.)]]"
+"   les modifications des paramètres de l'échantillon.)"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject>
 msgid ""
@@ -3509,8 +3508,8 @@ msgstr "Annexe A - La Licence Publique GNU"
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
-msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la license GPL. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la license GPL."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
diff --git a/documentation/rosegarden/rosegarden-manual.nb.po b/documentation/rosegarden/rosegarden-manual.nb.po
index 143697f..38c8139 100644
--- a/documentation/rosegarden/rosegarden-manual.nb.po
+++ b/documentation/rosegarden/rosegarden-manual.nb.po
@@ -317,12 +317,11 @@ msgstr ""
 msgid ""
 "@audio - rtprio 99\n"
 "@audio - memlock 500000\n"
-"@audio - nice -10]]"
+"@audio - nice -10"
 msgstr ""
 "@audio - rtprio 99\n"
 "@audio - memlock 500000\n"
-"@audio - nice -10\n"
-"]]"
+"@audio - nice -10"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -3427,7 +3426,7 @@ msgid ""
 "   Paste function in the context menu (right click).\n"
 "   Your Samples have been assigned to the instrument name you made.\n"
 "   (Hint: This works like a link; whenever you change sample properties,\n"
-"    this will also take effect in your instrument.)]]"
+"    this will also take effect in your instrument.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject>
@@ -3638,7 +3637,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 619052b..6818df5 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -204,7 +204,7 @@ msgstr ""
 msgid ""
 "@audio - rtprio 99\n"
 "@audio - memlock 500000\n"
-"@audio - nice -10]]"
+"@audio - nice -10"
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -2835,7 +2835,7 @@ msgid ""
 "   Paste function in the context menu (right click).\n"
 "   Your Samples have been assigned to the instrument name you made.\n"
 "   (Hint: This works like a link; whenever you change sample properties,\n"
-"    this will also take effect in your instrument.)]]"
+"    this will also take effect in your instrument.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject>
@@ -3034,7 +3034,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).




More information about the debian-edu-commits mailing list