[debian-edu-commits] debian-edu/debian-edu-doc.git (#1440) - master (branch) updated: 1.4_20120925_6.0.6-55-gf9fa3b8

David Prévot taffit at alioth.debian.org
Sat Feb 16 03:06:55 UTC 2013


The branch, master has been updated
       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)
      from  bd850760a51302ddf9ff42475e78364b5dfa3eac (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 f9fa3b81f8c3fcbb817b9776d44f947bee37039e
Author: David Prévot <taffit at debian.org>
Date:   Fri Feb 15 22:21:13 2013 -0400

    Prepare release of debian-edu-doc 1.5~20130215~7.0

commit c641c21fa284121dcf317a9df0fa29262fd20a7b
Author: David Prévot <taffit at debian.org>
Date:   Fri Feb 15 22:38:57 2013 -0400

    Update manuals and images from the wiki

commit 658dc4ad85b498eeaca4ec2a5a8d75ac29d938f2
Author: Francesca Ciceri <madamezou at zouish.org>
Date:   Fri Feb 15 21:45:02 2013 +0100

    (it) Translation update

commit 5bd8b5a6223a16838e11d4ec28d6e2a34e83b318
Author: Joe Hansen <joedalton2 at yahoo.dk>
Date:   Fri Feb 15 20:21:32 2013 -0400

    (da) Translation update

commit f2f60fa2894bb409fd0fda8cfe0b6cf9f17ffed1
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date:   Thu Feb 14 21:45:38 2013 +0100

    Update German translation of the Wheezy manual

commit 93dab60cb97324e5bcfb274506b4c08aef30a4f1
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 14 14:00:44 2013 -0400

    (fr) Proofread

commit dd412d96c8838ec5cd65edeff2b0a43a34d3696b
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 14 14:51:17 2013 -0400

    Trivial unfuzzy, 1333t 3f

commit bab1ed4976e951d6a20dceb2781011815a5f2561
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 14 14:24:58 2013 -0400

    Update Wheezy manual from wiki, +1f

commit 467e30a9b69e98c36b462e961d38a68b66c88313
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 13:46:45 2013 -0400

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

commit b11eaad5053f48a31a7841fc3b821f7e0790c321
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 14 14:02:35 2013 -0400

    Automatic unfuzzy
    
    sed -i -e 's/Subversion/Git/g' -e 's/Svn/Git/g' -e 's/subversion/git/' \
    	-e 's,"edu-doc</computeroutput>","git</computeroutput>",' \
    	-e 's,"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-","<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc.",' \
    	-e 's,"<computeroutput>svn up</computeroutput>","<computeroutput>git pull</computeroutput>",' \
    	*.po

commit c072a1e77379fcdcf505661fefaaf5ac77e25958
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 23:10:59 2013 -0400

    Update PO files (1325t, 5f, 6u)
    
    for i in da de es fr it nb; do msgmerge --update --previous \
    --compendium=../debian-edu-squeeze/debian-edu-squeeze-manual.$i.po \
    debian-edu-wheezy-manual.$i.po debian-edu-wheezy-manual.pot ; done

commit f324fcfc75f151efa568512dc1cefc4de8d18539
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 18:38:50 2013 -0400

    Mostly manual unfuzzy

commit bdb300792d1b09bcd8b12a5b3a21373987022bab
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 19:36:57 2013 -0400

    Mostly automatic unfuzzy
    
    sed -i -e 's/Squeeze/Wheezy/g' -e 's/squeeze/wheezy/g' \
    	-e 's/Lenny/Squeeze/g' -e 's/lenny/squeeze/g' \
    	-e 's/Etch/Lenny/g' -e 's/6.0.6+r1/7.0.0+r0/g' \
    	-e 's,\"./images/\(.*\)\",\"[attachment:\1]\",' \
    	-e 's,\[attachment:\(Debian_Edu_Network_Wheezy\|alert\|sad\|smile\|worldmap\).png\],./images/\1.png,' \
    	-e 's,\(\[attachment:.*\)+\(.*.png\]\),\1 \2,' \
    	-e 's,\(\[attachment:.*\)+\(.*.png\]\),\1 \2,' \
    	-e 's,\(\[attachment:.*\)+\(.*.png\]\),\1 \2,' \
    	-e 's,\(\[attachment:.*\)+\(.*.png\]\),\1 \2,' \
    	-e 's,\(\[attachment:.*\)+\(.*.png\]\),\1 \2,' \
    	-e 's/\[10.0.16.25\] id/\[10.0.16.25\] id/' \
    	-e 's/6.0.6/7.0.0/' -e 's/6.0.7/7.0.1/' *.po
    
    End of those automatic changes (starting with Appendix C) dismissed.

commit 7260ada45b3306d23366d53f81ccbeef45060e1c
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 23:17:31 2013 -0400

    changelog: document the new Wheezy manual

commit 0c27d0eedfdd324363903175ef7b1ef8cc6c8733
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 12:58:00 2013 -0400

    Adapt build system to Wheezy manual

commit 276f5c787220c1ce32db34d21c763f585aed9e2f
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 23:13:53 2013 -0400

    Update README and copyright — regenerate files
    
    make update-copyright
    make readme

commit 5543f7d2dd17dd52527d3928ac25326307689c98
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 12:46:28 2013 -0400

    Initial Wheezy material imported from Squeeze

commit 6ae979abda44430817a2ab60cb905d7335ff68fd
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 11:50:52 2013 -0400

    Fix Norwegian build issue

commit 161ab81019294a3951023beb13c9090ba5b7ce79
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 11:40:43 2013 -0400

    Fix Italian build issue

commit 676fdf788a02f45009cc6daa2e657eb0d7bc4744
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 9 17:40:32 2013 -0400

    control: update Build-Depends-Indep

commit 88422c28ee73e1260ae9aa69aedccbe10d5ffba5
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 9 17:29:31 2013 -0400

    Sync with last po4a (with trivial unfuzzy)

commit ff6f99c02f2b1c4b3d03b2783adb45d58d88d9cd
Author: David Prévot <taffit at debian.org>
Date:   Fri Feb 8 18:49:30 2013 -0400

    Document that the latest po4a version must be used — regenerate files

commit d4d7d9c9603e5ce05525a0217b345b76cba35ff6
Author: David Prévot <taffit at debian.org>
Date:   Fri Feb 8 18:46:37 2013 -0400

    Document that the latest po4a version must be used

commit 34f9972c85c0e55e098199ba17435ec48dc34015
Author: David Prévot <taffit at debian.org>
Date:   Fri Feb 8 18:35:49 2013 -0400

    Update internal doc to the new Git repository — regenerate files

commit 541d3c8735b5689db7036f230fe55dd9baaa36d6
Author: David Prévot <taffit at debian.org>
Date:   Fri Feb 8 18:34:25 2013 -0400

    Update internal doc to the new Git repository

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

Summary of changes:
 Makefile                                           |    3 +
 debian/README                                      |    9 +-
 debian/README.source                               |   12 +-
 debian/changelog                                   |   21 +-
 debian/control                                     |   20 +-
 debian/copyright                                   |   80 +-
 debian/copyright.packaging                         |    2 +-
 debian/rules                                       |    4 +-
 .../audacity/README.audacity-manual-translations   |   24 +-
 documentation/audacity/audacity-manual.fr.po       |   10 +-
 documentation/audacity/audacity-manual.pot         |    2 +-
 documentation/common/README.common-translations    |   24 +-
 .../README.debian-edu-squeeze-manual-translations  |   24 +-
 .../debian-edu-squeeze-manual.da.po                |  402 ++-
 .../debian-edu-squeeze-manual.de.po                |  409 ++-
 .../debian-edu-squeeze-manual.es.po                |  337 +-
 .../debian-edu-squeeze-manual.fr.po                |  406 ++-
 .../debian-edu-squeeze-manual.it.po                |  646 ++--
 .../debian-edu-squeeze-manual.nb.po                |  635 ++--
 .../debian-edu-squeeze-manual.pot                  |  152 +-
 .../debian-edu-squeeze-manual.xml                  |   16 +-
 .../debian-edu-squeeze-manual.zh.po                |  152 +-
 .../debian-edu-squeeze/images/de/worldmap.png      |  Bin 386821 -> 386812 bytes
 .../debian-edu-squeeze/images/es/worldmap.png      |  Bin 386927 -> 386917 bytes
 .../debian-edu-squeeze/images/fr/worldmap.png      |  Bin 386862 -> 386853 bytes
 .../debian-edu-squeeze/images/worldmap.png         |  Bin 386855 -> 386846 bytes
 .../Makefile                                       |    8 +-
 .../README.debian-edu-wheezy-manual-translations}  |   36 +-
 .../debian-edu-wheezy-manual.da.po}                | 4296 ++++++++++---------
 .../debian-edu-wheezy-manual.de.po}                | 4453 ++++++++++---------
 .../debian-edu-wheezy-manual.es.po}                | 3603 ++++++++--------
 .../debian-edu-wheezy-manual.fr.po}                | 4367 ++++++++++---------
 .../debian-edu-wheezy-manual.it.po}                | 4558 ++++++++++----------
 .../debian-edu-wheezy-manual.nb.po}                | 4137 +++++++++---------
 .../debian-edu-wheezy-manual.pot}                  | 2464 +++++------
 .../debian-edu-wheezy-manual.xml}                  | 1004 +++--
 documentation/debian-edu-wheezy/fixme-status.txt   |   31 +
 .../images/Debian_Edu_Network_Wheezy.png}          |  Bin 171310 -> 171310 bytes
 .../images/alert.png                               |  Bin 576 -> 576 bytes
 .../images/de/Debian_Edu_Network_Wheezy.png}       |  Bin 172857 -> 172857 bytes
 .../images/de/worldmap.png                         |  Bin 386821 -> 386812 bytes
 .../images/es/worldmap.png                         |  Bin 386927 -> 386917 bytes
 .../images/fr/Debian_Edu_Network_Wheezy.png}       |  Bin 175600 -> 175600 bytes
 .../images/fr/worldmap.png                         |  Bin 386862 -> 386853 bytes
 .../images/sad.png                                 |  Bin 880 -> 880 bytes
 .../images/smile.png                               |  Bin 873 -> 873 bytes
 .../images/source/Debian_Edu_Network_Wheezy.odg}   |  Bin 328722 -> 328722 bytes
 .../images/worldmap.png                            |  Bin 386855 -> 386846 bytes
 .../po4a.cfg                                       |    2 +-
 .../README.rosegarden-manual-translations          |   24 +-
 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 +-
 54 files changed, 16696 insertions(+), 15713 deletions(-)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/Makefile (50%)
 copy documentation/{common/README.common-translations => debian-edu-wheezy/README.debian-edu-wheezy-manual-translations} (64%)
 copy documentation/{debian-edu-squeeze/debian-edu-squeeze-manual.da.po => debian-edu-wheezy/debian-edu-wheezy-manual.da.po} (93%)
 copy documentation/{debian-edu-squeeze/debian-edu-squeeze-manual.de.po => debian-edu-wheezy/debian-edu-wheezy-manual.de.po} (92%)
 copy documentation/{debian-edu-squeeze/debian-edu-squeeze-manual.es.po => debian-edu-wheezy/debian-edu-wheezy-manual.es.po} (93%)
 copy documentation/{debian-edu-squeeze/debian-edu-squeeze-manual.fr.po => debian-edu-wheezy/debian-edu-wheezy-manual.fr.po} (93%)
 copy documentation/{debian-edu-squeeze/debian-edu-squeeze-manual.it.po => debian-edu-wheezy/debian-edu-wheezy-manual.it.po} (94%)
 copy documentation/{debian-edu-squeeze/debian-edu-squeeze-manual.nb.po => debian-edu-wheezy/debian-edu-wheezy-manual.nb.po} (94%)
 copy documentation/{debian-edu-squeeze/debian-edu-squeeze-manual.pot => debian-edu-wheezy/debian-edu-wheezy-manual.pot} (92%)
 copy documentation/{debian-edu-squeeze/debian-edu-squeeze-manual.xml => debian-edu-wheezy/debian-edu-wheezy-manual.xml} (92%)
 create mode 100644 documentation/debian-edu-wheezy/fixme-status.txt
 copy documentation/{debian-edu-squeeze/images/Debian_Edu_Network_Squeeze.png => debian-edu-wheezy/images/Debian_Edu_Network_Wheezy.png} (100%)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/images/alert.png (100%)
 copy documentation/{debian-edu-squeeze/images/de/Debian_Edu_Network_Squeeze.png => debian-edu-wheezy/images/de/Debian_Edu_Network_Wheezy.png} (100%)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/images/de/worldmap.png (96%)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/images/es/worldmap.png (96%)
 copy documentation/{debian-edu-squeeze/images/fr/Debian_Edu_Network_Squeeze.png => debian-edu-wheezy/images/fr/Debian_Edu_Network_Wheezy.png} (100%)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/images/fr/worldmap.png (97%)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/images/sad.png (100%)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/images/smile.png (100%)
 copy documentation/{debian-edu-squeeze/images/source/Debian Edu Netzwerk_Squeeze_l10n.odg => debian-edu-wheezy/images/source/Debian_Edu_Network_Wheezy.odg} (100%)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/images/worldmap.png (96%)
 copy documentation/{debian-edu-squeeze => debian-edu-wheezy}/po4a.cfg (77%)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 06bfea2..07360dd 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,13 @@ all: build
 
 get-orig-source:
 	$(MAKE) -C $(SRCDIR)/debian-edu-squeeze update
+	$(MAKE) -C $(SRCDIR)/debian-edu-wheezy update
 	$(MAKE) -C $(SRCDIR)/rosegarden update
 	$(MAKE) -C $(SRCDIR)/audacity update
 
 update-copyright:
 	$(MAKE) -C $(SRCDIR)/debian-edu-squeeze update-copyright
+	$(MAKE) -C $(SRCDIR)/debian-edu-wheezy update-copyright
 	$(MAKE) -C $(SRCDIR)/rosegarden update-copyright
 	$(MAKE) -C $(SRCDIR)/audacity update-copyright
 	cat debian/copyright.packaging \
@@ -20,6 +22,7 @@ update-copyright:
 
 readme status build install dist-clean clean pdf::
 	$(MAKE) -C $(SRCDIR)/debian-edu-squeeze $@
+	$(MAKE) -C $(SRCDIR)/debian-edu-wheezy $@
 	$(MAKE) -C $(SRCDIR)/rosegarden $@
 	$(MAKE) -C $(SRCDIR)/audacity $@
 
diff --git a/debian/README b/debian/README
index 67c5a17..230b1bd 100644
--- a/debian/README
+++ b/debian/README
@@ -4,16 +4,17 @@ About the Debian Edu Documentation
 Current documentation
 ---------------------
 
-The Debian Edu Squeeze manual is developed in a wiki at 
-http://wiki.debian.org/DebianEdu/Documentation/Squeeze/ - it is based on the version 
+The Debian Edu Squeeze and Wheezy manuals are developed in a wiki at 
+http://wiki.debian.org/DebianEdu/Documentation/Squeeze/ and
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy/ - they are based on the version 
 for etch - which was the first release with this kind of documentation.
 Currently two versions are provided, a PDF version and a HTML version. 
 Please contribute!
 
-Besides the Debian Edu Squeeze manual this package also builds the
+Besides the Debian Edu Squeeze and Wheezy manuals, this package also builds the
 Rosegarden and Audacity manuals.
 
-So far translations for the Debian Edu Squeeze manual have been completed for Danish,
+So far, translations for the Debian Edu Squeeze and Wheezy manuals have been completed for Danish,
 Italian, German and French. Uncompleted translations exist for Spanish and Bokmål.
 Please contribute! All manuals are translated with PO files. You can find more information
 how to contribute in /usr/share/doc/debian-edu-doc-en/README.$name-manual-translations.
diff --git a/debian/README.source b/debian/README.source
index 730aec8..0fd01af 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,16 +1,16 @@
 Building an updated version of the package
 ------------------------------------------
 
-To update the release-manual and the itil document from their sources in the 
-wiki, you need an internet connection and the subversion, libxml2-utils and 
+To update the manuals from their source in the 
+wiki, you need an Internet connection and the git, libxml2-utils and 
 po4a packages installed.
-(For building it, you need its build-depends installed. Translators please see
-the README.release-manual-translations.)
+(To build it, you need its build-depends installed. Translators please see
+README.$name-manual-translations.)
 
-Run "./debian/rules get-orig-source" to update the source to prepare building
+Run "make get-orig-source" to update the source to prepare building
 and before building and uploading it to the archive.
 
 Then just use "debuild" to build the package.
 
 
--- Holger Levsen, holger at debian.org, last updated: 2009-19-07
+-- Holger Levsen, holger at debian.org, last updated: 2013-02-08
diff --git a/debian/changelog b/debian/changelog
index 06ed139..c8340bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,29 @@
-debian-edu-doc (1.4~20121218~6.0.6+r1) UNRELEASED; urgency=low
+debian-edu-doc (1.5~20130215~7.0) unstable; urgency=low
 
   [ David Prévot ]
   * Update manuals and images from the wiki.
   * Update debian/copyright.
   * README: mention the Danish translation among the complete ones.
-
-  [ Updated squeeze manual translations ]
+  * 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.
+  * control: Build-Depends on fonts-arphic-gbsn00lp and fonts-arphic-bsmi00lp
+    instead of transitional ttf-arphic-gbsn00lp and ttf-arphic-bsmi00lp.
+  * Add initial Wheezy manual, based on the Squeeze one.
+
+  [ Updated Squeeze manual translations ]
   * German (Wolfgang Schweer).
   * French (Cédric Boutillier).
   * Italian (Claudio Carboncini).
   * Danish (Joe Hansen).
 
-  [ Holger Levsen ]
-  * Bump version to 6.0.6+r1. 
+  [ Updated Wheezy manual translations ]
+  * German (Wolfgang Schweer).
+  * French (David Prévot).
+  * Danish (Joe Hansen).
+  * Italian (Francesca Ciceri).
 
- -- David Prévot <taffit at debian.org>  Wed, 07 Nov 2012 00:07:42 -0400
+ -- David Prévot <taffit at debian.org>  Fri, 15 Feb 2013 22:18:55 -0400
 
 debian-edu-doc (1.4~20120925~6.0.6+r0) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c7fecd0..1eda58e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Build-Depends: debhelper (>= 5) 
 Build-Depends-Indep: docbook-utils, poxml, ldp-docbook-xsl, dblatex, po4a,
  gsfonts, lmodern, texlive-xetex,
- ttf-arphic-gbsn00lp, ttf-arphic-bsmi00lp, ttf-wqy-zenhei,
+ fonts-arphic-gbsn00lp, fonts-arphic-bsmi00lp, ttf-wqy-zenhei,
  texlive-lang-cyrillic, texlive-lang-danish,  texlive-lang-spanish,
  texlive-lang-french, texlive-lang-german, texlive-lang-italian,
  texlive-lang-norwegian, imagemagick
@@ -14,14 +14,14 @@ Uploaders: Holger Levsen <holger at debian.org>,
  David Prévot <taffit at debian.org>
 Standards-Version: 3.9.3
 Homepage: http://wiki.debian.org/DebianEdu/Documentation/Squeeze
-Vcs-Svn: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc/
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-edu/trunk/src/debian-edu-doc/
+Vcs-Git: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/debian-edu-doc.git;a=summary
 
 Package: debian-edu-doc-en
 Depends: ${misc:Depends}
 Architecture: all
 Description: English documentation from the Debian Edu project
- The English version of the manual for the Squeeze based release of 
+ The English version of the manual for the Squeeze and Wheezy based release of 
  the Debian Edu / Skolelinux project is included in this package, as well as 
  the Rosegarden and Audacity manuals.
  .
@@ -33,7 +33,7 @@ Package: debian-edu-doc-da
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: Danish documentation from the Debian Edu project
- The Danish version of the manual for the Squeeze based release of
+ The Danish version of the manual for the Squeeze and Wheezy based release of
  the Debian Edu / Skolelinux project is included in this package.
  .
  Debian Edu is a Debian project to make the best distribution for educational
@@ -44,7 +44,7 @@ Package: debian-edu-doc-de
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: German documentation from the Debian Edu project
- The German version of the manual for the Squeeze based release of 
+ The German version of the manual for the Squeeze and Wheezy based release of 
  the Debian Edu / Skolelinux project is included in this package.
  .
  Debian Edu is a Debian project to make the best distribution for educational
@@ -55,7 +55,7 @@ Package: debian-edu-doc-es
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: Spanish documentation from the Debian Edu project
- The Spanish version of the manual for the Squeeze based release of 
+ The Spanish version of the manual for the Squeeze and Wheezy based release of 
  the Debian Edu / Skolelinux project is included in this package, as well as
  the Rosegarden manual.
  .
@@ -67,7 +67,7 @@ Package: debian-edu-doc-nb
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: Bokmål documentation from the Debian Edu project
- The Bokmål version of the manual for the Squeeze based release of
+ The Bokmål version of the manual for the Squeeze and Wheezy based release of
  the Debian Edu / Skolelinux project is included in this package, as well as
  the Rosegarden manual.
  .
@@ -79,7 +79,7 @@ Package: debian-edu-doc-it
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: Italian documentation from the Debian Edu project
- The Italian version of the manual for the Squeeze based release of
+ The Italian version of the manual for the Squeeze and Wheezy based release of
  the Debian Edu / Skolelinux project is included in this package.
  .
  Debian Edu is a Debian project to make the best distribution for educational
@@ -90,7 +90,7 @@ Package: debian-edu-doc-fr
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: French documentation from the Debian Edu project
- The French version of the manual for the Squeeze based release of
+ The French version of the manual for the Squeeze and Wheezy based release of
  the Debian Edu / Skolelinux project is included in this package, as well as
  the Rosegarden and Audacity manuals.
  .
diff --git a/debian/copyright b/debian/copyright
index 831d270..36fbf5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: debian-edu-doc
-Upstream-Source: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc
+Upstream-Source: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
 
 Files: documentation/rosegarden/images/*
 Copyright: 2008 Alf Tonny Bätz <alfton at gmail.com> 
@@ -137,6 +137,84 @@ Files: documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
 Copyright: 2012, 2013 Joe Hansen
 License: GPL-2+
 
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Holger Levsen
+  2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012 Petter Reinholdtsen
+  2007 Daniel Heß
+  2007 Patrick Winnertz
+  2007 Knut Yrvin
+  2007 Ralf Gesellensetter
+  2007 Ronny Aasen
+  2007 Morten Werner Forsbring
+  2007, 2008 Bjarne Nielsen
+  2007 Nigel Barker
+  2007 José L. Redrejo Rodríguez
+  2007 John Bildoy
+  2008 Joakim Seeberg
+  2009, 2010, 2011, 2012 Jürgen Leibner
+  2009 Oded Naveh
+  2009, 2010 Philipp Hübner
+  2010 Andreas Mundt
+  2010, 2012 Olivier Vitrat
+  2010 Vagrant Cascadian
+  2011 Mike Gabriel
+  2012 Justin B Rye
+  2012 David Prévot
+  2012 Wolfgang Schweer
+  2012 Bernhard Hammes
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+Copyright: 2007 José L. Redrejo Rodríguez
+  2009, 2010, 2011, 2012 Rafael Rivas
+  2010, 2012 Norman Garcia
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+Copyright: 2007 Petter Reinholdtsen
+  2007, 2008 Håvard Korsvoll
+  2008 Tore Skogly
+  2010 Ole-Anders Andreassen
+  2010 Jan Roar Rød
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+Copyright: 2007 Holger Levsen
+  2007 Patrick Winnertz
+  2007, 2009 Ralf Gesellensetter
+  2007, 2008, 2009 Roland F. Teichert
+  2007, 2009, 2011 Jürgen Leibner
+  2008, 2010 Ludger Sicking
+  2008 Kai Hatje
+  2009 Kurt Gramlich
+  2009 Franziska Teichert
+  2009 Philipp Hübner
+  2009, 2010  Andreas Mundt
+  2012, 2013 Wolfgang Schweer
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Claudio Carboncini
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+Copyright: 2008 Christophe Masson
+  2010 Olivier Vitrat
+  2012, 2013 Cédric Boutillier
+  2012 Jean-Paul Guilloneau
+  2012 David Prévot
+  2012 Thomas Vincent
+  2009, 2010, 2012 the French l10n team
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.zh.po
+Copyright: 2009 Andrew Lee (李健秋)
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+Copyright: 2012, 2013 Joe Hansen
+License: GPL-2+
+
 Files: documentation/rosegarden/rosegarden-manual.xml documentation/rosegarden/rosegarden-manual.pot
 Copyright: 2008, 2009 Alf Tonny Bätz
   2008 Holger Levsen
diff --git a/debian/copyright.packaging b/debian/copyright.packaging
index 1965d96..377cd51 100644
--- a/debian/copyright.packaging
+++ b/debian/copyright.packaging
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: debian-edu-doc
-Upstream-Source: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc
+Upstream-Source: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
 
 Files: documentation/rosegarden/images/*
 Copyright: 2008 Alf Tonny Bätz <alfton at gmail.com> 
diff --git a/debian/rules b/debian/rules
index 97e399e..db2505d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,9 +42,7 @@ binary-indep: install
 	dh_installdocs 
 	dh_installdocs -A debian/README
 	dh_installdocs -p debian-edu-doc-en \
-		documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations \
-		documentation/rosegarden/README.rosegarden-manual-translations \
-		documentation/audacity/README.audacity-manual-translations 
+		documentation/*/README.*-translations
 	dh_installchangelogs
 	dh_link
 	dh_compress -X.pdf -X.html
diff --git a/documentation/audacity/README.audacity-manual-translations b/documentation/audacity/README.audacity-manual-translations
index a5f6256..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:
@@ -31,9 +31,10 @@ How to start a translation
 Simply copy the POT file as a PO file:
 
 $ cp audacity-manual.pot audacity-manual.da.po	# create a new Danish PO file
-$ svn add audacity-manual.da.po				# add it to Subversion
+$ git add audacity-manual.da.po				# add it to the VCS
 $ vi audacity-manual.da.po					# better use Lokalize for this :)
-$ svn ci audacity-manual.da.po				# commit the new translation for the first time
+$ git commit audacity-manual.da.po				# commit the new translation for the first time
+$ git push								# update the remote repository
 
 
 
@@ -43,12 +44,13 @@ How to update the translations
 Update the translations every time before you start translating some new 
 strings:
 
-$ svn up					# update from Subversion, maybe someone else translated
+$ git pull					# update from the VCS, maybe someone else translated
 						# something or the English source was updated
 $ vi audacity-manual.da.po		# again, better use Lokalize 
 $ LINGUA=da make				# check the build and rewrap the PO file
-$ svn diff audacity-manual.da.po	# check the differences form the previous file
-$ svn ci audacity-manual.da.po	# commit your changes
+$ git diff audacity-manual.da.po	# check the differences from the previous file
+$ git commit audacity-manual.da.po	# commit changes to your local repository
+$ git push					# update the remote repository
 
 
 
@@ -83,7 +85,7 @@ TODO: filter out the fileref Attribute from the PO files
 Don't translate URLs - be careful: some wiki-URLs might be harder to notice 
 they are URLs.
 
-To "translate" images, add them to Subversion into the images/$CC/ directory, where 
+To "translate" images, add them to the VCS into the images/$CC/ directory, where 
 $CC is your language. They will be picked up automatically. 
 
 If you spot errors in the English version or see how it could be improved, 
@@ -92,10 +94,10 @@ http://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/ - an user accou
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
-If you cannot commit your work to Subversion directly, please file a bug against the
+If you cannot commit your work to the VCS directly, please file a bug against the
 debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach 
 the PO file to the bugreport. Instructions how to submit bugs are available
 at http://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2012-02-27
+-- Holger Levsen, holger at debian.org, last updated: 2013-02-08
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/README.common-translations b/documentation/common/README.common-translations
index 3ade20c..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:
@@ -31,9 +31,10 @@ How to start a translation
 Simply copy the POT file as a PO file:
 
 $ cp ##NAME##.pot ##NAME##.da.po	# create a new Danish PO file
-$ svn add ##NAME##.da.po				# add it to Subversion
+$ git add ##NAME##.da.po				# add it to the VCS
 $ vi ##NAME##.da.po					# better use Lokalize for this :)
-$ svn ci ##NAME##.da.po				# commit the new translation for the first time
+$ git commit ##NAME##.da.po				# commit the new translation for the first time
+$ git push								# update the remote repository
 
 
 
@@ -43,12 +44,13 @@ How to update the translations
 Update the translations every time before you start translating some new 
 strings:
 
-$ svn up					# update from Subversion, maybe someone else translated
+$ git pull					# update from the VCS, maybe someone else translated
 						# something or the English source was updated
 $ vi ##NAME##.da.po		# again, better use Lokalize 
 $ LINGUA=da make				# check the build and rewrap the PO file
-$ svn diff ##NAME##.da.po	# check the differences form the previous file
-$ svn ci ##NAME##.da.po	# commit your changes
+$ git diff ##NAME##.da.po	# check the differences from the previous file
+$ git commit ##NAME##.da.po	# commit changes to your local repository
+$ git push					# update the remote repository
 
 
 
@@ -83,7 +85,7 @@ TODO: filter out the fileref Attribute from the PO files
 Don't translate URLs - be careful: some wiki-URLs might be harder to notice 
 they are URLs.
 
-To "translate" images, add them to Subversion into the images/$CC/ directory, where 
+To "translate" images, add them to the VCS into the images/$CC/ directory, where 
 $CC is your language. They will be picked up automatically. 
 
 If you spot errors in the English version or see how it could be improved, 
@@ -92,10 +94,10 @@ please do contribute to the English version too. Just edit the wiki at
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
-If you cannot commit your work to Subversion directly, please file a bug against the
+If you cannot commit your work to the VCS directly, please file a bug against the
 debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach 
 the PO file to the bugreport. Instructions how to submit bugs are available
 at http://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2012-02-27
+-- Holger Levsen, holger at debian.org, last updated: 2013-02-08
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 fd93399..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:
@@ -31,9 +31,10 @@ How to start a translation
 Simply copy the POT file as a PO file:
 
 $ cp debian-edu-squeeze-manual.pot debian-edu-squeeze-manual.da.po	# create a new Danish PO file
-$ svn add debian-edu-squeeze-manual.da.po				# add it to Subversion
+$ git add debian-edu-squeeze-manual.da.po				# add it to the VCS
 $ vi debian-edu-squeeze-manual.da.po					# better use Lokalize for this :)
-$ svn ci debian-edu-squeeze-manual.da.po				# commit the new translation for the first time
+$ git commit debian-edu-squeeze-manual.da.po				# commit the new translation for the first time
+$ git push								# update the remote repository
 
 
 
@@ -43,12 +44,13 @@ How to update the translations
 Update the translations every time before you start translating some new 
 strings:
 
-$ svn up					# update from Subversion, maybe someone else translated
+$ git pull					# update from the VCS, maybe someone else translated
 						# something or the English source was updated
 $ vi debian-edu-squeeze-manual.da.po		# again, better use Lokalize 
 $ LINGUA=da make				# check the build and rewrap the PO file
-$ svn diff debian-edu-squeeze-manual.da.po	# check the differences form the previous file
-$ svn ci debian-edu-squeeze-manual.da.po	# commit your changes
+$ git diff debian-edu-squeeze-manual.da.po	# check the differences from the previous file
+$ git commit debian-edu-squeeze-manual.da.po	# commit changes to your local repository
+$ git push					# update the remote repository
 
 
 
@@ -83,7 +85,7 @@ TODO: filter out the fileref Attribute from the PO files
 Don't translate URLs - be careful: some wiki-URLs might be harder to notice 
 they are URLs.
 
-To "translate" images, add them to Subversion into the images/$CC/ directory, where 
+To "translate" images, add them to the VCS into the images/$CC/ directory, where 
 $CC is your language. They will be picked up automatically. 
 
 If you spot errors in the English version or see how it could be improved, 
@@ -92,10 +94,10 @@ http://wiki.debian.org/DebianEdu/Documentation/Squeeze/ - an user account
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
-If you cannot commit your work to Subversion directly, please file a bug against the
+If you cannot commit your work to the VCS directly, please file a bug against the
 debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach 
 the PO file to the bugreport. Instructions how to submit bugs are available
 at http://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2012-02-27
+-- Holger Levsen, holger at debian.org, last updated: 2013-02-08
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 23f2e3f..d46a571 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-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:23-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"
@@ -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 ""
@@ -9574,7 +9574,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."
@@ -9582,9 +9582,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."
 
@@ -9592,38 +9592,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 ""
@@ -9639,11 +9638,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 ""
@@ -9654,8 +9653,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 ""
@@ -9680,30 +9679,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."
@@ -9715,8 +9711,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 ""
@@ -10998,6 +10994,96 @@ msgstr ""
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ 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 19d700b..0577795 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:23-0400\n"
 "PO-Revision-Date: 2013-01-22 00:12+0100\n"
 "Last-Translator: Wolfgang Schweer <schweer at cityweb.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2099,11 +2099,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 +2375,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 +3151,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 +3166,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 +3468,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 +3575,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 +3585,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 +4079,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 +4227,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 +4791,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 +4814,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 +4825,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 +4837,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 +4954,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 +4994,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 +5020,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 +5143,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 +5186,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 +5225,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 +5305,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 +5326,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 +5402,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 +5417,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 +5471,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 +5503,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 +5629,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 +5652,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 +5802,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 +5837,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 +5895,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 +5918,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 +5929,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 +6039,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 +6053,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 +6138,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 +6204,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 +6251,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 +6264,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 +6285,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 +6307,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 +6380,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 +6514,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 +6538,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 +6580,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 +6698,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 +6729,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 +6744,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 +6854,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 +6882,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 +6917,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 +6989,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 +7000,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 +7023,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 +7040,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 +7049,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 +7127,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 +7628,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 +8285,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 +8294,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 +8316,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 +8329,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 +8361,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 +8372,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 +8388,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 ""
@@ -9818,7 +9818,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."
@@ -9826,49 +9826,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 ""
@@ -9884,12 +9882,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 ""
@@ -9901,8 +9899,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 ""
@@ -9927,29 +9925,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."
@@ -9961,8 +9957,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 ""
@@ -11251,3 +11247,94 @@ msgstr ""
 "Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "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>."
+
+#~ 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 ""
+#~ "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):"
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "Information über Alioth (auf dem sich das Subversion-Repository befindet) "
+#~ "und Subversion ist unter <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/"
+#~ "> verfügbar."
+
+#~ 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 ""
+#~ "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."
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 d5bf65c..ba2ed70 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-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:23-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"
@@ -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>
@@ -9391,7 +9391,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 +9402,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 +9417,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 +9425,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 +9441,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 +9452,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 +9472,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 +9504,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 +10686,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 +10816,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 +11629,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 +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%"
 
 #~ msgid ""
 #~ "To make this work, the 2009 group has to be created before adding the "
@@ -11669,8 +11719,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 +12450,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 +12812,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 +13512,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 +13646,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 +13667,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 +13685,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 +13705,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 +13721,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 +13732,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 +13841,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 +13907,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 +13919,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 +13926,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 +14032,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 e845da7..740c4d4 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-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:23-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"
@@ -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 ""
@@ -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 ""
@@ -9862,7 +9862,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."
@@ -9870,25 +9870,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="
@@ -9899,21 +9899,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 ""
@@ -9930,12 +9928,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 ""
@@ -9946,8 +9944,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 ""
@@ -9971,30 +9969,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."
@@ -10006,8 +10002,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 ""
@@ -11318,6 +11314,98 @@ msgstr ""
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
 #~ 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 ""
@@ -11477,11 +11565,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 128e55f..90eb081 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-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:23-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"
@@ -28,7 +28,7 @@ msgstr "Manuale di Debian Edu / Skolelinux Squeeze 6.0.6+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\""
+msgstr "Manuale per Debian Edu 6.0.6+r1 Codename Squeeze"
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/welcome_to_tjener.png"
@@ -1364,7 +1364,7 @@ msgid ""
 "Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
 msgstr ""
 "Download del supporto di installazione per Debian Edu 6.0.6+r1 Codename "
-"\"Squeeze\""
+"Squeeze"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "DVD for i386, amd64"
@@ -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 ""
@@ -9623,7 +9623,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 +9632,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 +9660,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 +9688,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 +9703,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 +9728,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 +9761,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 +11051,95 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ 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 +11264,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 +12319,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 +12327,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 +12417,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 +12601,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 +13146,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 +13241,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 +13255,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 +13307,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 +13758,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 +13916,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 +14004,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 +14216,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 +14240,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 +14250,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 +14262,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 +14278,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 +14485,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 +14499,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 +14592,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 +14617,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 +14629,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 +14646,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 +14659,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 +14766,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 +14806,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 +14833,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 +14863,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 +14938,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 +14960,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 +14969,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 +14987,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 +14996,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 +15022,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 +15046,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 +15071,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 +15107,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 +15158,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 +15193,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 +15216,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 +15225,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 +15237,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 +15341,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 +15431,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 +15447,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 +15649,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 +15679,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 +15816,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 +15837,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 +15856,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 +15876,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 +15890,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 +15899,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 +15933,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 +15965,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 +16073,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 +16196,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 +16267,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 +16312,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 +16325,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 3421b62..3fb9353 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-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:23-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"
@@ -29,7 +29,7 @@ msgstr "Debian Edu / Skolelinux Squeeze 6.0.6+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\""
+msgstr "Utgivelsesmanual for Debian Edu 6.0.6+r1 kodenavn Squeeze"
 
 #. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/welcome_to_tjener.png"
@@ -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\""
 msgstr ""
-"Last ned et installasjonsmedium for Debian Edu 5.0.4+edu0 Kodenavn \"Lenny\""
+"Last ned et installasjonsmedium for Debian Edu 6.0.6+r1 Kodenavn Squeeze"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
@@ -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>
@@ -10321,7 +10299,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 +10314,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 +10331,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 +10365,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 +10380,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 +10407,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 +10441,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 +11779,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 +12007,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 +12752,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 +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%"
 
 #~ msgid ""
 #~ "To make this work, the 2009 group has to be created before adding the "
@@ -12796,17 +12865,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 +13058,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 +13661,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 +13747,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 +13762,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 +13808,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 +14188,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 +14338,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 +14423,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 +14643,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 +14661,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 +14673,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 +14684,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 +14697,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 +14716,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 +14878,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 +14927,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 +14941,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 +15036,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 +15061,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 +15072,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 +15089,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 +15102,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 +15209,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 +15249,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 +15277,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 +15306,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 +15380,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 +15402,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 +15411,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 +15428,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 +15437,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 +15462,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 +15487,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 +15514,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 +15550,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 +15601,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 +15636,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 +15659,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 +15668,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 +15680,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 +15788,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 +15850,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 +15865,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 +16072,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 +16103,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 +16242,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 +16263,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 +16283,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 +16303,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 +16317,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 +16328,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 +16364,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 +16397,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 +16490,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 +16604,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 +16665,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 +16678,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 +16725,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 +16816,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 +16835,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 +16891,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 +16901,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 +16977,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 +16986,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 +16998,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 +17005,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 81b56c1..3ba6752 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-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:34-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"
@@ -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>
@@ -7168,7 +7168,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 +7178,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 +7189,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 +7208,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 +7219,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 +7239,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 +7263,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 52a9263..14a6d70 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
@@ -3349,32 +3349,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>
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 35ce195..c4a1924 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-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:34-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"
@@ -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>
@@ -7810,7 +7810,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 +7820,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 +7832,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 +7853,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 +7864,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 +7884,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 +7908,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/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index acabfba..51bf3b2 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 1212c1d..a0b89cc 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 c9b1d83..c6d576b 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 6180794..3b2ef36 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/Makefile b/documentation/debian-edu-wheezy/Makefile
similarity index 50%
copy from documentation/debian-edu-squeeze/Makefile
copy to documentation/debian-edu-wheezy/Makefile
index adac7cc..88e4c37 100644
--- a/documentation/debian-edu-squeeze/Makefile
+++ b/documentation/debian-edu-wheezy/Makefile
@@ -1,11 +1,11 @@
 #
 # configuration here:
 #
-url=http://wiki.debian.org/DebianEdu/Documentation/Squeeze/
-name=debian-edu-squeeze-manual
+url=http://wiki.debian.org/DebianEdu/Documentation/Wheezy/
+name=debian-edu-wheezy-manual
 VERSION:=$(shell GET -H User-Agent: $(url)?action=raw |sed -n '1p'|sed -r 's/^([^0-9])*|([^0-9])*$$//g')
-DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Squeeze\ $(VERSION)\ Manual
-path1=DebianEdu/Documentation/Squeeze
+DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Wheezy\ $(VERSION)\ Manual
+path1=DebianEdu/Documentation/Wheezy
 path2='\/DebianEdu\/Documentation\/'
 export 
 
diff --git a/documentation/common/README.common-translations b/documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations
similarity index 64%
copy from documentation/common/README.common-translations
copy to documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations
index 3ade20c..e7b878f 100644
--- a/documentation/common/README.common-translations
+++ b/documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations
@@ -1,9 +1,9 @@
-README for translators of the ##NAME##
+README for translators of the debian-edu-wheezy-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:
@@ -21,7 +21,7 @@ Please note: pdflatex depends on ($texlive-packages | $tetex-packages) - we
 need the texlive packages.
 
 For the following commands it's assumed you're in the current directory:
-debian-edu-doc/documentation/##DIR##
+debian-edu-doc/documentation/debian-edu-wheezy
 
 
 
@@ -30,10 +30,11 @@ How to start a translation
 
 Simply copy the POT file as a PO file:
 
-$ cp ##NAME##.pot ##NAME##.da.po	# create a new Danish PO file
-$ svn add ##NAME##.da.po				# add it to Subversion
-$ vi ##NAME##.da.po					# better use Lokalize for this :)
-$ svn ci ##NAME##.da.po				# commit the new translation for the first time
+$ cp debian-edu-wheezy-manual.pot debian-edu-wheezy-manual.da.po	# create a new Danish PO file
+$ git add debian-edu-wheezy-manual.da.po				# add it to the VCS
+$ vi debian-edu-wheezy-manual.da.po					# better use Lokalize for this :)
+$ git commit debian-edu-wheezy-manual.da.po				# commit the new translation for the first time
+$ git push								# update the remote repository
 
 
 
@@ -43,12 +44,13 @@ How to update the translations
 Update the translations every time before you start translating some new 
 strings:
 
-$ svn up					# update from Subversion, maybe someone else translated
+$ git pull					# update from the VCS, maybe someone else translated
 						# something or the English source was updated
-$ vi ##NAME##.da.po		# again, better use Lokalize 
+$ vi debian-edu-wheezy-manual.da.po		# again, better use Lokalize 
 $ LINGUA=da make				# check the build and rewrap the PO file
-$ svn diff ##NAME##.da.po	# check the differences form the previous file
-$ svn ci ##NAME##.da.po	# commit your changes
+$ git diff debian-edu-wheezy-manual.da.po	# check the differences from the previous file
+$ git commit debian-edu-wheezy-manual.da.po	# commit changes to your local repository
+$ git push					# update the remote repository
 
 
 
@@ -83,19 +85,19 @@ TODO: filter out the fileref Attribute from the PO files
 Don't translate URLs - be careful: some wiki-URLs might be harder to notice 
 they are URLs.
 
-To "translate" images, add them to Subversion into the images/$CC/ directory, where 
+To "translate" images, add them to the VCS into the images/$CC/ directory, where 
 $CC is your language. They will be picked up automatically. 
 
 If you spot errors in the English version or see how it could be improved, 
 please do contribute to the English version too. Just edit the wiki at 
-##URL## - an user account 
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy/ - an user account 
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
-If you cannot commit your work to Subversion directly, please file a bug against the
+If you cannot commit your work to the VCS directly, please file a bug against the
 debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach 
 the PO file to the bugreport. Instructions how to submit bugs are available
 at http://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2012-02-27
+-- Holger Levsen, holger at debian.org, last updated: 2013-02-08
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
similarity index 93%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 23f2e3f..2e896cf 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -1,6 +1,6 @@
-# Danish translation debian-edu-squeeze-manual.
-# Copyright (C) 2012 debian-edu-squeeze-manual & nedenstående oversættere.
-# This file is distributed under the same license as the debian-edu-squeeze-manual package.
+# Danish translation debian-edu-wheezy-manual.
+# Copyright (C) 2012 debian-edu-wheezy-manual & nedenstående oversættere.
+# This file is distributed under the same license as the debian-edu-wheezy-manual package.
 # Joe Hansen <joedalton2 at yahoo.dk>, 2012, 2013.
 #
 # howtos -> hjælp, artikel
@@ -8,9 +8,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
-"PO-Revision-Date: 2013-01-23 11:20+0100\n"
+"Project-Id-Version: debian-edu-wheezy-manual\n"
+"POT-Creation-Date: 2013-02-14 14:40-0400\n"
+"PO-Revision-Date: 2013-02-15 11:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
 "Language: da\n"
@@ -23,32 +23,32 @@ 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 Wheezy 7.0.0+r0 Manual"
+msgstr "Manual for Debian Edu / Skolelinux Wheezy 7.0.0+r0"
 
 #. 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 7.0.0+r0 Codename \"Wheezy\""
+msgstr "Manual for Debian Edu 7.0.0+r0 kodenavn »Wheezy«"
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr "./images/welcome_to_tjener.png"
-
-#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu login"
-msgstr "Logind for Debian Edu"
+#. type: Content of: <article><section><para>
+msgid ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
+msgstr ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
 
 #. 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 Wheezy 7.0.0+r0 release."
+msgstr "Dette er manualen for Debian Edu Wheezy 7.0.0+r0-udgivelsen."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> is a wiki and updated frequently."
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
 "Versionen på <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> er en wiki og opdateres ofte."
+"Wheezy\"/> er en wiki og opdateres ofte."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -177,8 +177,8 @@ msgid "Network"
 msgstr "Netværk"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Debian_Edu_Network_Squeeze.png"
-msgstr "./images/Debian_Edu_Network_Squeeze.png"
+msgid "./images/Debian_Edu_Network_Wheezy.png"
+msgstr "./images/Debian_Edu_Network_Wheezy.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
@@ -1312,13 +1312,13 @@ msgstr "Hvor finder jeg yderligere information"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-"Debian Squeeze</ulink> before you start installing a system for production "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 "Vi anbefaler, at du læser eller i det mindste tager et kig på <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">udgivelsesnoterne "
-"for Debian Squeeze</ulink> før du begynder installation af et system for "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">udgivelsesnoterne for "
+"Debian Wheezy</ulink> før du begynder installation af et system for "
 "produktionsbrug. Giv Debian Edu/Skolelinux et forsøg, det bør bare virke ud "
 "af posen."
 
@@ -1345,18 +1345,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Even more information about the Debian Squeeze release is available in its "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Even more information about the Debian Wheezy release is available in its "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"Yderligere information om Debian Squeeze er tilgængelig i Debians <ulink url="
-"\"http://www.debian.org/releases/squeeze/installmanual"
-"\">installationsmanual</ulink>."
+"Yderligere information om Debian Wheezy er tilgængelig i Debians <ulink url="
+"\"http://www.debian.org/releases/wheezy/installmanual\">installationsmanual</"
+"ulink>."
 
 #. 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 7.0.0+r0 Codename \"Wheezy\""
+msgstr "Hent installationsmediet for Debian Edu 7.0.0+r0 kodenavn »Wheezy«"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "DVD for i386, amd64"
@@ -1372,29 +1372,37 @@ msgstr ""
 "installation på amd64- og i386-maskiner. Aftrykket kan hentes over FTP, HTTP "
 "eller rsync via:"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+msgstr ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1410,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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1442,27 +1450,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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -1512,13 +1520,9 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Vælg installationstype"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
-msgstr "Opstartsmenu for installationsprogrammet"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:01-Installer_boot_menu.png]"
+msgstr "[attachment:01-Installer_boot_menu.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1568,13 +1572,9 @@ msgstr ""
 "<emphasis role=\"strong\">Hjælp</emphasis> har nogle fif til brugen af "
 "installationsprogrammet"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
-msgstr "./images/Installer_advanced_options_a.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
-msgstr "Installationsprogrammets avancerede indstillingsskærm 1"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_a.png]"
+msgstr "[attachment:Installer_advanced_options_a.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1628,13 +1628,9 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automatisk installation</emphasis> kræver "
 "en forudfyldt fil (preseed)."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Installationsprogrammets avancerede indstillingsskærm 2"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_b.png]"
+msgstr "[attachment:Installer_advanced_options_b.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1688,13 +1684,9 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit grafisk automatisk installation</emphasis> "
 "kræver en forudfyldt fil (preseed)."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
-msgstr "./images/Installer_help.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer help screen"
-msgstr "Installationsprogrammets hjælpeskærm"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_help.png]"
+msgstr "[attachment:Installer_help.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1807,11 +1799,11 @@ msgstr "Installationsprocessen"
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">system requirements</ulink> and make sure you have at "
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
-"Husk <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"Husk <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/"
 "Requirements\">systemkravene</ulink> og sikr dig at du har mindst to "
 "netværkskort (NIC'er) hvis du planlægger at opsætte en tynd klientserver."
 
@@ -2042,13 +2034,13 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2074,8 +2066,8 @@ msgstr ""
 "nettet varierer fra profil til profil:"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
-msgstr "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
+msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "Main server: 8 out of 115 MiB downloaded."
@@ -2106,35 +2098,6 @@ msgid "Minimal: 12 of 83 MiB downloaded."
 msgstr "Minimal: 12 af 83 MiB hentet."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on some RAID controllers"
-msgstr "En bemærkning om nogle RAID-controllere"
-
-# engelsk fejl
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"When using a USB drive to add missing firmware during install, with some "
-"RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-"installation results in a GRUB error. A workaround for this problem is to "
-"remove the USB drive after the firmware is loaded, and preferably before "
-"partitioning starts."
-msgstr ""
-"Når der bruges et USB-drev til at tilføje manglende firmware under "
-"installationen, så bliver nogle RAID-controlleres GRUB installeret på USB-"
-"drevet. Så en genstart efter installationen medfører en GRUB-fejl. En måde "
-"at omgå dette problem er at fjerne USB-drevet efter at firmwaren er indlæst, "
-"og helst før partitioneringen begynder."
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-msgstr ""
-"Yderligere information er tilgængelig i <ulink url=\"http://bugs.skolelinux."
-"org/show_bug.cgi?id=1395\">Debian-Edu-fejlen #1395</ulink> og Debianfejlen "
-"<ulink url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-
-#. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
 msgstr "En bemærkning om installationer af servere for tynde klienter"
 
@@ -2250,13 +2213,9 @@ msgstr ""
 "Det er sådan her at PXE-menuen ser ud kun med profilen for <emphasis role="
 "\"strong\">hovedserveren</emphasis>:"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/pxe-tjener.png"
-msgstr "./images/pxe-tjener.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "pxe-tjener.png"
-msgstr "pxe-tjener.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:pxe-tjener.png]"
+msgstr "[attachment:pxe-tjener.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2268,13 +2227,9 @@ msgstr ""
 "\">hovedserveren</emphasis> og <emphasis role=\"strong\">Serveren for tynde "
 "klienter</emphasis>:"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2318,8 +2273,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 ""
@@ -2347,10 +2302,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 "Yderligere information kan findes i <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manualen for Debianinstallationsprogrammet</"
+"releases/wheezy/installmanual\">manualen for Debianinstallationsprogrammet</"
 "ulink>."
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2451,241 +2406,125 @@ msgstr ""
 "den første opstart af tjener, en PXE-opstart på arbejdsstationsnetværket og "
 "på netværket for de tynde klienter:"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/02-select_a_language.png"
-msgstr "./images/02-select_a_language.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "02-select_a_language.png"
-msgstr "02-select_a_language.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/03-select_your_location.png"
-msgstr "./images/03-select_your_location.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "03-select_your_location.png"
-msgstr "03-select_your_location.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/04-Configure_the_keyboard.png"
-msgstr "./images/04-Configure_the_keyboard.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "04-Configure_the_keyboard.png"
-msgstr "04-Configure_the_keyboard.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "05-Detect_and_mount_CD-ROM.png"
-msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "06-Load_installer_components_from_CD.png"
-msgstr "06-Load_installer_components_from_CD.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/07-Detect_network_hardware.png"
-msgstr "./images/07-Detect_network_hardware.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "07-Detect_network_hardware.png"
-msgstr "07-Detect_network_hardware.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "08-Choose_Debian_Edu_profile.png"
-msgstr "08-Choose_Debian_Edu_profile.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "11-Participate_in_the_package_usage_survey.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12a-Set_up_users_and_passwords.png"
-msgstr "12a-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12b-Set_up_users_and_passwords.png"
-msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12b-Set_up_users_and_passwords.png"
-msgstr "12b-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12c-Set_up_users_and_passwords.png"
-msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12c-Set_up_users_and_passwords.png"
-msgstr "12c-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/13-Install+the+base+system.png"
-msgstr "./images/13-Install+the+base+system.png"
+#. type: Content of: <article><section><section><para>
+msgid "FIXME: these screenshots need to be redone once we have wheezy artwork"
+msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "13-Install the base system.png"
-msgstr "13-Install the base system.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:02-select_a_language.png]"
+msgstr "[attachment:02-select_a_language.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/14-Select_and_install_software.png"
-msgstr "./images/14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:03-select_your_location.png]"
+msgstr "[attachment:03-select_your_location.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "14-Select_and_install_software.png"
-msgstr "14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:04-Configure_the_keyboard.png]"
+msgstr "[attachment:04-Configure_the_keyboard.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/17-Select_and_install_software.png"
-msgstr "./images/17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:05-Detect_and_mount_CD-ROM.png]"
+msgstr "[attachment:05-Detect_and_mount_CD-ROM.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "17-Select_and_install_software.png"
-msgstr "17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:06-Load_installer_components_from_CD.png]"
+msgstr "[attachment:06-Load_installer_components_from_CD.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/18-Build+LTSP+chroot.png"
-msgstr "./images/18-Build+LTSP+chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:07-Detect_network_hardware.png]"
+msgstr "[attachment:07-Detect_network_hardware.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "18-Build LTSP chroot.png"
-msgstr "18-Build LTSP chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
+msgstr "[attachment:08-Choose_Debian_Edu_profile.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
+msgstr "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
+msgstr "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/20-Finish_the_Installation.png"
-msgstr "./images/20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
+msgstr "[attachment:11-Participate_in_the_package_usage_survey.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "20-Finish_the_Installation.png"
-msgstr "20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12-Set_up_users_and_passwords.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12a-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12a-Set_up_users_and_passwords.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "21-Finish_the_Installation-Installation_complete.png"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12b-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12b-Set_up_users_and_passwords.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12c-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12c-Set_up_users_and_passwords.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "22-Tjener_GRUB_boot_menu.png"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:13-Install the base system.png]"
+msgstr "[attachment:13-Install the base system.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:14-Select_and_install_software.png]"
+msgstr "[attachment:14-Select_and_install_software.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:17-Select_and_install_software.png]"
+msgstr "[attachment:17-Select_and_install_software.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/24-Tjener-KDE_Start.png"
-msgstr "./images/24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:18-Build LTSP chroot.png]"
+msgstr "[attachment:18-Build LTSP chroot.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "24-Tjener-KDE_Start.png"
-msgstr "24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
+msgstr "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:20-Finish_the_Installation.png]"
+msgstr "[attachment:20-Finish_the_Installation.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "26-Tjener-KDE_Desktop_Browser.png"
-msgstr "26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
+msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr "./images/27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "27-Tjener-KDE_Desktop.png"
-msgstr "27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/29-Diskless-WS-KDM_Login.png"
-msgstr "./images/29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:24-Tjener-KDE_Start.png]"
+msgstr "[attachment:24-Tjener-KDE_Start.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "29-Diskless-WS-KDM_Login.png"
-msgstr "29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+msgstr "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/30-ThinClient-LDM_Login.png"
-msgstr "./images/30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:27-Tjener-KDE_Desktop.png]"
+msgstr "[attachment:27-Tjener-KDE_Desktop.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "30-ThinClient-LDM_Login.png"
-msgstr "30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "./images/31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:30-ThinClient-LDM_Login.png]"
+msgstr "[attachment:30-ThinClient-LDM_Login.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
+msgstr "[attachment:31-ThinClient-KDE_Desktop.png]"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2746,13 +2585,9 @@ msgstr ""
 "Kapitlet <link linkend=\"HowTo\">Hjælp</link> dækker flere fif og ideer og "
 "nogle ofte stillede spørgsmål."
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/getting-started-desktop.png"
-msgstr "./images/getting-started-desktop.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu desktop"
-msgstr "Debian Edu-skrivebord"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:getting-started-desktop.png]"
+msgstr "[attachment:getting-started-desktop.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2825,11 +2660,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"If you are using a new Debian Edu Squeeze machine, the site certificate will "
+"If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
-"Hvis du bruger en ny Debian Edu Squeeze-maskine, så vil sidecertifikatet "
-"være kendt af browseren."
+"Hvis du bruger en ny Debian Edu Wheezy-maskine, så vil sidecertifikatet være "
+"kendt af browseren."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2853,13 +2688,9 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa²-logind samt overblik"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa2_overview.png"
-msgstr "./images/gosa2_overview.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² overview page after login as the first user"
-msgstr "GOsa²-overbliksside efter logind som den første bruger"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:gosa2_overview.png]"
+msgstr "[attachment:gosa2_overview.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3060,65 +2891,13 @@ msgstr ""
 "Du skulle nu kunne logge ind med det brugernavn på enhver Skolelinuxmaskine "
 "i dit netværk."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Please note:</emphasis> If Squeeze/r0 was used to "
-"install the main server, all user passwords exept that one for the first "
-"user will expire in only 2 days.  To fix this, please execute the following "
-"script in a terminal.  This script is included in r1."
-msgstr ""
-"<emphasis role=\"strong\">Bemærk venligst:</emphasis> Hvis Squeeze/r0 blev "
-"brugt til at installere hovedserveren, så vil alle brugeradgangskoder med "
-"undtagelse af koden for den første bruger udløbe efter 2 dage. For at rette "
-"dette, så kør det følgende skript i en terminal. Dette skript er inkluderet "
-"i r1."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-msgstr ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Ret adgangskodeudløb efter 2 dage (#664596) der ukorrekt blev\n"
-"  # introduceret i Debian Edu Squeeze opt til r0; for nye brugere\n"
-"  # vil adgangskoden aldrig udløbe. For eksisterende brugere vil\n"
-"  # dette være tilfældet efter at de har ændret deres adgangskode.\n"
-"  # Giv ældre brugere mulighed for at ændre deres adgangskode, \n"
-"  # ekskluder kontoer der ikke er påvirket: skabeloner og \n"
-"  # førstegangsbrugere.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
 msgstr "Søg, ændr og slet brugere"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/filterbox.png"
-msgstr "./images/filterbox.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Filterbox"
-msgstr "Filterbox"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:filterbox.png]"
+msgstr "[attachment:filterbox.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3159,13 +2938,9 @@ msgstr ""
 "ændre adgangskoden for brugeren og ændre listen over grupper som brugeren er "
 "medlem af."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/edit_user.png"
-msgstr "./images/edit_user.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Editing user data"
-msgstr "Redigering af brugerdata"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:edit_user.png]"
+msgstr "[attachment:edit_user.png]"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3214,13 +2989,9 @@ msgid ""
 msgstr ""
 "på den efterfølgende side kan du angive en ny adgangskode valgt af dig selv"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/change_password_administratively.png"
-msgstr "./images/change_password_administratively.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Set user password"
-msgstr "Angiv brugeradgangskode"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:change_password_administratively.png]"
+msgstr "[attachment:change_password_administratively.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3331,17 +3102,13 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppehåndtering med GOsa²"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/create_group.png"
-msgstr "./images/create_group.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "create group"
-msgstr "opret gruppe"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:create_group.png]"
+msgstr "[attachment:create_group.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/list_groups.png"
-msgstr "./images/list_groups.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:list_groups.png]"
+msgstr "[attachment:list_groups.png]"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3395,14 +3162,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 ""
@@ -3493,56 +3260,40 @@ msgstr ""
 #, no-wrap
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "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"
+"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"
 "info: Opdaterer maskine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Opret GOSa-maskine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "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: █]]"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_list.png"
-msgstr "./images/gosa_systems_list.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² systems listing"
-msgstr "Visning af GOsa²-systemer"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_host_details.png"
-msgstr "./images/gosa_systems_host_details.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Host details"
-msgstr "Værtsdetaljer"
+"indtast adgangskode: █"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_edit_host.png"
-msgstr "./images/gosa_systems_edit_host.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_list.png]"
+msgstr "[attachment:gosa_systems_list.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Modify host"
-msgstr "Ændr vært"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_host_details.png]"
+msgstr "[attachment:gosa_systems_host_details.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_add_netgroup.png"
-msgstr "./images/gosa_systems_add_netgroup.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_edit_host.png]"
+msgstr "[attachment:gosa_systems_edit_host.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Add netgroup"
-msgstr "Tilføj netgruppe"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgstr "[attachment:gosa_systems_add_netgroup.png]"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3994,11 +3745,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 ""
@@ -4027,13 +3778,9 @@ msgstr ""
 "(vedligeholdelse) i menuen på siden for sikkerhedskopiering og vælg det "
 "ældste øjebliksbillede du ønsker at bevare:"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/slbackup-php_maintenance.png"
-msgstr "./images/slbackup-php_maintenance.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "slbackup-php Maintenance"
-msgstr "Vedligeholdelse for slbackup-php"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:slbackup-php_maintenance.png]"
+msgstr "[attachment:slbackup-php_maintenance.png]"
 
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
@@ -4138,8 +3885,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 ""
@@ -4451,15 +4198,15 @@ msgstr ""
 "ligeledes stoppe understøttelsen."
 
 #. type: Content of: <article><section><title>
-msgid "Upgrades from Debian Edu Lenny"
-msgstr "Opgraderinger fra Debian Edu Lenny"
+msgid "Upgrades from Debian Edu Squeeze"
+msgstr "Opgraderinger fra Debian Edu Squeeze"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Lenny in a test "
+"Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
-"Vær forberedt: Vær sikker på at du har testet opgraderingen fra Lenny i et "
+"Vær forberedt: Vær sikker på at du har testet opgraderingen fra Squeeze i et "
 "testmiljø eller har sikkerhedskopier klar til en gendannelse."
 
 #. type: Content of: <article><section><section><title>
@@ -4469,10 +4216,10 @@ msgstr "Den grundlæggende opgraderingshandling"
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"lenny\" with \"squeeze\"."
+"occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 "Rediger <computeroutput>/etc/apt/sources.list</computeroutput> og erstat "
-"alle forekomster af »lenny« med »squeeze«."
+"alle forekomster af »squeeze« med »wheezy«."
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get update</computeroutput>"
@@ -4492,6 +4239,12 @@ msgstr "LDAP-tjeneste skal konfigureres igen"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+msgstr ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
 "accounts, passwords, network settings, services and machines are treated is "
 "quite different now. So LDAP has to be rebuild from scratch. There's a "
@@ -4513,9 +4266,9 @@ msgstr "Genskabelse af en LTSP-chroot"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will automatically support both thin-clients and diskless workstations."
+"will still support both thin-clients and diskless workstations."
 msgstr ""
-"På LTSP-serverne skal LTSP-chroot gendannes. Den nye chroot vil automatisk "
+"På LTSP-serverne skal LTSP-chroot gendannes. Den nye chroot vil stadig "
 "understøtte både tynde klienter og diskløse arbejdsstationer."
 
 #. type: Content of: <article><section><section><para>
@@ -4542,26 +4295,26 @@ msgstr "Selvfølgelig kan du også opgradere chroot'en som normalt."
 
 #. type: Content of: <article><section><title>
 msgid ""
-"Upgrades from older Debian Edu / Skolelinux installations (before Lenny)"
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr ""
 "Opgraderinger fra ældre installationer af Debian Edu / Skolelinux (før "
 "Lenney)"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"To upgrade from any older release, you will need to upgrade to the Lenny-"
+"To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian Edu Lenny</"
-"ulink> about how to upgrade to Lenny from the previous release, Etch, and "
-"the Etch manual covers the one before that!"
+"debian.org/DebianEdu/Documentation/Squeeze#\">Manual for Debian Edu Squeeze</"
+"ulink> about how to upgrade to Squeeze from the previous release, Lenny, and "
+"the Lenny manual covers the one before that! (Etch was it's name.)"
 msgstr ""
 "For at opgradere fra alle ældre udgivelser, så skal du først opgradere til "
-"den Lenny-baserede Debian Edu, før du kan følge instruktionerne anført "
+"den Squeeze-baserede Debian Edu, før du kan følge instruktionerne anført "
 "ovenfor. Instrukioner kan ses i <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Documentation/Lenny#\">manualen for Debian Edu Lenny</ulink> for "
-"hvordan der opgraderes til Lenny fra en tidligere udgivelse, Etch og "
-"manualen for Etch dækker den forrige!"
+"DebianEdu/Documentation/Squeeze#\">manualen for Debian Edu Squeeze</ulink> "
+"for hvordan der opgraderes til Squeeze fra en tidligere udgivelse, Lenny og "
+"manualen for Lenny dækker den forrige! (Etch var dens navn)."
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -4680,14 +4433,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 +4456,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 +4466,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 +4477,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 +4593,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 +4631,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 +4657,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 ""
@@ -5023,11 +4776,11 @@ msgstr "Brug af backports.debian.org er nemt:"
 #. type: CDATA
 #, 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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"apt-get update"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5047,13 +4800,13 @@ msgstr "Opgradering med en cd eller dvd-rom"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to upgrade from one version to another (for example from Squeeze "
-"6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical "
+"If you want to upgrade from one version to another (for example from Wheezy "
+"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
 "media, follow these steps:"
 msgstr ""
 "Hvis du ønsker at opgradere fra en version til den næste (for eksempel fra "
-"Squeeze 6.0.6 til 6.0.7) men ikke har internetadgang, kun et fysisk medie, "
-"så følg disse trin:"
+"Wheezy 7.0.0 til 7.0.1) men ikke har internetadgang, kun et fysisk medie, så "
+"følg disse trin:"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5065,10 +4818,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 +4856,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 +4933,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 +4954,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 +5026,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 +5041,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 +5093,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 +5125,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 +5247,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 +5270,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 +5420,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 +5455,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 +5511,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"
@@ -5779,9 +5532,9 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# installer debian-keyring sikkert:\n"
 "apt-get install debian-keyring\n"
@@ -5790,9 +5543,9 @@ msgstr ""
 "# kontroller sikkert om nøglen er korrekt og tilføj den til nøgleringen brugt af APT hvis den er:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# tilføj arkiv til sources.list - kontroller hjemmesiderne for spejle!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# 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 +5651,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 +5665,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 +5750,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 +5814,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 +5861,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 +5874,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 +5896,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 +5918,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 +5987,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 +6118,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 +6141,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 +6182,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 +6296,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 +6327,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 +6342,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 +6452,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 +6480,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 +6515,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 +6585,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 +6594,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 +6616,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 +6632,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 +6641,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)"
@@ -6918,10 +6671,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr ""
 "En Windowsklient kræver de følgende trin for at få tilladelse til at slutte "
-"sig til domænet: <link linkend=\"Samba\">Hjælp for Debian Edu Squeeze Samba</"
+"sig til domænet: <link linkend=\"Samba\">Hjælp for Debian Edu Wheezy Samba</"
 "link>."
 
 #. type: Content of: <article><section><section><section><para>
@@ -6964,11 +6717,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 +7208,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"
@@ -7569,13 +7322,13 @@ msgstr "Samba i Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-"
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
 "style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
 msgstr ""
-"Samba (v3) i Debian Edu Squeeze er blevet fuldt forberedt for brug som en "
-"NT4-lignende domænecontroller med Windows XP, Windows Vista og Windows 7 som "
+"Samba (v3) i Debian Edu Wheezy er blevet fuldt forberedt for brug som en NT4-"
+"lignende domænecontroller med Windows XP, Windows Vista og Windows 7 som "
 "klienter. Efter at en maskine har tilsluttet sig domænet, kan denne maskine "
 "håndteres fuldt ud med Gosa²."
 
@@ -8099,7 +7852,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 +7861,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 +7881,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 +7894,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 +7925,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 +7936,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 +7951,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 ""
@@ -8480,13 +8233,13 @@ msgstr ""
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> and you can contribute easily. Note: a user account is needed "
-"to edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 "Teksten kommer fra en wiki og kan redigeres med en simpel internetbrowser. "
 "Bare gå til <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> hvor du nemt kan bidrage. Bemærk: En brugerkonto er krævet for "
+"Wheezy/\"/> hvor du nemt kan bidrage. Bemærk: En brugerkonto er krævet for "
 "at redigere siderne; du skal oprette en <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">wikibruger</ulink> først."
 
@@ -8616,1877 +8369,1989 @@ msgstr ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/>."
 
 #. type: Content of: <article><section><title>
-msgid "New features in Debian Edu Squeeze"
-msgstr "Nye funktioner i Debian Edu Squeeze"
+msgid "New features in Debian Edu Wheezy"
+msgstr "Nye funktioner i Debian Edu Wheezy"
+
+#. type: Content of: <article><section><para>
+msgid ""
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
+msgstr ""
+"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 ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
-"Ændringer i Debian Edu 6.0.6+r1 kodenavn »Squeeze« *UN*udgivet ??-12-2012"
+"Nye funktioner for Debian Edu 7.0.0+r0 kodenavn »Wheezy« udgivet ??-??-2013"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "sitesummary was updated from 0.1.3 to 0.1.8"
-msgstr "sitesummary blev opdateret fra 0.1.3 til 0.1.8"
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Brugersynlige ændringer"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Make Nagios configuration more robust and efficient"
-msgstr "Gør Nagios' konfiguration mere robust og effektiv"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
+"installation, in the login screen and as desktop wallpaper."
+msgstr ""
+"Opdateret grafik og nyt logo for Debian Edu / Skolelinux, synlig under "
+"installationen, i logindskærmen og som baggrundsbillede."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Comply with 3.X kernel"
-msgstr "Overholder 3.x-kernen"
+#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
 
-#. 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"
+#. type: Content of: <article><section><section><section><title>
+msgid "Installation changes"
+msgstr "Installationsændringer"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Minor updates from the wiki"
-msgstr "Mindre opdateringer fra wikien"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
+msgstr ""
+"Ny version af debianinstallationsprogrammet fra Debian Wheezy, se <ulink url="
+"\"http://www.debian.org/releases/wheezy/installmanual\">installationsmanual</"
+"ulink> for yderligere detaljer."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Danish translation now complete"
-msgstr "Dansk oversættelse er nu færdig"
+#. type: Content of: <article><section><section><section><title>
+msgid "Software updates"
+msgstr "Programopdateringer"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Wheezy:"
+msgstr "Alt som også er nyt i Debian Wheezy:"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 3.2.x"
+msgstr "Linuxkerne version 3.2.x"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+msgstr "Skrivebordsmiljøerne KDE »Plasma« 4.8.4 og GNOME 3.4"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-sync:"
-msgstr "Rettelser for gosa-sync:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 10 ESR"
+msgstr "Internetbrowseren Iceweasel 10 ESR"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't fail if password contains \""
-msgstr "Fejl ikke hvis adgangskode indeholder \""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LibreOffice 3.5.4"
+msgstr "LibreOffice 3.5.4"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't disclose new password string in syslog"
-msgstr "Vis ikke ny adgangskodestreng i syslog"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 12.01"
+msgstr "Undervisningsprogrampakken GCompris 12.01"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-create:"
-msgstr "Rettelser for gosa-create:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 12.04"
+msgstr "Musikoprettelsesprogrammet Rosegarden 12.04"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Invalidate libnss cache before applying changes"
-msgstr "Ugyldig libnss-mellemlager før anvendelse af ændringer"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.8.2"
+msgstr "Billedredigeringsprogrammet Gimp 2.8.2"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Multiple failures during mass user import into GOsa²"
-msgstr "Flere fejl under fælles brugerimport i GOsa²"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.1"
+msgstr "Det virtuelle univers Celestia 1.6.1"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.11.3"
+msgstr "Virtual stargazer Stellarium 0.11.3"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"gosa-netgroups plugin: don't erase entries of attribute type "
-"\"memberNisNetgroup\". Closes: #687256"
+"Debian Wheezy includes over 10,000 new packages available for installation, "
+"including the Chromium browser"
 msgstr ""
-"Udvidelsesmodul for gosa-netgroups: slet ikke poster med attributype "
-"»memberNisNetgroup«. Lukker: #687256"
+"Debian Wheezy inkluderer over 10.000 nye pakker tilgængelige for "
+"installation, inklusiv browseren Chromium"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "First user now uses the same Kerberos policy as all other users"
-msgstr "Første bruger anvender nu samme Kerberospolitik som alle andre brugere"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
+msgstr ""
+"Yderligere information om Debian Wheezy 7.0 er tilgængelig i <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">udgivelsesnoterne</"
+"ulink> og <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installationsmanualen</ulink>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Add Danish web page"
-msgstr "Tilføj dansk hjemmeside"
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
+msgstr "Ændringer i infrastruktur"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "FIXME: to be documented, if any"
+msgstr "FIXME: to be documented, if any"
 
-#. 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><section><title>
+msgid "Documentation and translation updates"
+msgstr "Opdateringer af dokumentation og oversættelser"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in FIXME languages."
 msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Oversættelsesopdateringer for skabelonerne brugt i installationsprogrammet. "
+"Disse skabeloner er nu tilgængelige på FIXME sprog."
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
+"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
-"Nye funktioner for Debian Edu 6.0.4+r0 kodenavn »Squeeze« udgivet 11-03-2012"
+"Manualen for Debian Edu er fuldt oversat til tysk, fransk, italiensk og "
+"dansk. Delvist oversatte versioner findes for norsk bokmål og spansk."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Brugersynlige ændringer"
+msgid "Regressions"
+msgstr "Regressioner"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr "Andre LDAP-relaterede ændringer"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Andre ændringer"
+
+#. type: Content of: <article><section><title>
+msgid "Copyright and authors"
+msgstr "Ophavsret og forfattere"
+
+#. type: Content of: <article><section><para>
 msgid ""
-"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
-"installation, in the login screen and as desktop wallpaper."
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
+"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
+"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
+"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
+"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
+"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
+"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
+"GPL2 or any later version. Enjoy!"
 msgstr ""
-"Opdateret grafik og nyt logo for Debian Edu / Skolelinux, synlig under "
-"installationen, i logindskærmen og som baggrundsbillede."
+"Dette dokument er underlagt ophavsretten og skrevet af Holger Levsen (2007, "
+"2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
+"2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz "
+"(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), "
+"Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker "
+"(2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg "
+"(2008), Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp "
+"Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), "
+"Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David "
+"Prévot (2012), Wolfgang Schweer (2012) og Bernhard Hammes (2012). Dokumentet "
+"er udgivet under GPL2 eller enhver senere version. God fornøjelse!"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <link linkend=\"GettingStarted\">Getting started chapter</link> of the "
-"manual for more information on GOsa²."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the GPL2 or later version."
 msgstr ""
-"Erstat LWAT med GOsa² som LDAP-administrationsgrænseflade. Se nedenfor og "
-"kapitlet <link linkend=\"GettingStarted\">Kom i gang</link> i manualen for "
-"yderligere information om GOsa²."
+"Hvis du tilføjer indhold, <emphasis role=\"strong\">så gør det kun hvis du "
+"selv er forfatteren. Du skal udgive materialet under de samme betingelser</"
+"emphasis>! Tilføj derefter dit navn her og udgiv materialet under GPL2 eller "
+"en senere version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "See below for a list of updated software."
-msgstr "Se nedenfor for en liste over opdaterede programmer."
+#. type: Content of: <article><section><title>
+msgid "Translation copyright and authors"
+msgstr "Ophavsret for oversættelserne og forfatterne"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Show welcome page to users when they first log in. This default start page "
-"for Iceweasel is fetched from LDAP at installation and boot time for "
-"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
-"Standalone installations."
+"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Der vises en velkomstside for brugerne når de logger ind første gang. Denne "
-"startside for Iceweasel hentes nu fra LDAP ved installation og "
-"opstartstidspunkt for netværksprofiler. Sat til <ulink url=\"http://www."
-"skolelinux.org/\"/> for uafhængige installationer."
+"Den spanske oversættelse er underlagt ophavsretten af José L. Redrejo "
+"Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) og Norman Garcia "
+"(2010, 2012). Udgivet under GPL2 eller enhver senere version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
-"installation method."
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
+"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
+"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
 msgstr ""
-"Ny LXDE-skrivebordsindstilling, udover KDE (standard) og GNOME. Som GNOME-"
-"indstillingen, så er LXDE-skrivebordsindstillingen kun understøttet af cd-"
-"installationsmetoden."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Speed up LTSP client boot."
-msgstr "Hurtigere opstart for LTSP-klient."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Provide a KDE menu entry for changing the password in GOsa²."
-msgstr "Tilbyder et KDE-menupunkt for ændring af adgangskode i GOsa²."
+"Oversættelsen til bokmål er underlagt ophavsretten af Petter Reinholdtsen "
+"(2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010) og Jan Roar Rød (2010) og er udgivet under GPL2 eller "
+"enhver senere version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"For more information on how to change passwords (including expired passwords "
-"at the KDM/GDM login prompt), please see the <link linkend=\"Users\">HowTos "
-"for users</link> chapter of the manual."
+"The German translation is copyrighted by Holger Levsen (2007), Patrick "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
+"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
+"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
+"and is released under the GPL2 or any later version."
 msgstr ""
-"For yderligere information om hvordan der ændres adgangskoder (inklusiv "
-"udløbne adgangskoder ved KDM/GDM-logindet), så se venligst kapitlet <link "
-"linkend=\"Users\">Hjælp for brugere</link> i denne manual."
+"Den tyske oversættelse er underlagt ophavsretten af Holger Levsen (2007), "
+"Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
+"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger "
+"Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
+"Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) og "
+"Wolfgang Schweer (2012, 2013) og udgives under GPL2 eller enhver senere "
+"version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
-"shown to new users."
+"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
-"Tilføj henvisning til <ulink url=\"http://linuxsignpost.org/\"/> på "
-"startsiden vist for nye brugere."
+"Den italiensk oversættelse Claudio Carboncini (2007, 2008, 2009, 2010, 2011, "
+"2012, 2013) og er udgivet under GPL2 eller en senere version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"All LTSP servers are also <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP servers</link> by default."
+"The French translation is copyrighted by Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
+"2010, 2012) and is released under the GPL2 or any later version."
 msgstr ""
-"Alle LTSP-servere er nu også <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP-servere</link> som standard."
+"Den franske oversættelse er underlagt ophavsretten af Christophe Masson "
+"(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) og det franske "
+"l10n-hold (2009, 2010, 2012) og er udgivet under GPL2 eller enhver senere "
+"version."
 
-# engelsk fejl handling
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Improve handing of removable media on thin clients. Show desktop "
-"notification longer when inserting new media and provide an option to start "
-"dolphin when such media is inserted."
+"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+"(2009) and is released under the GPL2 or any later version."
 msgstr ""
-"Forbedr håndtering af eksterne medier på tynde klienter. Vis "
-"skrivebordspåmindelse i længere tid når der indsættes et nyt medie og tilbyd "
-"en indstilling for at starte dolphin når sådanne medier indsættes."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Installation changes"
-msgstr "Installationsændringer"
+"Den traditionelle kinesiske oversættelse er underlagt ophavsretten af Andrew "
+"Lee (李健秋) (2009) og er udgivet under GPL2 eller enhver senere version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
-"for more details."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Ny version af debianinstallationsprogrammet fra Debian Squeeze, se <ulink "
-"url=\"http://www.debian.org/releases/squeeze/installmanual"
-"\">installationsmanual</ulink> for yderligere detaljer."
+"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><section><section><itemizedlist><listitem><para>
-msgid ""
-"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
-"is set up during installation of the Main Server. This user is up as GOsa² "
-"administrator and is also granted sudo access. The Debian Edu menu "
-"reordering has been enabled as well, by adding the user also to the "
-"<computeroutput>teachers</computeroutput> group."
-msgstr ""
-"Da root-logind ikke længere er tilladt med brug af gdm/kdm, så sættes en "
-"bruger op i LDAP under installationen af hovedserveren. Denne bruger sættes "
-"op som GOsa²-administrator og gives også sudo-adgang. Ændringer af "
-"rækkefølgen for Debian Edu-menuen er også blevet aktiveret, ved at tilføje "
-"brugeren til gruppen <computeroutput>lærere</computeroutput>."
+#. type: Content of: <article><section><title>
+msgid "Translations of this document"
+msgstr "Oversættelse af dette dokument"
 
-# engelsk fejl to ..
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"Versions of this document fully translated into German, Italian, French and "
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">take a look here</ulink> for your own language."
 msgstr ""
-"Aftrykket <computeroutput>.iso</computeroutput> kan direkte kopieres til USB-"
-"drev, for eksempel ved at bruge <computeroutput>dd</computeroutput> eller "
-"endda <computeroutput>cat</computeroutput>."
+"Fuldt oversatte versioner af dette dokument på tysk, italiensk, fransk og "
+"dansk er tilgængelige. Ufuldstændige oversættelser findes for norsk bokmål "
+"og spansk; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">kig her</ulink> for dit sprog."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New roaming workstation profile for laptops."
-msgstr "Ny roamingarbejdsstationsprofil for bærbare."
+#. type: Content of: <article><section><section><title>
+msgid "HowTo translate this document"
+msgstr "Hvordan oversættes dette dokument"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Device access for all users is handled by <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-"needed to get access to devices."
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-"
+"manual-translations</computeroutput>. The 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."
 msgstr ""
-"Enhedsadgang for alle brugere håndteres af <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink> og ingen ekstra gruppemedlemskaber er "
-"krævet for at få adgang til enhederne."
+"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-wheezy-"
+"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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A warning will be issued when installing on too small disks for the selected "
-"profile."
+"To commit your translations you need to be a member of the Alioth project "
+"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
+"check out some files from from 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 ""
-"En advarsel vises når der installeres på for små diske for den valgte profil."
+"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 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/ "
-"but no seperate /usr anymore."
+"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
+"anonymously with the following command (you need to have the "
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
-"Forenkl partitionering for uafhængige installationer til kun at have et "
-"separat /home/ men ikke længere en separat /usr."
+"Du kan anonymt kigge på kilden for <computeroutput>debian-edu-doc</"
+"computeroutput> med den følgende kommando (du skal have pakken "
+"<computeroutput>git</computeroutput> installeret for at dette virker):"
 
-# engelsk fejl
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"More tests in the test suite, and correct some of the tests that failed "
-"earlier."
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"Flere test i testprogrampakken, og rettelse af nogle af de test som "
-"tidligere fejlede."
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make sure to report an error and abort the installation when trying to use "
-"the netinst images without a working Internet connection, instead of "
-"silently installing a broken system."
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
+"<computeroutput>lokalize</computeroutput>."
 msgstr ""
-"Husk at rapportere en fejl og afbryd installationen når der forsøges at "
-"bruge netinst-aftryk uden en fungerende internetforbindelse, i stedet for "
-"tavst at installere et ødelagt system."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Software updates"
-msgstr "Programopdateringer"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Squeeze:"
-msgstr "Alt som også er nyt i Debian Squeeze:"
+"Rediger så filen <computeroutput>documentation/debian-edu-wheezy/debian-edu-"
+"wheezy-manual.$CC.po</computeroutput> (erstat $CC med din sprogkode). Der er "
+"mange værktøjer for oversættelse tilgængelig; vi anbefaler "
+"<computeroutput>lokalize</computeroutput>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"compatibility with the FHS v2.3 and software developed for version 3.2 of "
-"the LSB."
+"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 ""
-"kompatibilitet med FHS version 2.3 og programmer udviklet for version 3.2 af "
-"LSB'en."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Linux kernel 2.6.32"
-msgstr "Linuxkerne version 2.6.32"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
-msgstr "Skrivebordsmiljøerne KDE »Plasma« 4.4 og GNOME 2.30"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 3.5"
-msgstr "Internetbrowseren Iceweasel 3.5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "OpenOffice.org 3.2.1"
-msgstr "OpenOffice.org 3.2.1"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 9.3"
-msgstr "Undervisningsprogrampakken GCompris 9.3"
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Music creator Rosegarden 10.04.2"
-msgstr "Musikoprettelsesprogrammet Rosegarden 10.04.2"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+msgstr ""
+"For at opdatere din lokale kopi af arkivet så brug den følgende kommando i "
+"mappen <computeroutput>debian-edu-doc</computeroutput>:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Image editor Gimp 2.6.10"
-msgstr "Billedredigeringsprogrammet Gimp 2.6.10"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual universe Celestia 1.6.0"
-msgstr "Det virtuelle univers Celestia 1.6.0"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
+msgstr ""
+"Læs /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations for at finde information om hvordan en ny PO-fil skal oprettes "
+"for dit sprog, hvis et sådant endnu ikke findes, og hvordan oversættelser "
+"skal opdateres."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual stargazer Stellarium 0.10.4"
-msgstr "Virtual stargazer Stellarium 0.10.4"
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
+msgstr ""
+"Husk at denne manual stadig er under udvikling, så oversæt ikke strenge som "
+"indeholder »FIXME«."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation, "
-"including the browser Chromium"
+"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 ""
-"Debian Squeeze inkluderer over 10.000 nye pakker tilgængelige for "
-"installation, inklusiv browseren Chromium"
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
+"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 ""
-"Yderligere information om Debian Squeeze 6.0 er tilgængelig i <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">udgivelsesnoterne</"
-"ulink> og <ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
-"\">installationsmanualen</ulink>."
+"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><section><title>
-msgid "Infrastructural changes"
-msgstr "Ændringer i infrastruktur"
+#. type: Content of: <article><section><section><para>
+msgid "Please report any problems."
+msgstr "Rapporter det venligst hvis du har problemer."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
+msgid "Appendix A - The GNU General Public License"
+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."
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
-"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
-"10.0.0.0/8-netværket bruges nu i stedet for 10.0.2.0/23, og "
-"standardadgangspunktet er 10.0.0.1/8, ikke 10.0.2.1/8 som tidligere."
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The dynamic DHCP range was extended on the backbone network to around 4k IP "
-"addresses, and around 200 IP addresses for the thin client network."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
-"Det dynamiske DHCP-interval blev udvidet på det grundlæggende netværk til "
-"cirka 4k IP-adresse, og cirka 200 IP-adresse for de tynde klienters netværk."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
-"computeroutput>"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
-"DHCP-netværket for 10.0.0.0/8 er blevet omdøbt fra <computeroutput>barebone</"
-"computeroutput> til <computeroutput>intern</computeroutput>"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"There are no pre-defined host entries for client systems in DNS anymore "
-"(staticXX, ..., dhcpYY...)"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 msgstr ""
-"Der er ikke længere prædefinerede værtspunkter for klientsystemer i DNS "
-"(staticXX, ..., dhcpYY ...)"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "MIT Kerberos5 used for user authentication, enabled for:"
-msgstr "MIT Kerberos5 anvendt for brugergodkendelse, aktiveret for:"
+#. type: Content of: <article><section><section><title>
+msgid "GNU GENERAL PUBLIC LICENSE"
+msgstr "GNU GENERAL PUBLIC LICENSE"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "PAM"
-msgstr "PAM"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "IMAP"
-msgstr "IMAP"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "SMTP"
-msgstr "SMTP"
+#. type: Content of: <article><section><section><para>
+msgid "Version 2, June 1991"
+msgstr "Version 2, June 1991"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the <computeroutput>workstation</"
-"computeroutput> netgroup to be able to mount the home directories"
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 msgstr ""
-"NFSv4, men uden tilføjet Kerberos privatliv/integritet/godkendelse. "
-"Maskinerne skal stadig tilføjes netgruppen <computeroutput>arbejdsstation</"
-"computeroutput> for at kunne montere hjemmemapperne"
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
-msgstr "Fuld Samba NT4-domæneunderstøttelse for Windows XP/Vista/7"
+#. type: Content of: <article><section><section><title>
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A complete PXE boot environment is setup when installing from the DVD, so "
-"that further installations can be done using PXE network installs only. A "
-"new script pxe-addfirmware is provided to support more hardware models "
-"needing firmware."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
-"Et fuldstændig PXE-opstartsmiljø sættes op når der installeres fra dvd'en, "
-"så at yderligere installationer kan udføres kun med PXE-"
-"netværksinstallationer. Et nyt skript pxe-addfirmware tilbydes for at "
-"understøtte mere udstyr der kræver firmware."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Remove all hard coded settings on workstations, and configure workstations "
-"and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
-"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
-"Fjern al kodet opsætning på arbejdsstationer, og konfigurer arbejdsstationer "
-"og roamingarbejsstationer med indstillinger detekteret fra miljøet med DNS, "
-"DHCP og LDAP. Se dette <ulink url=\"http://people.skolelinux.org/pere/blog/"
-"No_hardcoded_config_on_Debian_Edu_clients.html\">blogindlæg med mere "
-"information om ændringerne</ulink>."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Documentation and translation updates"
-msgstr "Opdateringer af dokumentation og oversættelser"
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
-"Oversættelsesopdateringer for skabelonerne brugt i installationsprogrammet. "
-"Disse skabeloner er nu tilgængelige på 28 sprog."
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
-"proof-read with corrections was done by a native English linguist."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 msgstr ""
-"Manualen for Debian Edu Squeeze er generelt blevet forbedret. En "
-"gennemlæsning med følgende korrektioner er blevet udført af en indfødt "
-"engelsk lingvistik."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
-"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
-"Spanish."
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
-"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."
-msgstr "Forbedringer for mange sprogopgaver, specielt fransk og dansk."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to the welcome web page shown at first logins."
-msgstr "Forbedringer til velkomsthjemmesiden vist ved første logind."
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add new Japanese, Portuguese and Catalan translations of the welcome web "
-"page."
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 msgstr ""
-"Tilføj ny japansk, portugisisk og catalansk oversættelse af "
-"velkomsthjemmesiden."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr "Regressioner"
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
-"installing a KDE environemnt."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 msgstr ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">Cd- og dvd-installationerne er forskellige</ulink> - dvd'en er kun egnet "
-"for installation af et KDE-miljø."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
-"netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 msgstr ""
-"Drop understøttelse af <computeroutput>powerpc</computeroutput>-arkitektur "
-"fra netinst-installations-cd'er. Det er stadig muligt at afvikle Debian Edu "
-"på <computeroutput>powerpc</computeroutput>, men installationen er i mindre "
-"grad automatiseret."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop gtick in the default installation, because it doesn't work on thin "
-"clients (BTS #566335)."
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
-"Drop gtick i standardinstallationen, da pakken ikke virker på tynde klienter "
-"(BTS #566335)."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "New administration tool: GOsa²"
-msgstr "Nyt administrationsværktøj: GOsa²"
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
-"with:"
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 msgstr ""
-"gosa (2.6.11-3+squeeze1~edu+1) fra den kommende 6.0.5 Debian punktudgivelse, "
-"med:"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fix DHCP host removal. Closes: #650258"
-msgstr "Rettelse DHCP-værtsfjernelse: Lukker #650258"
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Backport user generator unicode character transliteration. Closes: #657086"
-msgstr ""
-"Backport translitteration for brugeroprettede unicodetegn. Lukker: #657086"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Customized GOsa² configuration to better suit the Debian Edu network "
-"architecture."
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
-"Tilpasset GOsa²-konfiguration for bedre tilpasning til Debian Edu-"
-"netværksarkitekturen."
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"GOsa² updates DNS and NFS exports immediately when a system is updated in "
-"LDAP, making diskless workstations work right after they are added to the "
-"required netgroup."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
-"GOsa² opdaterer DNS- og NFS-eksport øjeblikkeligt når et system er opdateret "
-"i LDAP, hvilket gør at diskløse arbejdsstationer virker lige efter, at de "
-"tilføjes til den krævede netgruppe."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
-"objects using information gathered by sitesummary, to make it easier to add "
-"new computers to the network."
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
-"Tilbyd skript sitesummary2ldapdhcp for at opdatere eller befolke GOsa² med "
-"systemobjekter der bruger information samlet af sitesummary, for at gøre det "
-"nemmere at tilføje nye computere til netværket."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "More software changes"
-msgstr "Yderligere programændringer"
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
-"Tilføj videoredigeringsprogrammet Kdenlive 0.7.7 og Interactive geometry "
-"tool 3.2.42"
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Change default package manager from adept to synaptic, to avoid getting two "
-"graphical package managers installed by default."
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 msgstr ""
-"Ændr standardpakkehåndtering fra adept til synaptic, for at undgå at to "
-"grafiske pakkehåndteringer er installeret som standard."
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
-"KDE."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
-"Installer openoffice.org-kde som standard sikrer at OOo bruger KDE-"
-"fildialoger i KDE."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 msgstr ""
-"Ændr videoafspilleropsætning for at installere andre afspillere i KDE "
-"(dragonplayer), GNOME (totem) og LXDE (totem)."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
-"default KDE installation."
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 msgstr ""
-"Tilføj KDE-værktøjerne freespacenotifier, kinfocenter, update-notifier-kde "
-"til standardinstallationen for KDE."
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Replace network-manager-kde with plasma-widget-networkmanagement in the "
-"standalone KDE profile"
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
-"Erstat network-manager-kde med plasma-widget-networkmanagement i den "
-"uafhængige KDE-profil"
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
-"Installer usb-modeswitch på bærbare for at håndtere USB-enheder i "
-"dualtilstand."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add cifs-utils to the default installation to ensure SMB mounting can work "
-"in any profile."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
-"Tilføj cifs-utils til standardinstallationen for at sikre at SMB-montering "
-"virker i alle profiler."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
-"and valgrind from the default installation and the DVD to make room for "
-"higher priority packages."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma "
-"og valgrind fra standardinstallationen og dvd'en for at give plads til "
-"pakker med højere prioritet."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
-"authoritive source of host names."
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 msgstr ""
-"Drop libnss-mdns fra stationære profiler, for at sikre at DNS er den "
-"autoritære kilde for værtsnavne."
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
-"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
-"installed instead.)"
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 msgstr ""
-"<computeroutput>freerdp-x11</computeroutput> installeres som standard som "
-"RDP- og VNC-klient. (Tidligere blev <computeroutput>rdesktop</"
-"computeroutput> installeret i stedet for)."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
-msgstr "Andre LDAP-relaterede ændringer"
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make the LDAP server handle more clients after increasing the server's file "
-"descriptor limit from 1024 to 32768."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
-"LDAP-serveren kan nu håndtere flere klienter efter øgning af serverens "
-"filbeskrivelsesbegrænsning fra 1024 til 32768."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
-"flush all CUPS queues every night. Both can be disabled in LDAP."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 msgstr ""
-"Tilføj kode til at genaktivere stoppede CUPS-køer hver time på "
-"hovedserveren, og tøm alle CUPS-køer hver nat. Begge kan deaktivers i LDAP."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Provide network blocking / exam mode by default, controlled by LDAP. In "
-"addition to network blocking, changes to the Squid proxy configuration is "
-"needed."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
-"Tilbyd netværksblokering / undersøgelsestilstand som standard, kontrolleret "
-"af LDAP. Udover netværksblokering er ændringer til proxykonfigurationen for "
-"Squid krævet."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Enable automatic extending of full file systems on the Main Server by "
-"default. This can be disabled in LDAP."
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
-"Aktiver automatisk udvidelse af hele filsystemer på hovedserveren som "
-"standard. Dette kan deaktivers i LDAP."
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change SSL certificate name used by the LDAP server and adjust clients to "
-"use the new name to be able to enable certificate checking on clients."
-msgstr ""
-"Ændr SSL-certifikatnavn brugt af LDAP-serveren og juster klienter til at "
-"bruge det nye navn for at kunne aktivere certifikatkontrol på klienter."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+msgstr "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
-"setup used for DNS."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
-"Skift PowerDNS til at bruge streng LDAP-tilstand, for at lade os forenkle "
-"LDAP-opsætningen brugt for DNS."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify autofs LDAP rules to make sure they work with extra home directory "
-"partitions exported from the main-server without any changes."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
-"Forenkl autofs LDAP-regler for at sikre at de virker med ekstra "
-"hjemmemappepartitioner eksportert fra hovedserveren uden nogen ændringer."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Make backup system more robust in handling LDAP database dump and restart."
-msgstr ""
-"Gør sikkerhedssystemer mere robust i håndteringen af LDAP-databasedump og "
-"genstart."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Andre ændringer"
+#. type: Content of: <article><section><title>
+msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
+msgstr "Appendix B - endnu ingen Debian Edu Live cd/dvd'er for Wheezy"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Root logins are denied for both KDM and GDM - see above and <link linkend="
-"\"GettingStarted\">Getting started</link> for details."
+#. type: Content of: <article><section><para>
+msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
 msgstr ""
-"Root-logind nægtes for både KDM og GDM - se ovenfor og <link linkend="
-"\"GettingStarted\">Sådan kommer du i gang</link> for detaljer."
+"Debian Edu Live cd'er/dvd'er for Wheezy er ikke tilgængelige i øjeblikket."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Clients set up to shut down at night will stay up for at least an hour if "
-"they are turned on manually between 16:00 and 07:00."
-msgstr ""
-"Klienter opsat til at lukke ned om natten vil nu blive oppe i mindst en "
-"time, hvis de tændes manuelt mellem 16:00 og 07:00."
+#. type: Content of: <article><section><section><title>
+msgid "Features of the Standalone image"
+msgstr "Funktioner for det uafhængige aftryk"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Additionally use local NTP clock on the main-server to ensure clients and "
-"server sync clocks also when disconnected from the Internet."
-msgstr ""
-"Brug derudover lokal NTP-ur på hovedserveren for at sikre klient- og "
-"serversynkronisering af ure også når der ikke er forbindelse til internettet."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Almost all packages from the Standalone profile"
+msgstr "Næsten alle pakker fra den uafhængige profil"
 
-# engelsk fejl When
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
-msgstr ""
-"Adgang til Debianarkiver udføres altid via en proxy på hovedserveren - læs "
-"mere om implementeringsdetaljerne <ulink url=\"http://lists.debian."
-"org/20100704221022.GC30542 at login1.uio.no\">når der bruges DHCP og WPAD</"
-"ulink>"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "All packages from the laptop task"
+msgstr "Alle pakker fra den bærbare opgave"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "The home0 partition is mounted nosuid, to increase security."
-msgstr "Partitionen home0 monteres nosuid, for at øge sikkerheden."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The KDE desktop profile for students/pupils."
+msgstr "KDE-skrivebordsprofilen for studenter/elever."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
-"from 144 to 24 MiB."
-msgstr ""
-"Ændring af KDE/Akonadi-konfiguration for at reducere diskaftrykket for hver "
-"bruger fra 144 til 24 MiB."
+#. type: Content of: <article><section><section><title>
+msgid "Activating translations and regional support"
+msgstr "Aktivering af oversættelser og regional understøttelse"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
-"Nyt værktøj notify-local-users til at sende skrivebordspåmindelser til alle "
-"brugere (der er logget på) på en maskine. Brugbart for servere for tynde "
-"klienter."
+"For at aktivere en specifik oversættelse, så start op med "
+"<computeroutput>locale=ll_CC.UTF-8</computeroutput> som opstartsindstilling, "
+"hvor ll_CC.UTF-8 er sprognavnet du ønsker. For at aktivere en bestemt "
+"tastaturlayout, så brug indstillingen <computeroutput>keyb=KB</"
+"computeroutput> hvor KB er det ønskede tastaturlayout. Yderligere "
+"information om denne funktion <ulink url=\"http://wiki.debian.org/DebianLive/"
+"l10n\">er tilgængelig i dokumentationen for live cd'ens byggeskript</ulink>. "
+"Her er en liste over ofte brugte sprogkoder:"
 
-#. type: Content of: <article><section><title>
-msgid "Copyright and authors"
-msgstr "Ophavsret og forfattere"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
+msgstr "<emphasis role=\"strong\">Sprog (region)</emphasis>"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
-"GPL2 or any later version. Enjoy!"
-msgstr ""
-"Dette dokument er underlagt ophavsretten og skrevet af Holger Levsen (2007, "
-"2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
-"2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz "
-"(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), "
-"Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker "
-"(2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg "
-"(2008), Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp "
-"Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), "
-"Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David "
-"Prévot (2012), Wolfgang Schweer (2012) og Bernhard Hammes (2012). Dokumentet "
-"er udgivet under GPL2 eller enhver senere version. God fornøjelse!"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Locale value</emphasis>"
+msgstr "<emphasis role=\"strong\">Sprogværdi</emphasis>"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
-msgstr ""
-"Hvis du tilføjer indhold, <emphasis role=\"strong\">så gør det kun hvis du "
-"selv er forfatteren. Du skal udgive materialet under de samme betingelser</"
-"emphasis>! Tilføj derefter dit navn her og udgiv materialet under GPL2 eller "
-"en senere version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
+msgstr "<emphasis role=\"strong\">Tastaturlayout</emphasis>"
 
-#. type: Content of: <article><section><title>
-msgid "Translation copyright and authors"
-msgstr "Ophavsret for oversættelserne og forfatterne"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Bokmål"
+msgstr "Norsk - bokmål"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
-msgstr ""
-"Den spanske oversættelse er underlagt ophavsretten af José L. Redrejo "
-"Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) og Norman Garcia "
-"(2010, 2012). Udgivet under GPL2 eller enhver senere version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nb_NO.UTF-8"
+msgstr "nb_NO.UTF-8"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
-msgstr ""
-"Oversættelsen til bokmål er underlagt ophavsretten af Petter Reinholdtsen "
-"(2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders "
-"Andreassen (2010) og Jan Roar Rød (2010) og er udgivet under GPL2 eller "
-"enhver senere version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no"
+msgstr "no"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
-"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
-"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
-"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
-msgstr ""
-"Den tyske oversættelse er underlagt ophavsretten af Holger Levsen (2007), "
-"Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
-"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger "
-"Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-"Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) og "
-"Wolfgang Schweer (2012, 2013) og udgives under GPL2 eller enhver senere "
-"version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Nynorsk"
+msgstr "Norsk - nynorsk"
 
-#. 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."
-msgstr ""
-"Den italiensk oversættelse Claudio Carboncini (2007, 2008, 2009, 2010, 2011, "
-"2012, 2013) og er udgivet under GPL2 eller en senere version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nn_NO.UTF-8"
+msgstr "nn_NO.UTF-8"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
-msgstr ""
-"Den franske oversættelse er underlagt ophavsretten af Christophe Masson "
-"(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) og det franske "
-"l10n-hold (2009, 2010, 2012) og er udgivet under GPL2 eller enhver senere "
-"version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "German"
+msgstr "Tysk"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
-msgstr ""
-"Den traditionelle kinesiske oversættelse er underlagt ophavsretten af Andrew "
-"Lee (李健秋) (2009) og er udgivet under GPL2 eller enhver senere version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de_DE.UTF-8"
+msgstr "de_DE.UTF-8"
 
-#. 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."
-msgstr ""
-"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><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de"
+msgstr "de"
 
-#. type: Content of: <article><section><title>
-msgid "Translations of this document"
-msgstr "Oversættelse af dette dokument"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "French (France)"
+msgstr "Fransk (Frankrig)"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
-msgstr ""
-"Fuldt oversatte versioner af dette dokument på tysk, italiensk, fransk og "
-"dansk er tilgængelige. Ufuldstændige oversættelser findes for norsk bokmål "
-"og spansk; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">kig her</ulink> for dit sprog."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr_FR.UTF-8"
+msgstr "fr_FR.UTF-8"
 
-#. type: Content of: <article><section><section><title>
-msgid "HowTo translate this document"
-msgstr "Hvordan oversættes dette dokument"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr"
+msgstr "fr"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"As in many free software projects, translations of this document are kept in "
-"PO files. More information about the process can be found in "
-"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
-"contains this file too. Take a look there and at the <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-"specific conventions</ulink> if you want to help translating this document."
-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."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Greek (Greece)"
+msgstr "Græsk (Grækenland)"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
-"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
-"\">instructions on how to submit bugs</ulink> here."
-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."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el_GR.UTF-8"
+msgstr "el_GR.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el"
+msgstr "el"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Japanese"
+msgstr "Japansk"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "ja_JP.UTF-8"
+msgstr "ja_JP.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "jp"
+msgstr "jp"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Northern Sami (Norway)"
+msgstr "Nordligt samisk (Norge)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "se_NO"
+msgstr "se_NO"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no(smi)"
+msgstr "no(smi)"
 
 #. 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):"
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
-"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):"
+"En fuldstændig liste over sprogkoder er tilgængelig på <computeroutput>/usr/"
+"share/i18n/SUPPORTED</computeroutput>, men kun kodningen UTF-8 er "
+"understøttet af liveaftryk. Ikke alle sprog har dog oversættelser "
+"installeret. Tastaturlayoutnavne kan findes i /usr/share/keymaps/i386/."
+
+#. type: Content of: <article><section><section><title>
+msgid "Stuff to know"
+msgstr "Lidt information"
 
 #. 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>"
-msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+msgid "The password for the user is \"user\"; root has no passwd set."
+msgstr "Adgangskoden for brugeren er »user«; root har ikke en adgangskode."
+
+#. type: Content of: <article><section><section><title>
+msgid "Known issues with the image"
+msgstr "Kendte problemstillinger med aftrykket"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "There are no wheezy images yet"
+msgstr "Der er endnu ikke nogle wheezy-aftryk"
+
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/sad.png"
+msgstr "./images/sad.png"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+msgid ":("
+msgstr ":("
+
+#. type: Content of: <article><section><section><title>
+msgid "Download"
+msgstr "Hent"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language "
-"code). There are many tools for translating available; we suggest using "
-"<computeroutput>lokalize</computeroutput>."
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
-"Rediger så filen <computeroutput>documentation/debian-edu-squeeze/debian-edu-"
-"squeeze-manual.$CC.po</computeroutput> (erstat $CC med din sprogkode). Der "
-"er mange værktøjer for oversættelse tilgængelig; vi anbefaler "
-"<computeroutput>lokalize</computeroutput>."
+"Aftrykket er 1,2 GiB og vil være (men er aktuelt ikke) tilgængelig via "
+"<ulink url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink "
+"url=\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> eller rsync "
+"from <computeroutput>ftp.skolelinux.org</computeroutput> under "
+"<computeroutput>cd-wheezy-live/</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><title>
+msgid "Appendix C - Features in older releases"
+msgstr "Appendiks C - Funktioner i ældre udgivelser"
+
+#. type: Content of: <article><section><section><title>
 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."
+"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released 2013-0?-??"
 msgstr ""
-"Når du enten indsender filen direkte til Subversion (hvis du har rettigheder "
-"til dette) eller sender filen til fejlrapporten."
+"Ændringer i Debian Edu 6.0.6+r1 kodenavn »Squeeze« *UN*udgivet ??-01-2013"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 msgstr ""
-"For at opdatere din lokale kopi af arkivet så brug den følgende kommando i "
-"mappen <computeroutput>debian-edu-doc</computeroutput>:"
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "sitesummary was updated from 0.1.3 to 0.1.8"
+msgstr "sitesummary blev opdateret fra 0.1.3 til 0.1.8"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations to find information how to create a new PO file for your "
-"language if there isn't one yet, and how to update translations."
-msgstr ""
-"Læs /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations for at finde information om hvordan en ny PO-fil skal oprettes "
-"for dit sprog, hvis et sådant endnu ikke findes, og hvordan oversættelser "
-"skal opdateres."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make Nagios configuration more robust and efficient"
+msgstr "Gør Nagios' konfiguration mere robust og effektiv"
 
-#.  <remark>
-#. status ignore</remark> 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Please keep in mind that this manual is still under development, so don't "
-"translate any string which contains \" FIXME\"."
-msgstr ""
-"Husk at denne manual stadig er under udvikling, så oversæt ikke strenge som "
-"indeholder » FIXME«."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Comply with 3.X kernel"
+msgstr "Overholder 3.x-kernen"
 
-#. type: Content of: <article><section><section><para>
+#. 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"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Minor updates from the wiki"
+msgstr "Mindre opdateringer fra wikien"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><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\"/>."
+"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
+"#664596"
 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\"/>."
+"Korrektion af Kerberos' brugerpolitik: Adgangskoder udløber ikke efter 2 "
+"dage. Lukker: #664596"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><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."
+"Handle '#' characters in the root or first users password. Closes: #664976"
 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."
+"Håndterer »#«-tegn i administrators (root) eller første brugers adgangskode. "
+"Lukker #664976"
 
-#. type: Content of: <article><section><section><para>
-msgid "Please report any problems."
-msgstr "Rapporter det venligst hvis du har problemer."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-sync:"
+msgstr "Rettelser for gosa-sync:"
 
-#. type: Content of: <article><section><title>
-msgid "Appendix A - The GNU General Public License"
-msgstr "Appendiks A - The GNU General Public License"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't fail if password contains \""
+msgstr "Fejl ikke hvis adgangskode indeholder \""
 
-#. 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. ]]"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't disclose new password string in syslog"
+msgstr "Vis ikke ny adgangskodestreng i syslog"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
-msgstr ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-create:"
+msgstr "Rettelser for gosa-create:"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Invalidate libnss cache before applying changes"
+msgstr "Ugyldig libnss-mellemlager før anvendelse af ændringer"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
-msgstr ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Multiple failures during mass user import into GOsa²"
+msgstr "Flere fejl under fælles brugerimport i GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"gosa-netgroups plugin: don't erase entries of attribute type "
+"\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"Udvidelsesmodul for gosa-netgroups: slet ikke poster med attributype "
+"»memberNisNetgroup«. Lukker: #687256"
 
-#. type: Content of: <article><section><section><title>
-msgid "GNU GENERAL PUBLIC LICENSE"
-msgstr "GNU GENERAL PUBLIC LICENSE"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "First user now uses the same Kerberos policy as all other users"
+msgstr "Første bruger anvender nu samme Kerberospolitik som alle andre brugere"
 
-#. type: Content of: <article><section><section><para>
-msgid "Version 2, June 1991"
-msgstr "Version 2, June 1991"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Add Danish web page"
+msgstr "Tilføj dansk hjemmeside"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
-msgstr ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-install from 1.528 to 1.529"
+msgstr "debian-edu-install fra 1.528 til 1.529"
 
-#. type: Content of: <article><section><section><title>
-msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+#. 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>
+#. type: Content of: <article><section><section><title>
 msgid ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"Nye funktioner for Debian Edu 6.0.4+r0 kodenavn »Squeeze« udgivet 11-03-2012"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
+"the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"Erstat LWAT med GOsa² som LDAP-administrationsgrænseflade. Se nedenfor og "
+"kapitlet <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Kom i gang</ulink> i manualen for yderligere information "
+"om GOsa²."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "See below for a list of updated software."
+msgstr "Se nedenfor for en liste over opdaterede programmer."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"Show welcome page to users when they first log in. This default start page "
+"for Iceweasel is fetched from LDAP at installation and boot time for "
+"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
+"Standalone installations."
 msgstr ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"Der vises en velkomstside for brugerne når de logger ind første gang. Denne "
+"startside for Iceweasel hentes nu fra LDAP ved installation og "
+"opstartstidspunkt for netværksprofiler. Sat til <ulink url=\"http://www."
+"skolelinux.org/\"/> for uafhængige installationer."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+"Gnome option, the LXDE desktop option is only supported by the CD "
+"installation method."
 msgstr ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"Ny LXDE-skrivebordsindstilling, udover KDE (standard) og GNOME. Som GNOME-"
+"indstillingen, så er LXDE-skrivebordsindstillingen kun understøttet af cd-"
+"installationsmetoden."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Speed up LTSP client boot."
+msgstr "Hurtigere opstart for LTSP-klient."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Provide a KDE menu entry for changing the password in GOsa²."
+msgstr "Tilbyder et KDE-menupunkt for ændring af adgangskode i GOsa²."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</ulink> "
+"chapter of the manual."
 msgstr ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"For yderligere information om hvordan der ændres adgangskoder (inklusiv "
+"udløbne adgangskoder ved KDM/GDM-logindet), så se venligst kapitlet <ulink "
+"url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#"
+"\">Hjælp for brugere</ulink> i denne manual."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
+"shown to new users."
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"Tilføj henvisning til <ulink url=\"http://linuxsignpost.org/\"/> på "
+"startsiden vist for nye brugere."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"Alle LTSP-servere er nu også <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP-"
+"servere</ulink> som standard."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+# engelsk fejl handling
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Improve handing of removable media on thin clients. Show desktop "
+"notification longer when inserting new media and provide an option to start "
+"dolphin when such media is inserted."
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Forbedr håndtering af eksterne medier på tynde klienter. Vis "
+"skrivebordspåmindelse i længere tid når der indsættes et nyt medie og tilbyd "
+"en indstilling for at starte dolphin når sådanne medier indsættes."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"Ny version af debianinstallationsprogrammet fra Debian Squeeze, se <ulink "
+"url=\"http://www.debian.org/releases/squeeze/installmanual"
+"\">installationsmanual</ulink> for yderligere detaljer."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
+"is set up during installation of the Main Server. This user is up as GOsa² "
+"administrator and is also granted sudo access. The Debian Edu menu "
+"reordering has been enabled as well, by adding the user also to the "
+"<computeroutput>teachers</computeroutput> group."
 msgstr ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"Da root-logind ikke længere er tilladt med brug af gdm/kdm, så sættes en "
+"bruger op i LDAP under installationen af hovedserveren. Denne bruger sættes "
+"op som GOsa²-administrator og gives også sudo-adgang. Ændringer af "
+"rækkefølgen for Debian Edu-menuen er også blevet aktiveret, ved at tilføje "
+"brugeren til gruppen <computeroutput>lærere</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+# engelsk fejl to ..
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
+"<computeroutput>cat</computeroutput>.."
 msgstr ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"Aftrykket <computeroutput>.iso</computeroutput> kan direkte kopieres til USB-"
+"drev, for eksempel ved at bruge <computeroutput>dd</computeroutput> eller "
+"endda <computeroutput>cat</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New roaming workstation profile for laptops."
+msgstr "Ny roamingarbejdsstationsprofil for bærbare."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"Device access for all users is handled by <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"Enhedsadgang for alle brugere håndteres af <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink> og ingen ekstra gruppemedlemskaber er "
+"krævet for at få adgang til enhederne."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"En advarsel vises når der installeres på for små diske for den valgte profil."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Forenkl partitionering for uafhængige installationer til kun at have et "
+"separat /home/ men ikke længere en separat /usr."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+# engelsk fejl
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"More tests in the test suite, and correct some of the tests that failed "
+"earlier."
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Flere test i testprogrampakken, og rettelse af nogle af de test som "
+"tidligere fejlede."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"Make sure to report an error and abort the installation when trying to use "
+"the netinst images without a working Internet connection, instead of "
+"silently installing a broken system."
 msgstr ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"Husk at rapportere en fejl og afbryd installationen når der forsøges at "
+"bruge netinst-aftryk uden en fungerende internetforbindelse, i stedet for "
+"tavst at installere et ødelagt system."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Squeeze:"
+msgstr "Alt som også er nyt i Debian Squeeze:"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"compatibility with the FHS v2.3 and software developed for version 3.2 of "
+"the LSB."
 msgstr ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"kompatibilitet med FHS version 2.3 og programmer udviklet for version 3.2 af "
+"LSB'en."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 2.6.32"
+msgstr "Linuxkerne version 2.6.32"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+msgstr "Skrivebordsmiljøerne KDE »Plasma« 4.4 og GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 3.5"
+msgstr "Internetbrowseren Iceweasel 3.5"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "OpenOffice.org 3.2.1"
+msgstr "OpenOffice.org 3.2.1"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 9.3"
+msgstr "Undervisningsprogrampakken GCompris 9.3"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 10.04.2"
+msgstr "Musikoprettelsesprogrammet Rosegarden 10.04.2"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.6.10"
+msgstr "Billedredigeringsprogrammet Gimp 2.6.10"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
-msgstr ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.0"
+msgstr "Det virtuelle univers Celestia 1.6.0"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
-msgstr ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.10.4"
+msgstr "Virtual stargazer Stellarium 0.10.4"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"Debian Squeeze inkluderer over 10.000 nye pakker tilgængelige for "
+"installation, inklusiv browseren Chromium"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"Yderligere information om Debian Squeeze 6.0 er tilgængelig i <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">udgivelsesnoterne</"
+"ulink> og <ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"\">installationsmanualen</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
+"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"10.0.0.0/8-netværket bruges nu i stedet for 10.0.2.0/23, og "
+"standardadgangspunktet er 10.0.0.1/8, ikke 10.0.2.1/8 som tidligere."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"The dynamic DHCP range was extended on the backbone network to around 4k IP "
+"addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"Det dynamiske DHCP-interval blev udvidet på det grundlæggende netværk til "
+"cirka 4k IP-adresse, og cirka 200 IP-adresse for de tynde klienters netværk."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"The DHCP network for 10.0.0.0/8 has been renamed from "
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"DHCP-netværket for 10.0.0.0/8 er blevet omdøbt fra <computeroutput>barebone</"
+"computeroutput> til <computeroutput>intern</computeroutput>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"There are no pre-defined host entries for client systems in DNS anymore "
+"(staticXX, ..., dhcpYY...)"
 msgstr ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"Der er ikke længere prædefinerede værtspunkter for klientsystemer i DNS "
+"(staticXX, ..., dhcpYY ...)"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "MIT Kerberos5 used for user authentication, enabled for:"
+msgstr "MIT Kerberos5 anvendt for brugergodkendelse, aktiveret for:"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "PAM"
+msgstr "PAM"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "IMAP"
+msgstr "IMAP"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "SMTP"
+msgstr "SMTP"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"NFSv4, men uden tilføjet Kerberos privatliv/integritet/godkendelse. "
+"Maskinerne skal stadig tilføjes netgruppen <computeroutput>arbejdsstation</"
+"computeroutput> for at kunne montere hjemmemapperne"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+msgstr "Fuld Samba NT4-domæneunderstøttelse for Windows XP/Vista/7"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"A complete PXE boot environment is setup when installing from the DVD, so "
+"that further installations can be done using PXE network installs only. A "
+"new script pxe-addfirmware is provided to support more hardware models "
+"needing firmware."
 msgstr ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"Et fuldstændig PXE-opstartsmiljø sættes op når der installeres fra dvd'en, "
+"så at yderligere installationer kan udføres kun med PXE-"
+"netværksinstallationer. Et nyt skript pxe-addfirmware tilbydes for at "
+"understøtte mere udstyr der kræver firmware."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+"Remove all hard coded settings on workstations, and configure workstations "
+"and roaming workstations using settings detected from the environment using "
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+"Fjern al kodet opsætning på arbejdsstationer, og konfigurer arbejdsstationer "
+"og roamingarbejsstationer med indstillinger detekteret fra miljøet med DNS, "
+"DHCP og LDAP. Se dette <ulink url=\"http://people.skolelinux.org/pere/blog/"
+"No_hardcoded_config_on_Debian_Edu_clients.html\">blogindlæg med mere "
+"information om ændringerne</ulink>."
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
-msgstr "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+"Oversættelsesopdateringer for skabelonerne brugt i installationsprogrammet. "
+"Disse skabeloner er nu tilgængelige på 28 sprog."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
+"proof-read with corrections was done by a native English linguist."
 msgstr ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"Manualen for Debian Edu Squeeze er generelt blevet forbedret. En "
+"gennemlæsning med følgende korrektioner er blevet udført af en indfødt "
+"engelsk lingvistik."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"Manualen for Debian Edu er fuldt oversat til tysk, fransk og italiensk. "
+"Delvist oversatte versioner findes for dansk (ny), norsk bokmål og spansk."
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
-msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to many language tasks, especially French and Danish."
+msgstr "Forbedringer for mange sprogopgaver, specielt fransk og dansk."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet"
-msgstr "Appendix B - endnu ingen Debian Edu Live cd/dvd'er for Squeeze"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to the welcome web page shown at first logins."
+msgstr "Forbedringer til velkomsthjemmesiden vist ved første logind."
 
-#. type: Content of: <article><section><para>
-msgid "Debian Edu Live CD/DVDs for Squeeze are not available at the moment."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add new Japanese, Portuguese and Catalan translations of the welcome web "
+"page."
 msgstr ""
-"Debian Edu Live cd'er/dvd'er for Squeeze er ikke tilgængelige i øjeblikket."
-
-#. type: Content of: <article><section><section><title>
-msgid "Features of the Standalone image"
-msgstr "Funktioner for det uafhængige aftryk"
+"Tilføj ny japansk, portugisisk og catalansk oversættelse af "
+"velkomsthjemmesiden."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Almost all packages from the Standalone profile"
-msgstr "Næsten alle pakker fra den uafhængige profil"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
+msgstr ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">Cd- og dvd-installationerne er forskellige</ulink> - dvd'en er kun egnet "
+"for installation af et KDE-miljø."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "All packages from the laptop task"
-msgstr "Alle pakker fra den bærbare opgave"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
+"netinst installation CDs. It is still possible to run Debian Edu on "
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+msgstr ""
+"Drop understøttelse af <computeroutput>powerpc</computeroutput>-arkitektur "
+"fra netinst-installations-cd'er. Det er stadig muligt at afvikle Debian Edu "
+"på <computeroutput>powerpc</computeroutput>, men installationen er i mindre "
+"grad automatiseret."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The KDE desktop profile for students/pupils."
-msgstr "KDE-skrivebordsprofilen for studenter/elever."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop gtick in the default installation, because it doesn't work on thin "
+"clients (BTS #566335)."
+msgstr ""
+"Drop gtick i standardinstallationen, da pakken ikke virker på tynde klienter "
+"(BTS #566335)."
 
-#. type: Content of: <article><section><section><title>
-msgid "Activating translations and regional support"
-msgstr "Aktivering af oversættelser og regional understøttelse"
+#. type: Content of: <article><section><section><section><title>
+msgid "New administration tool: GOsa²"
+msgstr "Nyt administrationsværktøj: GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want.  To activate a given keyboard layout, use the "
-"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
-"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live CD build script "
-"documentation</ulink>.  Here is a list of commonly used locale codes:"
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
-"For at aktivere en specifik oversættelse, så start op med "
-"<computeroutput>locale=ll_CC.UTF-8</computeroutput> som opstartsindstilling, "
-"hvor ll_CC.UTF-8 er sprognavnet du ønsker. For at aktivere en bestemt "
-"tastaturlayout, så brug indstillingen <computeroutput>keyb=KB</"
-"computeroutput> hvor KB er det ønskede tastaturlayout. Yderligere "
-"information om denne funktion <ulink url=\"http://wiki.debian.org/DebianLive/"
-"l10n\">er tilgængelig i dokumentationen for live cd'ens byggeskript</ulink>. "
-"Her er en liste over ofte brugte sprogkoder:"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
-msgstr "<emphasis role=\"strong\">Sprog (region)</emphasis>"
+"gosa (2.6.11-3+squeeze1~edu+1) fra den kommende 6.0.5 Debian punktudgivelse, "
+"med:"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Locale value</emphasis>"
-msgstr "<emphasis role=\"strong\">Sprogværdi</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix DHCP host removal. Closes: #650258"
+msgstr "Rettelse DHCP-værtsfjernelse: Lukker #650258"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
-msgstr "<emphasis role=\"strong\">Tastaturlayout</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Backport user generator unicode character transliteration. Closes: #657086"
+msgstr ""
+"Backport translitteration for brugeroprettede unicodetegn. Lukker: #657086"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Bokmål"
-msgstr "Norsk - bokmål"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Customized GOsa² configuration to better suit the Debian Edu network "
+"architecture."
+msgstr ""
+"Tilpasset GOsa²-konfiguration for bedre tilpasning til Debian Edu-"
+"netværksarkitekturen."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nb_NO.UTF-8"
-msgstr "nb_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"GOsa² updates DNS and NFS exports immediately when a system is updated in "
+"LDAP, making diskless workstations work right after they are added to the "
+"required netgroup."
+msgstr ""
+"GOsa² opdaterer DNS- og NFS-eksport øjeblikkeligt når et system er opdateret "
+"i LDAP, hvilket gør at diskløse arbejdsstationer virker lige efter, at de "
+"tilføjes til den krævede netgruppe."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no"
-msgstr "no"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
+"objects using information gathered by sitesummary, to make it easier to add "
+"new computers to the network."
+msgstr ""
+"Tilbyd skript sitesummary2ldapdhcp for at opdatere eller befolke GOsa² med "
+"systemobjekter der bruger information samlet af sitesummary, for at gøre det "
+"nemmere at tilføje nye computere til netværket."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Nynorsk"
-msgstr "Norsk - nynorsk"
+#. type: Content of: <article><section><section><section><title>
+msgid "More software changes"
+msgstr "Yderligere programændringer"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nn_NO.UTF-8"
-msgstr "nn_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+msgstr ""
+"Tilføj videoredigeringsprogrammet Kdenlive 0.7.7 og Interactive geometry "
+"tool 3.2.42"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "German"
-msgstr "Tysk"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change default package manager from adept to synaptic, to avoid getting two "
+"graphical package managers installed by default."
+msgstr ""
+"Ændr standardpakkehåndtering fra adept til synaptic, for at undgå at to "
+"grafiske pakkehåndteringer er installeret som standard."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de_DE.UTF-8"
-msgstr "de_DE.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
+"KDE."
+msgstr ""
+"Installer openoffice.org-kde som standard sikrer at OOo bruger KDE-"
+"fildialoger i KDE."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de"
-msgstr "de"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change video player setup to install different players in KDE "
+"(dragonplayer), Gnome (totem) and LXDE (totem)."
+msgstr ""
+"Ændr videoafspilleropsætning for at installere andre afspillere i KDE "
+"(dragonplayer), GNOME (totem) og LXDE (totem)."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "French (France)"
-msgstr "Fransk (Frankrig)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
+"default KDE installation."
+msgstr ""
+"Tilføj KDE-værktøjerne freespacenotifier, kinfocenter, update-notifier-kde "
+"til standardinstallationen for KDE."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr_FR.UTF-8"
-msgstr "fr_FR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace network-manager-kde with plasma-widget-networkmanagement in the "
+"standalone KDE profile"
+msgstr ""
+"Erstat network-manager-kde med plasma-widget-networkmanagement i den "
+"uafhængige KDE-profil"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr"
-msgstr "fr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+msgstr ""
+"Installer usb-modeswitch på bærbare for at håndtere USB-enheder i "
+"dualtilstand."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Greek (Greece)"
-msgstr "Græsk (Grækenland)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add cifs-utils to the default installation to ensure SMB mounting can work "
+"in any profile."
+msgstr ""
+"Tilføj cifs-utils til standardinstallationen for at sikre at SMB-montering "
+"virker i alle profiler."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el_GR.UTF-8"
-msgstr "el_GR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
+"and valgrind from the default installation and the DVD to make room for "
+"higher priority packages."
+msgstr ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma "
+"og valgrind fra standardinstallationen og dvd'en for at give plads til "
+"pakker med højere prioritet."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el"
-msgstr "el"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
+"authoritive source of host names."
+msgstr ""
+"Drop libnss-mdns fra stationære profiler, for at sikre at DNS er den "
+"autoritære kilde for værtsnavne."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Japanese"
-msgstr "Japansk"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
+"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
+"installed instead.)"
+msgstr ""
+"<computeroutput>freerdp-x11</computeroutput> installeres som standard som "
+"RDP- og VNC-klient. (Tidligere blev <computeroutput>rdesktop</"
+"computeroutput> installeret i stedet for)."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "ja_JP.UTF-8"
-msgstr "ja_JP.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make the LDAP server handle more clients after increasing the server's file "
+"descriptor limit from 1024 to 32768."
+msgstr ""
+"LDAP-serveren kan nu håndtere flere klienter efter øgning af serverens "
+"filbeskrivelsesbegrænsning fra 1024 til 32768."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "jp"
-msgstr "jp"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
+msgstr ""
+"Tilføj kode til at genaktivere stoppede CUPS-køer hver time på "
+"hovedserveren, og tøm alle CUPS-køer hver nat. Begge kan deaktivers i LDAP."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Northern Sami (Norway)"
-msgstr "Nordligt samisk (Norge)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide network blocking / exam mode by default, controlled by LDAP. In "
+"addition to network blocking, changes to the Squid proxy configuration is "
+"needed."
+msgstr ""
+"Tilbyd netværksblokering / undersøgelsestilstand som standard, kontrolleret "
+"af LDAP. Udover netværksblokering er ændringer til proxykonfigurationen for "
+"Squid krævet."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "se_NO"
-msgstr "se_NO"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable automatic extending of full file systems on the Main Server by "
+"default. This can be disabled in LDAP."
+msgstr ""
+"Aktiver automatisk udvidelse af hele filsystemer på hovedserveren som "
+"standard. Dette kan deaktivers i LDAP."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no(smi)"
-msgstr "no(smi)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change SSL certificate name used by the LDAP server and adjust clients to "
+"use the new name to be able to enable certificate checking on clients."
+msgstr ""
+"Ændr SSL-certifikatnavn brugt af LDAP-serveren og juster klienter til at "
+"bruge det nye navn for at kunne aktivere certifikatkontrol på klienter."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
-"the live images. Not all locales have translations installed, though.  The "
-"keyboard layout names can be found in /usr/share/keymaps/i386/."
+"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
+"setup used for DNS."
 msgstr ""
-"En fuldstændig liste over sprogkoder er tilgængelig på <computeroutput>/usr/"
-"share/i18n/SUPPORTED</computeroutput>, men kun kodningen UTF-8 er "
-"understøttet af liveaftryk. Ikke alle sprog har dog oversættelser "
-"installeret. Tastaturlayoutnavne kan findes i /usr/share/keymaps/i386/."
+"Skift PowerDNS til at bruge streng LDAP-tilstand, for at lade os forenkle "
+"LDAP-opsætningen brugt for DNS."
 
-#. type: Content of: <article><section><section><title>
-msgid "Stuff to know"
-msgstr "Lidt information"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Simplify autofs LDAP rules to make sure they work with extra home directory "
+"partitions exported from the main-server without any changes."
+msgstr ""
+"Forenkl autofs LDAP-regler for at sikre at de virker med ekstra "
+"hjemmemappepartitioner eksportert fra hovedserveren uden nogen ændringer."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The password for the user is \"user\"; root has no passwd set."
-msgstr "Adgangskoden for brugeren er »user«; root har ikke en adgangskode."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
+msgstr ""
+"Gør sikkerhedssystemer mere robust i håndteringen af LDAP-databasedump og "
+"genstart."
 
-#. type: Content of: <article><section><section><title>
-msgid "Known issues with the image"
-msgstr "Kendte problemstillinger med aftrykket"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
+msgstr ""
+"Root-logind nægtes for både KDM og GDM - se ovenfor og <ulink url=\"http://"
+"wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#\">Sådan "
+"kommer du i gang</ulink> for detaljer."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "There are no squeeze images yet"
-msgstr "Der er endnu ikke nogle squeeze-aftryk"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Clients set up to shut down at night will stay up for at least an hour if "
+"they are turned on manually between 16:00 and 07:00."
+msgstr ""
+"Klienter opsat til at lukke ned om natten vil nu blive oppe i mindst en "
+"time, hvis de tændes manuelt mellem 16:00 og 07:00."
 
-#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/sad.png"
-msgstr "./images/sad.png"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Additionally use local NTP clock on the main-server to ensure clients and "
+"server sync clocks also when disconnected from the Internet."
+msgstr ""
+"Brug derudover lokal NTP-ur på hovedserveren for at sikre klient- og "
+"serversynkronisering af ure også når der ikke er forbindelse til internettet."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-msgid ":("
-msgstr ":("
+# engelsk fejl When
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Access to Debian repositories is always done via a proxy on the main server "
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+msgstr ""
+"Adgang til Debianarkiver udføres altid via en proxy på hovedserveren - læs "
+"mere om implementeringsdetaljerne <ulink url=\"http://lists.debian."
+"org/20100704221022.GC30542 at login1.uio.no\">når der bruges DHCP og WPAD</"
+"ulink>"
 
-#. type: Content of: <article><section><section><title>
-msgid "Download"
-msgstr "Hent"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "The home0 partition is mounted nosuid, to increase security."
+msgstr "Partitionen home0 monteres nosuid, for at øge sikkerheden."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
+"from 144 to 24 MiB."
 msgstr ""
-"Aftrykket er 1,2 GiB og vil være (men er aktuelt ikke) tilgængelig via "
-"<ulink url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink "
-"url=\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> eller rsync "
-"from <computeroutput>ftp.skolelinux.org</computeroutput> under "
-"<computeroutput>cd-squeeze-live/</computeroutput>."
+"Ændring af KDE/Akonadi-konfiguration for at reducere diskaftrykket for hver "
+"bruger fra 144 til 24 MiB."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix C - Features in older releases"
-msgstr "Appendiks C - Funktioner i ældre udgivelser"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New tool notify-local-users to send desktop notification to all logged in "
+"users on a machine.  Useful for thin client servers."
+msgstr ""
+"Nyt værktøj notify-local-users til at sende skrivebordspåmindelser til alle "
+"brugere (der er logget på) på en maskine. Brugbart for servere for tynde "
+"klienter."
 
 #. type: Content of: <article><section><section><title>
 msgid "New in Debian Edu 5.0.6+edu1 Codename \"Lenny\" released 2010-10-05"
@@ -10997,6 +10862,241 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "[attachment:welcome_to_tjener.png]"
+#~ msgstr "[attachment:welcome_to_tjener.png]"
+
+#~ msgid "Debian Edu login"
+#~ msgstr "Logind for Debian Edu"
+
+#~ msgid "Installer boot menu"
+#~ msgstr "Opstartsmenu for installationsprogrammet"
+
+#~ msgid "Installer advanced options screen 1"
+#~ msgstr "Installationsprogrammets avancerede indstillingsskærm 1"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Installationsprogrammets avancerede indstillingsskærm 2"
+
+#~ msgid "Installer help screen"
+#~ msgstr "Installationsprogrammets hjælpeskærm"
+
+#~ msgid "A note on some RAID controllers"
+#~ msgstr "En bemærkning om nogle RAID-controllere"
+
+# engelsk fejl
+#~ msgid ""
+#~ "When using a USB drive to add missing firmware during install, with some "
+#~ "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
+#~ "installation results in a GRUB error. A workaround for this problem is to "
+#~ "remove the USB drive after the firmware is loaded, and preferably before "
+#~ "partitioning starts."
+#~ msgstr ""
+#~ "Når der bruges et USB-drev til at tilføje manglende firmware under "
+#~ "installationen, så bliver nogle RAID-controlleres GRUB installeret på USB-"
+#~ "drevet. Så en genstart efter installationen medfører en GRUB-fejl. En "
+#~ "måde at omgå dette problem er at fjerne USB-drevet efter at firmwaren er "
+#~ "indlæst, og helst før partitioneringen begynder."
+
+#~ msgid ""
+#~ "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#~ "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#~ "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+#~ msgstr ""
+#~ "Yderligere information er tilgængelig i <ulink url=\"http://bugs."
+#~ "skolelinux.org/show_bug.cgi?id=1395\">Debian-Edu-fejlen #1395</ulink> og "
+#~ "Debianfejlen <ulink url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+
+#~ msgid "pxe-tjener.png"
+#~ msgstr "pxe-tjener.png"
+
+#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#~ msgid "02-select_a_language.png"
+#~ msgstr "02-select_a_language.png"
+
+#~ msgid "03-select_your_location.png"
+#~ msgstr "03-select_your_location.png"
+
+#~ msgid "04-Configure_the_keyboard.png"
+#~ msgstr "04-Configure_the_keyboard.png"
+
+#~ msgid "05-Detect_and_mount_CD-ROM.png"
+#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#~ msgid "06-Load_installer_components_from_CD.png"
+#~ msgstr "06-Load_installer_components_from_CD.png"
+
+#~ msgid "07-Detect_network_hardware.png"
+#~ msgstr "07-Detect_network_hardware.png"
+
+#~ msgid "08-Choose_Debian_Edu_profile.png"
+#~ msgstr "08-Choose_Debian_Edu_profile.png"
+
+#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+
+#~ msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#~ msgid "12-Set_up_users_and_passwords.png"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#~ msgid "12a-Set_up_users_and_passwords.png"
+#~ msgstr "12a-Set_up_users_and_passwords.png"
+
+#~ msgid "12b-Set_up_users_and_passwords.png"
+#~ msgstr "12b-Set_up_users_and_passwords.png"
+
+#~ msgid "12c-Set_up_users_and_passwords.png"
+#~ msgstr "12c-Set_up_users_and_passwords.png"
+
+#~ msgid "13-Install the base system.png"
+#~ msgstr "13-Install the base system.png"
+
+#~ msgid "14-Select_and_install_software.png"
+#~ msgstr "14-Select_and_install_software.png"
+
+#~ msgid "17-Select_and_install_software.png"
+#~ msgstr "17-Select_and_install_software.png"
+
+#~ msgid "18-Build LTSP chroot.png"
+#~ msgstr "18-Build LTSP chroot.png"
+
+#~ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#~ msgid "20-Finish_the_Installation.png"
+#~ msgstr "20-Finish_the_Installation.png"
+
+#~ msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#~ msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#~ msgid "23-Tjener-KDM_Login.png"
+#~ msgstr "23-Tjener-KDM_Login.png"
+
+#~ msgid "24-Tjener-KDE_Start.png"
+#~ msgstr "24-Tjener-KDE_Start.png"
+
+#~ msgid "26-Tjener-KDE_Desktop_Browser.png"
+#~ msgstr "26-Tjener-KDE_Desktop_Browser.png"
+
+#~ msgid "27-Tjener-KDE_Desktop.png"
+#~ msgstr "27-Tjener-KDE_Desktop.png"
+
+#~ msgid "29-Diskless-WS-KDM_Login.png"
+#~ msgstr "29-Diskless-WS-KDM_Login.png"
+
+#~ msgid "30-ThinClient-LDM_Login.png"
+#~ msgstr "30-ThinClient-LDM_Login.png"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#~ msgid "Debian Edu desktop"
+#~ msgstr "Debian Edu-skrivebord"
+
+#~ msgid "GOsa² overview page after login as the first user"
+#~ msgstr "GOsa²-overbliksside efter logind som den første bruger"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
+#~ "to install the main server, all user passwords exept that one for the "
+#~ "first user will expire in only 2 days.  To fix this, please execute the "
+#~ "following script in a terminal.  This script is included in r1."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Bemærk venligst:</emphasis> Hvis Wheezy/r0 blev "
+#~ "brugt til at installere hovedserveren, så vil alle brugeradgangskoder med "
+#~ "undtagelse af koden for den første bruger udløbe efter 2 dage. For at "
+#~ "rette dette, så kør det følgende skript i en terminal. Dette skript er "
+#~ "inkluderet i r1."
+
+#~ msgid ""
+#~ "#!/bin/bash\n"
+#~ "  #\n"
+#~ "  # /usr/share/debian-edu-config/tools/password-fix-wheezy-r0\n"
+#~ "  #\n"
+#~ "  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
+#~ "  # in Debian Edu Wheezy up to r0; for new users the password will\n"
+#~ "  # never expire. For existing users this will be the case after they've\n"
+#~ "  # changed their password. Give old users the chance to change the\n"
+#~ "  # password, exclude not affected accounts: templates and first user.\n"
+#~ "  #\n"
+#~ "  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|"
+#~ "newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
+#~ "    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
+#~ "  done\n"
+#~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
+#~ msgstr ""
+#~ "#!/bin/bash\n"
+#~ "  #\n"
+#~ "  # /usr/share/debian-edu-config/tools/password-fix-wheezy-r0\n"
+#~ "  #\n"
+#~ "  # Ret adgangskodeudløb efter 2 dage (#664596) der ukorrekt blev\n"
+#~ "  # introduceret i Debian Edu Wheezy opt til r0; for nye brugere\n"
+#~ "  # vil adgangskoden aldrig udløbe. For eksisterende brugere vil\n"
+#~ "  # dette være tilfældet efter at de har ændret deres adgangskode.\n"
+#~ "  # Giv ældre brugere mulighed for at ændre deres adgangskode, \n"
+#~ "  # ekskluder kontoer der ikke er påvirket: skabeloner og \n"
+#~ "  # førstegangsbrugere.\n"
+#~ "  #\n"
+#~ "  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|"
+#~ "newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
+#~ "    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
+#~ "  done\n"
+#~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
+
+#~ msgid "Filterbox"
+#~ msgstr "Filterbox"
+
+#~ msgid "Editing user data"
+#~ msgstr "Redigering af brugerdata"
+
+#~ msgid "Set user password"
+#~ msgstr "Angiv brugeradgangskode"
+
+#~ msgid "create group"
+#~ msgstr "opret gruppe"
+
+#~ msgid "GOsa² systems listing"
+#~ msgstr "Visning af GOsa²-systemer"
+
+#~ msgid "Host details"
+#~ msgstr "Værtsdetaljer"
+
+#~ msgid "Modify host"
+#~ msgstr "Ændr vært"
+
+#~ msgid "Add netgroup"
+#~ msgstr "Tilføj netgruppe"
+
+#~ msgid "slbackup-php Maintenance"
+#~ msgstr "Vedligeholdelse for slbackup-php"
+
+#~ msgid ""
+#~ "The Debian Edu Wheezy Manual has generally been cleaned up and improved. "
+#~ "A proof-read with corrections was done by a native English linguist."
+#~ msgstr ""
+#~ "Manualen for Debian Edu Wheezy er generelt blevet forbedret. En "
+#~ "gennemlæsning med følgende korrektioner er blevet udført af en indfødt "
+#~ "engelsk lingvistik."
+
+#~ msgid ""
+#~ "gosa (2.6.11-3+wheezy1~edu+1) from the upcoming 6.0.5 Debian point "
+#~ "release, with:"
+#~ msgstr ""
+#~ "gosa (2.6.11-3+wheezy1~edu+1) fra den kommende 6.0.5 Debian "
+#~ "punktudgivelse, med:"
+
 #~ msgid ""
 #~ "Create a user with membership in the \"admins\" group (if not already "
 #~ "existing)"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
similarity index 92%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 19d700b..fbefd6c 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -1,8 +1,8 @@
-# translation of debian-edu-squeeze-manual.pot to german
+# translation of debian-edu-wheezy-manual.pot to german
 # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Holger Levsen and others
-# Source URL: http://wiki.debian.org/DebianEdu/Documentation/Squeeze/
+# Source URL: http://wiki.debian.org/DebianEdu/Documentation/Wheezy/
 #
-# 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.
@@ -14,53 +14,51 @@
 # Kai J. G. Hatje <hatjeki at studi.informatik.uni-stuttgart.de>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: debian-edu-squeeze-manual.de\n"
+"Project-Id-Version: debian-edu-wheezy-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-13 21:11-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-14 14:40-0400\n"
+"PO-Revision-Date: 2013-02-14 22:30+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 Wheezy 7.0.0+r0 Manual"
+msgstr "Handbuch für Debian Edu / Skolelinux Wheezy 7.0.0+r0"
 
 #. 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 7.0.0+r0 Codename \"Wheezy\""
+msgstr "Handbuch für Debian Edu 7.0.0+r0, Codename »Wheezy«"
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr "./images/welcome_to_tjener.png"
-
-#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu login"
-msgstr "Debian-Edu-Anmeldung"
+#. type: Content of: <article><section><para>
+msgid ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
+msgstr ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
 
 #. 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 Wheezy 7.0.0+r0 release."
+msgstr "Dies ist das Handbuch für das Release Debian Edu Wheezy 7.0.0+r0."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> is a wiki and updated frequently."
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
 "Die [englischsprachige] Originalversion auf <ulink url=\"http://wiki.debian."
-"org/DebianEdu/Documentation/Squeeze\"/> ist eine Wikiseite, die regelmäßig "
+"org/DebianEdu/Documentation/Wheezy\"/> ist eine Wikiseite, die regelmäßig "
 "aktualisiert wird."
 
 #. type: Content of: <article><section><para>
@@ -195,8 +193,8 @@ msgid "Network"
 msgstr "Netzwerk"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Debian_Edu_Network_Squeeze.png"
-msgstr "./images/Debian_Edu_Network_Squeeze.png"
+msgid "./images/Debian_Edu_Network_Wheezy.png"
+msgstr "./images/Debian_Edu_Network_Wheezy.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
@@ -1355,12 +1353,12 @@ msgstr "Hinweise auf weitere Informationsquellen"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-"Debian Squeeze</ulink> before you start installing a system for production "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
-"Es wird empfohlen, die <ulink url=\"http://www.debian.org/releases/squeeze/"
-"releasenotes\">Release-Bemerkungen für Debian »Squeeze«</ulink> vor einer "
+"Es wird empfohlen, die <ulink url=\"http://www.debian.org/releases/wheezy/"
+"releasenotes\">Release-Bemerkungen für Debian »Wheezy«</ulink> vor einer "
 "Installation zu lesen - oder zumindest einen Blick hineinzuwerfen, bevor Sie "
 "ein Produktivsystem installieren. Probieren Sie Debian Edu / Skolelinux aus, "
 "es sollte einfach funktionieren."
@@ -1389,20 +1387,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Even more information about the Debian Squeeze release is available in its "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Even more information about the Debian Wheezy release is available in its "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"Weitere Information zum Debian-Squeeze-Release sind im <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">Debian-"
-"Installationshandbuch</ulink> zu finden."
+"Weitere Information zum Debian-Wheezy-Release sind im <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">Debian-Installationshandbuch</"
+"ulink> zu finden."
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
-"Herunterladen des Installationsmediums für Debian Edu 6.0.6+r1, Codename "
-"»Squeeze«"
+"Herunterladen des Installationsmediums für Debian Edu 7.0.0+r0, Codename "
+"»Wheezy«"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "DVD for i386, amd64"
@@ -1418,29 +1416,37 @@ msgstr ""
 "GiB groß. Es kann folgendermaßen mittels FTP, HTTP oder rsync "
 "heruntergeladen werden:"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+msgstr ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1456,27 +1462,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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1488,27 +1494,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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -1557,13 +1563,9 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Art der Installation auswählen"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
-msgstr "Bootmenü des Installationsprograms"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:01-Installer_boot_menu.png]"
+msgstr "[attachment:01-Installer_boot_menu.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1613,13 +1615,9 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> bietet einige Hinweise für die "
 "Benutzung des Installationsprogrammes an."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
-msgstr "./images/Installer_advanced_options_a.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
-msgstr "Seite 1 der »Advanced options«"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_a.png]"
+msgstr "[attachment:Installer_advanced_options_a.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1674,13 +1672,9 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> benötigt eine "
 "Preseed-Datei."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Seite 2 der »Advanced options«"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_b.png]"
+msgstr "[attachment:Installer_advanced_options_b.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1733,13 +1727,9 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</"
 "emphasis>benötigt  eine Preseed-Datei."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
-msgstr "./images/Installer_help.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer help screen"
-msgstr "Hilfeseite des Installationaprogramms"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_help.png]"
+msgstr "[attachment:Installer_help.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1850,12 +1840,12 @@ msgstr "Der Installationprozess"
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">system requirements</ulink> and make sure you have at "
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
 "Denken Sie an die <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Squeeze/Requirements\">Systemvoraussetzungen</ulink> und "
+"Documentation/Wheezy/Requirements\">Systemvoraussetzungen</ulink> und "
 "stellen Sie sicher, dass mindestens zwei Netzwerkkarten vorhanden sind, wenn "
 "Sie einen Thin-Client-Server einrichten wollen."
 
@@ -2097,13 +2087,13 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2129,8 +2119,8 @@ msgstr ""
 "Pakete hängt vom jeweiligen Installationsprofil ab."
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
-msgstr "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
+msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "Main server: 8 out of 115 MiB downloaded."
@@ -2164,34 +2154,6 @@ msgid "Minimal: 12 of 83 MiB downloaded."
 msgstr "Minimal: 12 von 83 MiB werden heruntergeladen"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on some RAID controllers"
-msgstr "Eine Bemerkung zu einzelnen RAID-Controllern"
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"When using a USB drive to add missing firmware during install, with some "
-"RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-"installation results in a GRUB error. A workaround for this problem is to "
-"remove the USB drive after the firmware is loaded, and preferably before "
-"partitioning starts."
-msgstr ""
-"Bei Verwendung eines USB-Laufwerks zur Installation fehlender Firmware wird "
-"bei manchen RAID-Controllern GRUB auf dem USB-Laufwerk installiert. Dies "
-"führt beim Neustart zu einer GRUB-Fehlermeldung. Um das Problem zu umgehen, "
-"entfernen Sie das USB-Laufwerk nach Installation der Firmware und "
-"vorzugsweise noch vor der Partitionierung."
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-msgstr ""
-"Mehr Information findet sich unter <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu-Fehler #1395</ulink> und Debian Bug <ulink "
-"url=\"http://bugs.debian.org/516280\">516280</ulink>."
-
-#. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
 msgstr "Bemerkung zur Installation des Profils Terminal-Server"
 
@@ -2308,13 +2270,9 @@ msgstr ""
 "So sieht das PXE-Menü mit dem <emphasis role=\"strong\">Hauptserver</"
 "emphasis> als alleinigem Profil aus:"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/pxe-tjener.png"
-msgstr "./images/pxe-tjener.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "pxe-tjener.png"
-msgstr "pxe-tjener.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:pxe-tjener.png]"
+msgstr "[attachment:pxe-tjener.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2326,13 +2284,9 @@ msgstr ""
 "emphasis>- und <emphasis role=\"strong\">Terminal-Server</emphasis>-Profil "
 "aus:"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2375,8 +2329,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 ""
@@ -2404,10 +2358,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 "Weitere Informationen sind im <ulink url=\"http://www.debian.org/releases/"
-"squeeze/installmanual\">Debian-Installationshandbuch</ulink> zu finden."
+"wheezy/installmanual\">Debian-Installationshandbuch</ulink> zu finden."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2506,241 +2460,125 @@ msgstr ""
 "Screenshots nach dem ersten Starten von tjener, dem PXE-Start eines Rechners "
 "im Netzwerk für Arbeitsplatzrechner bzw. für Thin Clients."
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/02-select_a_language.png"
-msgstr "./images/02-select_a_language.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "02-select_a_language.png"
-msgstr "02-select_a_language.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/03-select_your_location.png"
-msgstr "./images/03-select_your_location.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "03-select_your_location.png"
-msgstr "03-select_your_location.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/04-Configure_the_keyboard.png"
-msgstr "./images/04-Configure_the_keyboard.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "04-Configure_the_keyboard.png"
-msgstr "04-Configure_the_keyboard.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "05-Detect_and_mount_CD-ROM.png"
-msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "06-Load_installer_components_from_CD.png"
-msgstr "06-Load_installer_components_from_CD.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/07-Detect_network_hardware.png"
-msgstr "./images/07-Detect_network_hardware.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "07-Detect_network_hardware.png"
-msgstr "07-Detect_network_hardware.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "08-Choose_Debian_Edu_profile.png"
-msgstr "08-Choose_Debian_Edu_profile.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "11-Participate_in_the_package_usage_survey.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12a-Set_up_users_and_passwords.png"
-msgstr "12a-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12b-Set_up_users_and_passwords.png"
-msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12b-Set_up_users_and_passwords.png"
-msgstr "12b-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12c-Set_up_users_and_passwords.png"
-msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12c-Set_up_users_and_passwords.png"
-msgstr "12c-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/13-Install+the+base+system.png"
-msgstr "./images/13-Install+the+base+system.png"
+#. type: Content of: <article><section><section><para>
+msgid "FIXME: these screenshots need to be redone once we have wheezy artwork"
+msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "13-Install the base system.png"
-msgstr "13-Install the base system.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:02-select_a_language.png]"
+msgstr "[attachment:02-select_a_language.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/14-Select_and_install_software.png"
-msgstr "./images/14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:03-select_your_location.png]"
+msgstr "[attachment:03-select_your_location.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "14-Select_and_install_software.png"
-msgstr "14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:04-Configure_the_keyboard.png]"
+msgstr "[attachment:04-Configure_the_keyboard.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/17-Select_and_install_software.png"
-msgstr "./images/17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:05-Detect_and_mount_CD-ROM.png]"
+msgstr "[attachment:05-Detect_and_mount_CD-ROM.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "17-Select_and_install_software.png"
-msgstr "17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:06-Load_installer_components_from_CD.png]"
+msgstr "[attachment:06-Load_installer_components_from_CD.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/18-Build+LTSP+chroot.png"
-msgstr "./images/18-Build+LTSP+chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:07-Detect_network_hardware.png]"
+msgstr "[attachment:07-Detect_network_hardware.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "18-Build LTSP chroot.png"
-msgstr "18-Build LTSP chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
+msgstr "[attachment:08-Choose_Debian_Edu_profile.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
+msgstr "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
+msgstr "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/20-Finish_the_Installation.png"
-msgstr "./images/20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
+msgstr "[attachment:11-Participate_in_the_package_usage_survey.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "20-Finish_the_Installation.png"
-msgstr "20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12-Set_up_users_and_passwords.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12a-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12a-Set_up_users_and_passwords.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "21-Finish_the_Installation-Installation_complete.png"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12b-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12b-Set_up_users_and_passwords.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12c-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12c-Set_up_users_and_passwords.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "22-Tjener_GRUB_boot_menu.png"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:13-Install the base system.png]"
+msgstr "[attachment:13-Install the base system.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:14-Select_and_install_software.png]"
+msgstr "[attachment:14-Select_and_install_software.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:17-Select_and_install_software.png]"
+msgstr "[attachment:17-Select_and_install_software.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/24-Tjener-KDE_Start.png"
-msgstr "./images/24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:18-Build LTSP chroot.png]"
+msgstr "[attachment:18-Build LTSP chroot.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "24-Tjener-KDE_Start.png"
-msgstr "24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
+msgstr "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:20-Finish_the_Installation.png]"
+msgstr "[attachment:20-Finish_the_Installation.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "26-Tjener-KDE_Desktop_Browser.png"
-msgstr "26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
+msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr "./images/27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "27-Tjener-KDE_Desktop.png"
-msgstr "27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/29-Diskless-WS-KDM_Login.png"
-msgstr "./images/29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:24-Tjener-KDE_Start.png]"
+msgstr "[attachment:24-Tjener-KDE_Start.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "29-Diskless-WS-KDM_Login.png"
-msgstr "29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+msgstr "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/30-ThinClient-LDM_Login.png"
-msgstr "./images/30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:27-Tjener-KDE_Desktop.png]"
+msgstr "[attachment:27-Tjener-KDE_Desktop.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "30-ThinClient-LDM_Login.png"
-msgstr "30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "./images/31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:30-ThinClient-LDM_Login.png]"
+msgstr "[attachment:30-ThinClient-LDM_Login.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
+msgstr "[attachment:31-ThinClient-KDE_Desktop.png]"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2800,13 +2638,9 @@ msgstr ""
 "Im Kapitel <link linkend=\"HowTo\">HowTo</link> gibt es mehr Tipps und "
 "Tricks, sowie Antworten auf häufig gestellte Fragen."
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/getting-started-desktop.png"
-msgstr "./images/getting-started-desktop.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu desktop"
-msgstr "Debian-Edu-Arbeitsfläche"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:getting-started-desktop.png]"
+msgstr "[attachment:getting-started-desktop.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2883,10 +2717,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"If you are using a new Debian Edu Squeeze machine, the site certificate will "
+"If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
-"Falls Sie in Debian Edu Squeeze einen neu hinzugefügten Rechner verwenden, "
+"Falls Sie in Debian Edu Wheezy einen neu hinzugefügten Rechner verwenden, "
 "wird das Zertifikat der Site dem Browser bekannt sein."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -2911,13 +2745,9 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa²-Anmeldung und Übersicht"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa2_overview.png"
-msgstr "./images/gosa2_overview.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² overview page after login as the first user"
-msgstr "GOsa²-Übersichtsseite nach dem Anmelden als Erstbenutzer"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:gosa2_overview.png]"
+msgstr "[attachment:gosa2_overview.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3122,63 +2952,13 @@ msgstr ""
 "der Benutzer. Es sollte nun möglich sein, sich mit dieser Kennung an einer "
 "beliebigen Skolelinux-Maschine in Ihrem Netzwerk anzumelden."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Please note:</emphasis> If Squeeze/r0 was used to "
-"install the main server, all user passwords exept that one for the first "
-"user will expire in only 2 days.  To fix this, please execute the following "
-"script in a terminal.  This script is included in r1."
-msgstr ""
-"<emphasis role=\"strong\">Bitte beachten:</emphasis> Wenn die Installation "
-"des Hauptservers mittels Squeeze/r0 erfolgte, verlieren alle Passwörter mit "
-"Ausnahme desjenigen des Erstbenutzers nach nur zwei Tagen ihre Gültigkeit. "
-"Um dies zu reparieren, führen Sie bitte das folgende Skript in einem "
-"Terminal aus. Das Skript ist in der Version r1 enthalten."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-msgstr ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Den Verfall von Passwörtern nach 2 Tagen stoppen (#664596), irrtümlicherweise in\n"
-"  # Debian Edu Squeeze bis r0 enthalten; für neue Benutzer wird das Passwort nie \n"
-"  # verfallen. Für bereits vorhandene Kennungen wird dies nach einer Passwortänderung\n"
-"  # der Fall sein. Alte Benutzer sollten die Chance zur Passwortänderung bekommen,\n"
-"  # nicht betroffene Kennungen werden ausnommen: Templates und Erstbenutzer.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v 'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
 msgstr "Benutzer suchen, modifizieren und löschen"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/filterbox.png"
-msgstr "./images/filterbox.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Filterbox"
-msgstr "Filterbox"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:filterbox.png]"
+msgstr "[attachment:filterbox.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3221,13 +3001,9 @@ msgstr ""
 "einem Benutzer gehören, modifizieren können; dort kann auch das Passwort und "
 "die Zugehörigkeit zu Gruppen geändert werden."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/edit_user.png"
-msgstr "./images/edit_user.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Editing user data"
-msgstr "Benutzerdaten bearbeiten"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:edit_user.png]"
+msgstr "[attachment:edit_user.png]"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3280,13 +3056,9 @@ msgstr ""
 "auf der anschließend gezeigten Seite können Sie ein selbst gewähltes "
 "Passwort setzen."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/change_password_administratively.png"
-msgstr "./images/change_password_administratively.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Set user password"
-msgstr "Benutzer-Passwort setzen"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:change_password_administratively.png]"
+msgstr "[attachment:change_password_administratively.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3401,17 +3173,13 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppen mit GOsa² verwalten"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/create_group.png"
-msgstr "./images/create_group.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "create group"
-msgstr "Gruppe anlegen"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:create_group.png]"
+msgstr "[attachment:create_group.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/list_groups.png"
-msgstr "./images/list_groups.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:list_groups.png]"
+msgstr "[attachment:list_groups.png]"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3468,14 +3236,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 ""
@@ -3568,56 +3336,40 @@ msgstr ""
 #, no-wrap
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "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"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_list.png"
-msgstr "./images/gosa_systems_list.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² systems listing"
-msgstr "GOsa² systems listing"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_host_details.png"
-msgstr "./images/gosa_systems_host_details.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Host details"
-msgstr "Rechnereigenschaften"
+"enter password: █"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_edit_host.png"
-msgstr "./images/gosa_systems_edit_host.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_list.png]"
+msgstr "[attachment:gosa_systems_list.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Modify host"
-msgstr "Rechner modifizieren"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_host_details.png]"
+msgstr "[attachment:gosa_systems_host_details.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_add_netgroup.png"
-msgstr "./images/gosa_systems_add_netgroup.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_edit_host.png]"
+msgstr "[attachment:gosa_systems_edit_host.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Add netgroup"
-msgstr "»Netgroup« hinzufügen"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgstr "[attachment:gosa_systems_add_netgroup.png]"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4079,11 +3831,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 ""
@@ -4114,13 +3866,9 @@ msgstr ""
 "»Wartung« (Maintenance) im Menü auf der Backup-Seite und wählen dort den "
 "ältesten zu bewahrenden Zustand (snapshot):"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/slbackup-php_maintenance.png"
-msgstr "./images/slbackup-php_maintenance.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "slbackup-php Maintenance"
-msgstr "slbackup-php Wartung"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:slbackup-php_maintenance.png]"
+msgstr "[attachment:slbackup-php_maintenance.png]"
 
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
@@ -4227,8 +3975,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 ""
@@ -4554,15 +4302,15 @@ msgstr ""
 "einstellen (müssen)."
 
 #. type: Content of: <article><section><title>
-msgid "Upgrades from Debian Edu Lenny"
-msgstr "Upgrade von Debian Edu Lenny"
+msgid "Upgrades from Debian Edu Squeeze"
+msgstr "Upgrade von Debian Edu Squeeze"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Lenny in a test "
+"Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
-"Achtung: Stellen Sie sicher, dass Sie das Upgrade von Lenny in einer "
+"Achtung: Stellen Sie sicher, dass Sie das Upgrade von Squeeze in einer "
 "Testumgebung getestet haben oder über Sicherungskopien verfügen, die ihnen "
 "ermöglichen, notfalls wieder zurück zu gehen."
 
@@ -4573,10 +4321,10 @@ msgstr "Die grundlegende Upgrade-Operation"
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"lenny\" with \"squeeze\"."
+"occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 "Ersetzen Sie in der Datei <computeroutput>/etc/apt/sources.list</"
-"computeroutput> alle Vorkommen von »lenny« durch »squeeze«."
+"computeroutput> alle Vorkommen von »squeeze« durch »wheezy«."
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get update</computeroutput>"
@@ -4596,6 +4344,12 @@ msgstr "Der LDAP-Service muss muss neu eingerichtet werden"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+msgstr ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
 "accounts, passwords, network settings, services and machines are treated is "
 "quite different now. So LDAP has to be rebuild from scratch. There's a "
@@ -4619,10 +4373,10 @@ msgstr "Eine LTSP-Chroot-Umgebung neu erzeugen"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will automatically support both thin-clients and diskless workstations."
+"will still support both thin-clients and diskless workstations."
 msgstr ""
-"Auf LTSP-Servern sollte die LTSP-Chroot-Umgebung neu erzeugt werden. Sie "
-"wird anschließend automatisch sowohl Thin Clients wie auch Diskless "
+"Auf LTSP-Servern sollte die LTSP-Chroot-Umgebung neu erzeugt werden. Diese "
+"wird weiterhin automatisch sowohl Thin Clients wie auch Diskless "
 "Workstations unterstützen."
 
 #. type: Content of: <article><section><section><para>
@@ -4651,24 +4405,25 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 msgid ""
-"Upgrades from older Debian Edu / Skolelinux installations (before Lenny)"
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr ""
-"Aktualisierung von älteren Debian Edu / Skolelinux-Installationen (vor Lenny)"
+"Aktualisierung von älteren Debian Edu / Skolelinux-Installationen (vor "
+"Squeeze)"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"To upgrade from any older release, you will need to upgrade to the Lenny-"
+"To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian Edu Lenny</"
-"ulink> about how to upgrade to Lenny from the previous release, Etch, and "
-"the Etch manual covers the one before that!"
-msgstr ""
-"Um von älteren Veröffentlichungen zu aktualisieren, müssen Sie erst auf das "
-"auf Lenny basierende Debian Edu aktualisieren. Anschließend folgen Sie "
-"obiger Anleitung. Die Aktualisierung von Etch auf Lenny wird in <ulink url="
-"\"http://wiki.debian.org/DebianEdu/Documentation/Lenny#\">Handbuch für "
-"Debian Edu »Lenny«</ulink> beschrieben; das Etch-Handbuch beschreibt das "
+"debian.org/DebianEdu/Documentation/Squeeze#\">Manual for Debian Edu Squeeze</"
+"ulink> about how to upgrade to Squeeze from the previous release, Lenny, and "
+"the Lenny manual covers the one before that! (Etch was it's name.)"
+msgstr ""
+"Um von älteren Veröffentlichungen zu aktualisieren, müssen Sie zuerst auf "
+"das auf Squeeze basierende Debian Edu aktualisieren. Anschließend folgen Sie "
+"obiger Anleitung. Die Aktualisierung von Lenny auf Squeeze wird in <ulink "
+"url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze#\">Handbuch für "
+"Debian Edu »Squeeze«</ulink> beschrieben; das Lenny-Handbuch beschreibt das "
 "Upgrade davor."
 
 #. type: Content of: <article><section><title>
@@ -4714,7 +4469,7 @@ msgid ""
 "in this chapter have some more \"advanced\" tips and tricks."
 msgstr ""
 "Die Kapitel <link linkend=\"GettingStarted\">Erste Schritte</link> und <link "
-"linkend=\"Maintenance\">DebianEdu/Documentation/Squeeze/Maintenance</link> "
+"linkend=\"Maintenance\">DebianEdu/Documentation/Wheezy/Maintenance</link> "
 "erklären den Einstieg in den Umgang und die Wartung von Debian Edu. Die "
 "HowTos in diesem Kapitel sind Tipps und Tricks für Fortgeschrittene."
 
@@ -4791,14 +4546,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 +4569,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 +4580,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 +4592,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 +4709,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 +4749,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 +4775,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 ""
@@ -5142,11 +4897,11 @@ msgstr "Die Nutzung von backports.debian.org ist einfach:"
 #. type: CDATA
 #, 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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"apt-get update"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5167,12 +4922,12 @@ msgstr "Upgrade mit einer CD- oder einer DVD-ROM"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to upgrade from one version to another (for example from Squeeze "
-"6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical "
+"If you want to upgrade from one version to another (for example from Wheezy "
+"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
 "media, follow these steps:"
 msgstr ""
 "Falls Sie ein Upgrade von einer Version zu einer nächsten (wie z.B. von "
-"Squeeze 6.0.6 auf 6.0.7) durchführen wollen, aber keine Internetverbindung, "
+"Wheezy 7.0.0 auf 7.0.1) durchführen wollen, aber keine Internetverbindung, "
 "nur physikalische Medien haben, dann führen Sie folgende Schritte aus:"
 
 #. type: Content of: <article><section><section><para>
@@ -5186,10 +4941,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 +4980,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 +5060,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 +5081,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 +5157,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 +5172,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 +5226,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 +5258,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 +5384,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 +5407,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 +5557,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 +5592,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 +5650,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"
@@ -5916,9 +5671,9 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# Den Debian-Keyring sicher installieren:\n"
 "apt-get install debian-keyring\n"
@@ -5927,9 +5682,9 @@ msgstr ""
 "# Gesichert die Korrektheit des Keys prüfen und diesen gegebenenfalls dem APT-Keyring hinzufügen:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# 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"
+"echo \"deb http://deb-multimedia.org wheezy 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 +5794,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 +5808,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 +5893,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 +5959,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 +6006,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 +6019,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 +6040,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 +6062,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 +6135,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 +6269,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 +6293,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 +6335,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 +6453,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 +6484,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 +6499,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 +6609,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 +6637,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 +6672,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 +6744,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 +6755,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 +6778,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 +6795,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 +6804,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)"
@@ -7079,10 +6834,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr ""
 "Um einem Windows-Rechner den Zutritt zur Domäne zu erlauben, sind die im "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba-Howto</link> beschriebenen "
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba-Howto</link> beschriebenen "
 "Schritte notwendig:"
 
 #. type: Content of: <article><section><section><section><para>
@@ -7127,11 +6882,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 +7383,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"
@@ -7746,12 +7501,12 @@ msgstr "Samba in Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-"
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
 "style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
 msgstr ""
-"In Debian Edu Squeeze ist Samba (v3) so vorkonfiguriert, dass Clients mit "
+"In Debian Edu Wheezy ist Samba (v3) so vorkonfiguriert, dass Clients mit "
 "Windows XP, Windows Vista und Windows 7 den Server als NT4-Domänen-"
 "Controller benutzen können. Nach Aufnahme einer Maschine in die Domäne kann "
 "diese vollständig mit GOsa² verwaltet werden."
@@ -8285,7 +8040,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 +8049,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 +8071,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 +8084,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 +8116,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 +8127,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 +8143,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 ""
@@ -8681,13 +8436,13 @@ msgstr ""
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> and you can contribute easily. Note: a user account is needed "
-"to edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 "Die Quellen dieses Textes sind in einem Wiki gespeichert und können mit "
 "einem Webbrowser editiert werden. Um mitzuwirken, einfach auf <ulink url="
-"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/\"/> gehen; dort "
+"\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/\"/> gehen; dort "
 "können Sie Ihren Beitrag leisten. Bitte beachten: Ein Benutzerkonto ist "
 "notwendig, um Seiten bearbeiten zu können. Dieses können Sie unter <ulink "
 "url=\"http://wiki.debian.org/UserPreferences\">create a wiki user</ulink> "
@@ -8829,1913 +8584,2024 @@ msgstr ""
 ">."
 
 #. type: Content of: <article><section><title>
-msgid "New features in Debian Edu Squeeze"
-msgstr "Neuerungen in Debian Edu Squeeze"
+msgid "New features in Debian Edu Wheezy"
+msgstr "Neuerungen in Debian Edu Wheezy"
+
+#. type: Content of: <article><section><para>
+msgid ""
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
+msgstr ""
+"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 ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
-"Neuerungen in Debian Edu 6.0.6+r1, Codename »Squeeze«, *UN*released as of "
-"2013-0?-??"
+"Neuerungen in Debian Edu 7.0.0+r0, Codename »Wheezy«, freigegeben am ?.?.2012"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "sitesummary was updated from 0.1.3 to 0.1.8"
-msgstr "sitesummary wurde von 0.1.3 auf 0.1.8 aktualisiert"
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Für den Benutzer wahrnehmbare Änderungen"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Make Nagios configuration more robust and efficient"
-msgstr "Die Konfiguration von Nagios ist nun robuster und effizienter"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
+"installation, in the login screen and as desktop wallpaper."
+msgstr ""
+"Aktualisierte graphische Elemente und neues Logo für Debian Edu / "
+"Skolelinux, zu sehen während der Installation, bei der Anmeldung und als "
+"Hintergrund der Arbeitsfläche."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Comply with 3.X kernel"
-msgstr "Kompatibel mit Kernelversionen 3.X"
+#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
+#. type: Content of: <article><section><section><section><title>
+msgid "Installation changes"
+msgstr "Änderungen der Installation"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
-"debian-edu-doc wurde von  1.4~20120310~6.0.4+r0  auf 1.4~20120925~6.0.6+r0 "
-"aktualisiert"
+"Neue Version des Debian-Installationsprogramms aus Debian Wheezy, siehe "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual\">Debian-"
+"Installationshandbuch</ulink> für weitere Informationen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Minor updates from the wiki"
-msgstr "Geringfügige Aktualisierungen  "
+#. type: Content of: <article><section><section><section><title>
+msgid "Software updates"
+msgstr "Aktualisierung von Software"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Wheezy:"
+msgstr "Alles, was in Debian »Wheezy« neu ist:"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 3.2.x"
+msgstr "Linux-Kernel in der Version 3.2.x"
 
-#. 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 ""
-"Berichtigte Benutzerrichtlinie für Kerberos: Das Passwort läuft nicht mehr "
-"nach zwei Tagen ab. Bug #664596 geschlossen"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+msgstr "Graphische Arbeitsumgebungen KDE »Plasma« 4.8.4 und GNOME 3.4"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Handle '#' characters in the root or first users password. Closes: #664976"
-msgstr ""
-"Erlaubt sind nun #-Zeichen für das Passwort von Root oder Erstbenutzer. Bug "
-"#664976 geschlossen"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 10 ESR"
+msgstr "Webbrowser Iceweasel 10 ESR"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-sync:"
-msgstr "Fehlerbehebungen von gosa-sync:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LibreOffice 3.5.4"
+msgstr "LibreOffice 3.5.4"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't fail if password contains \""
-msgstr ""
-"Passwörter, die das Zeichen »\"« enthalten, verursachen keinen Fehler mehr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 12.01"
+msgstr "Lehrprogramme GCompris 12.01"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't disclose new password string in syslog"
-msgstr "Neue Passwörter erscheinen nicht mehr im Syslog"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 12.04"
+msgstr "Musikprogramm Rosegarden 12.04"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-create:"
-msgstr "Fehlerbehebungen für gosa-create:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.8.2"
+msgstr "Bildbearbeitung Gimp 2.8.2"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Invalidate libnss cache before applying changes"
-msgstr "Der Cache von libnss wird vor der Anwendung von Änderungen geleert "
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.1"
+msgstr "Virtuelles Universum Celestia 1.6.1"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Multiple failures during mass user import into GOsa²"
-msgstr ""
-"Mehrere Fehler während des massenhaften Imports von Benutzerkennungen in "
-"GOsa² behoben"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.11.3"
+msgstr "Virtueller Sternenhimmel Stellarium 0.11.3"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"gosa-netgroups plugin: don't erase entries of attribute type "
-"\"memberNisNetgroup\". Closes: #687256"
+"Debian Wheezy includes over 10,000 new packages available for installation, "
+"including the Chromium browser"
 msgstr ""
-"gosa-netgroups plugin: Einträge des Attributtyps \"memberNisNetgroup\" "
-"werden nicht mehr gelöscht. Bug #687256 geschlossen"
+"Debian Wheezy enthält mehr als 10.000 neue installierbare Pakete, "
+"eingeschlossen der Browser Chromium."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "First user now uses the same Kerberos policy as all other users"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
-"Der Erstbenutzer verwendet nun dieselbe Kerberosrichtlinie wie alle anderen "
-"Benutzer"
+"Weitere Information zu Debian Wheezy 7.0 sind in den <ulink url=\"http://www."
+"debian.org/releases/wheezy/releasenotes\">release notes</ulink> und im "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual\">Debian-"
+"Installationshandbuch</ulink> zu finden."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Add Danish web page"
-msgstr "Dänische Webseite wurde hinzugefügt"
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
+msgstr "Änderungen der Infrastruktur"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "FIXME: to be documented, if any"
+msgstr "FIXME: to be documented, if any"
 
-#. 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><section><title>
+msgid "Documentation and translation updates"
+msgstr "Aktualisierung von Dokumentation und Übersetzungen"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in FIXME languages."
 msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Aktualisierte Übersetzungen für die Einträge im Installationsprogramm. Diese "
+"liegen nun für FIXME Sprachen vor."
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
+"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
-"Neuerungen in Debian Edu 6.0.4+r0, Codename »Squeeze«, freigegeben am "
-"11.03.2012"
+"Das Benutzerhandbuch für Debian Edu »Wheezy« wurde vollständig ins Deutsche, "
+"Französische Italienische und Dänisch übersetzt. Teilweise übersetzte "
+"Versionen gibt es in Norwegisch Bokmål und in Spanisch."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Für den Benutzer wahrnehmbare Änderungen"
+msgid "Regressions"
+msgstr "Rückschritte"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr "Sonstige Änderungen mit Bezug auf LDAP"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Sonstige Änderungen"
+
+#. type: Content of: <article><section><title>
+msgid "Copyright and authors"
+msgstr "Copyright und Autoren"
+
+#. type: Content of: <article><section><para>
 msgid ""
-"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
-"installation, in the login screen and as desktop wallpaper."
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
+"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
+"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
+"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
+"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
+"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
+"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
+"GPL2 or any later version. Enjoy!"
 msgstr ""
-"Aktualisierte graphische Elemente und neues Logo für Debian Edu / "
-"Skolelinux, zu sehen während der Installation, bei der Anmeldung und als "
-"Hintergrund der Arbeitsfläche."
+"Dieses Dokument wurde u. a. von folgenden Personen verfasst: Holger Levsen "
+"(2007, 2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, "
+"2003, 2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick "
+"Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
+"(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel "
+"Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim "
+"Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), "
+"Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, "
+"2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), "
+"David Prévot (2012), Wolfgang Schweer (2012) und Bernhard Hammes (2012). Es "
+"ist unter der GPL2 oder einer späteren Version lizenziert. Viel Freude!"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <link linkend=\"GettingStarted\">Getting started chapter</link> of the "
-"manual for more information on GOsa²."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the GPL2 or later version."
 msgstr ""
-"Ersetzen von LWAT durch GOsa² als Verwaltungswerkzeug für LDAP. Für "
-"weitergehende Informationen zu GOsa²: siehe unten sowie das Handbuchkapitel "
-"<link linkend=\"GettingStarted\">Erste Schritte</link>."
+"Wenn Sie Inhalte hinzufügen wollen: <emphasis role=\"strong\">Bitte nur, "
+"wenn Sie auch dessen Autor sind und beabsichtigen, es unter den gleichen "
+"Bedingungen zu lizensieren!</emphasis> Dann fügen Sie hier Ihren Namen hinzu "
+"und lizensieren Sie die Inhalte unter der GPL2 oder einer späteren Version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "See below for a list of updated software."
-msgstr "Liste aktualisierter Software siehe unten."
+#. type: Content of: <article><section><title>
+msgid "Translation copyright and authors"
+msgstr "Autoren und Copyright der Übersetzungen"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Show welcome page to users when they first log in. This default start page "
-"for Iceweasel is fetched from LDAP at installation and boot time for "
-"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
-"Standalone installations."
+"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Zeigen einer Begrüßungsseite beim ersten Anmelden eines Benutzers. Diese "
-"voreingestellte Startseite von Iceweasel wird bei Netzwerkprofilen während "
-"Installation und Rechnerstart aus LDAP geholt. Für das Profil "
-"»Einzelplatzrechner« wird <ulink url=\"http://www.skolelinux.org/\"/> "
-"angezeigt."
+"Das Copyright der spanischen Übersetzung liegt bei José L. Redrejo Rodríguez "
+"(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
+"2012). Sie wurde unter der GPL 2 oder einer späteren Version lizensiert."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
-"installation method."
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
+"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
+"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
 msgstr ""
-"Neue Option für die graphische Arbeitsumgebung LXDE, zusätzlich zu KDE "
-"(Voreinstellung) und Gnome. Wie für Gnome steht auch die Option LXDE "
-"ausschließlich für die Installtion per CD zur Verfügung. "
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Speed up LTSP client boot."
-msgstr "Schnelleres Starten von LTSP-Clients."
+"Das Copyright der norwegischen Bokmål-Übersetzung liegt bei Petter "
+"Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-"
+"Anders Andreassen (2010) and Jan Roar Rød (2010). Sie ist unter der GPL2 "
+"oder einer späteren Version lizenziert."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Provide a KDE menu entry for changing the password in GOsa²."
+#. type: Content of: <article><section><para>
+msgid ""
+"The German translation is copyrighted by Holger Levsen (2007), Patrick "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
+"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
+"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
+"and is released under the GPL2 or any later version."
 msgstr ""
-"Bereitstellen eines KDE-Menüeintrags zum Ändern des Passworts mittels GOsa²."
+"Die deutsche Übersetzung wurde erstellt und ist Copyright von Holger Levsen "
+"(2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
+"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2011), Ludger Sicking "
+"(2008), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
+"Philipp Hübner (2009), Andreas Mundt (2009, 2010) und Wolfgang Schweer "
+"(2012, 2013). Sie ist unter der GPL2 oder einer späteren Version lizenziert."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"For more information on how to change passwords (including expired passwords "
-"at the KDM/GDM login prompt), please see the <link linkend=\"Users\">HowTos "
-"for users</link> chapter of the manual."
+"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
-"Weitere Informationen zum Ändern von Passwörtern (eingeschlossen abgelaufene "
-"Passwörter bei der Anmeldung mittels KDM/GDM): Siehe <link linkend=\"Users"
-"\">HowTos for users</link> chapter of the manual."
+"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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
-"shown to new users."
+"The French translation is copyrighted by Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
+"2010, 2012) and is released under the GPL2 or any later version."
 msgstr ""
-"Hinzufügen eines Verweises auf <ulink url=\"http://linuxsignpost.org/\"/> "
-"auf der neuen Benutzern angezeigten Startseite."
+"Die französische Übersetzung wurde von Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012) und dem französischen l10n-Team (2009, 2010) verfasst "
+"und ist unter der GPL2 oder später lizenziert."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"All LTSP servers are also <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP servers</link> by default."
+"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+"(2009) and is released under the GPL2 or any later version."
 msgstr ""
-"Alle LTSP-Server sind per Voreinstellung auch <link linkend="
-"\"NetworkClients--Remote_Desktop_Service\">RDP-Server</link>."
+"Die Chinesische Übersetzung wurde verfasst von Andrew Lee (李健秋) (2009) "
+"und ist unter der GPL2 oder später lizenziert."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Improve handing of removable media on thin clients. Show desktop "
-"notification longer when inserting new media and provide an option to start "
-"dolphin when such media is inserted."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Verbesserter Umgang mit Wechseldatenträgern für Thin Clients. Die "
-"Benachrichtigung auf dem Bildschirm erfolgt nun für einen längeren Zeitraum, "
-"wenn ein neues Gerät angeschlossen oder ein neues Medium eingelegt wurde. Es "
-"gibt nun eine Option, den Dateimanager Dolphin in diesen Fällen zu starten."
+"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><section><section><title>
-msgid "Installation changes"
-msgstr "Änderungen der Installation"
+#. type: Content of: <article><section><title>
+msgid "Translations of this document"
+msgstr "Übersetzungen dieses Dokuments"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
-"for more details."
+"Versions of this document fully translated into German, Italian, French and "
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">take a look here</ulink> for your own language."
 msgstr ""
-"Neue Version des Debian-Installationsprogramms aus Debian Squeeze, siehe "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual\">Debian-"
-"Installationshandbuch</ulink> für weitere Informationen."
+"Vollständige Übersetzungen dieses Dokuments ins Deutsche, Italienische, "
+"Französische und Dänische sind vorhanden. Es gibt unvollständige "
+"Übersetzungen in das norwegische Bokmål und ins Spanische; schauen Sie sich "
+"die Version in Ihrer Sprache <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">hier</ulink> an."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><title>
+msgid "HowTo translate this document"
+msgstr "Anleitung zum Übersetzen dieses Dokuments"
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
-"is set up during installation of the Main Server. This user is up as GOsa² "
-"administrator and is also granted sudo access. The Debian Edu menu "
-"reordering has been enabled as well, by adding the user also to the "
-"<computeroutput>teachers</computeroutput> group."
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-"
+"manual-translations</computeroutput>. The 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."
 msgstr ""
-"Da ein graphisches Anmelden für den Benutzer »root« mittels Gdm/Kdm nicht "
-"mehr zulässig ist, wird während der Installation des Hauptservers ein "
-"Benutzerkonto in LDAP angelegt und der entsprechende Benutzer als GOsa²-"
-"Administrator gesetzt. Diesem Erstbenutzer werden »sudo«-Rechte gegeben; da "
-"er der Gruppe »teachers« zugeordnet wird, gilt für ihn auch die Anpassung "
-"des Debian-Edu-Menüs."
+"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-"
+"wheezy-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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"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."
 msgstr ""
-"Die <computeroutput>ISO</computeroutput>-Images können mittels "
-"<computeroutput>dd</computeroutput> (oder sogar <computeroutput>cat</"
-"computeroutput>) direkt auf USB-Sticks kopiert werden."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New roaming workstation profile for laptops."
-msgstr "Neues Profil »Mobiler Arbeitsplatzrechner« für Laptops"
+"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 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Device access for all users is handled by <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-"needed to get access to devices."
+"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):"
 msgstr ""
-"Gerätezugriff für alle Benutzer wird von <ulink url=\"http://wiki.debian.org/"
-"PolicyKit#\">PolicyKit</ulink> geregelt; für den Zugriff auf Geräte ist "
-"keine zusätzliche Zugehörigkeit zu Gruppen mehr notwendig."
+"Um die <computeroutput>debian-edu-doc</computeroutput> Quellen anonym "
+"auszuchecken, können Sie den folgenden Befehl benutzen (dazu muss das Paket "
+"<computeroutput>git</computeroutput> installiert sein):"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"A warning will be issued when installing on too small disks for the selected "
-"profile."
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"Es wird eine Warnung ausgegeben, wenn die Festplatte(n) für das ausgesuchte "
-"Profil zu klein sind."
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/ "
-"but no seperate /usr anymore."
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
+"<computeroutput>lokalize</computeroutput>."
 msgstr ""
-"Vereinfachte Partitionierung für das Profil »Einzelplatzrechner«, um eine "
-"separate Partion für /home, aber keine mehr für /usr anzulegen."
+"Dann editieren Sie <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> ($CC mit Ihrem Sprachenkürzel "
+"ersetzen). Es stehen viele Werkzeuge für das Übersetzen zur Verfügung; "
+"empfohlen wird <computeroutput>lokalize</computeroutput>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More tests in the test suite, and correct some of the tests that failed "
-"earlier."
+"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 ""
-"Es gibt mehr Tests in der Testsuite und Korrekturen für einige Test, die "
-"früher fehlschlugen."
+"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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make sure to report an error and abort the installation when trying to use "
-"the netinst images without a working Internet connection, instead of "
-"silently installing a broken system."
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
-"Statt ohne Rückmeldung ein fehlerhaftes System zu installieren, wird nun "
-"sichergestellt, dass eine Fehlermeldung erscheint und die Installation "
-"abgebrochen wird, wenn die Installation mittels Netinst-Image ohne "
-"Internetverbindung erfolgt."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Software updates"
-msgstr "Aktualisierung von Software"
+"Um Ihre lokale Kopie des Repository zu aktualisieren, verwenden Sie bitte "
+"den folgenden Befehl in Ihrem Verzeichnis <computeroutput>debian-edu-doc</"
+"computeroutput>:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Squeeze:"
-msgstr "Alles, was in Debian »Squeeze« neu ist:"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"compatibility with the FHS v2.3 and software developed for version 3.2 of "
-"the LSB."
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
 msgstr ""
-"Kompatibilität mit FHS v2.3 und Software, die für Version 3.2 des LSB "
-"entwickelt wurde."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Linux kernel 2.6.32"
-msgstr "Linux-Kernel in der Version 2.6.32"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
-msgstr "Graphische Arbeitsumgebungen KDE »Plasma« 4.4 und GNOME 2.30"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 3.5"
-msgstr "Webbrowser Iceweasel 3.5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "OpenOffice.org 3.2.1"
-msgstr "OpenOffice.org 3.2.1"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 9.3"
-msgstr "Lehrprogramme GCompris 9.3"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Music creator Rosegarden 10.04.2"
-msgstr "Musikprogramm Rosegarden 10.04.2"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Image editor Gimp 2.6.10"
-msgstr "Bildbearbeitung Gimp 2.6.10"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual universe Celestia 1.6.0"
-msgstr "Virtuelles Universum Celestia 1.6.0"
+"Lesen Sie /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
+"Übersetzungen aktualisieren wollen."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual stargazer Stellarium 0.10.4"
-msgstr "Virtueller Sternenhimmel Stellarium 0.10.4"
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
+msgstr ""
+"Bitte beachten Sie, dass sich dieses Handbuch noch in der Entwicklung "
+"befindet; übersetzen Sie daher keine Zeilen, die den Vermerk »FIXME« "
+"aufweisen."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation, "
-"including the browser Chromium"
+"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 ""
-"Debian Squeeze enthält mehr als 10.000 neue installierbare Pakete, "
-"eingeschlossen der Browser Chromium."
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
+"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 ""
-"Weitere Information zu Debian Squeeze 6.0 sind in den <ulink url=\"http://"
-"www.debian.org/releases/squeeze/releasenotes\">release notes</ulink> und im "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual\">Debian-"
-"Installationshandbuch</ulink> zu finden."
+"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><section><title>
-msgid "Infrastructural changes"
-msgstr "Änderungen der Infrastruktur"
+#. type: Content of: <article><section><section><para>
+msgid "Please report any problems."
+msgstr "Bitte melden Sie Fehler."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
+msgid "Appendix A - The GNU General Public License"
+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."
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
-"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
-"Das Netzwerk 10.0.0.0/8 wird nun statt 10.0.2.0/23 genutzt; das »default "
-"gateway« hat die IP-Adresse 10.0.0.1/8, nicht mehr 10.0.2.1/8 wie früher."
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > und andere; die vollstandige "
+"Liste der Copyright-Inhaber gibt es im <link linkend=\"CopyRight\">Copyright-"
+"Kapitel</link>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The dynamic DHCP range was extended on the backbone network to around 4k IP "
-"addresses, and around 200 IP addresses for the thin client network."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
-"Der dynamische DHCP-Bereich an IP-Adressen wurde im Hauptnetzwerk auf etwa "
-"4k und im Netzwerk der Thin Clients auf etwa 200 erweitert."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
-"computeroutput>"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
-"Das DHCP-Netzwerk 10.0.0.0/8 wurde von <computeroutput>barebone</"
-"computeroutput> in <computeroutput>intern</computeroutput> umbenannt."
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"There are no pre-defined host entries for client systems in DNS anymore "
-"(staticXX, ..., dhcpYY...)"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 msgstr ""
-"Es gibt für Client-Systeme keine vordefinierten Rechnernamen in DNS mehr "
-"(wie staticXX, ..., dhcpYY...)."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "MIT Kerberos5 used for user authentication, enabled for:"
-msgstr ""
-"Für die Benutzer-Authentifizierung wird MIT-Kerberos5 benutzt, und zwar für:"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "PAM"
-msgstr "PAM"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "IMAP"
-msgstr "IMAP"
+#. type: Content of: <article><section><section><title>
+msgid "GNU GENERAL PUBLIC LICENSE"
+msgstr "GNU GENERAL PUBLIC LICENSE"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "SMTP"
-msgstr "SMTP"
+#. type: Content of: <article><section><section><para>
+msgid "Version 2, June 1991"
+msgstr "Version 2, June 1991"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the <computeroutput>workstation</"
-"computeroutput> netgroup to be able to mount the home directories"
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 msgstr ""
-"NFSv4, aber ohne ohne Kerberos-Authentifizierung für Privacy bzw. "
-"Integrität. Maschinen müssen immer noch der »Netgroup« »workstations« "
-"hinzugefügt weren, um dort die Home-Verzeichnisse einhängen zu können."
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
-msgstr "Volle Unterstützung von Samba-NT4-Domänen für Windows XP/Vista/7"
+#. type: Content of: <article><section><section><title>
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A complete PXE boot environment is setup when installing from the DVD, so "
-"that further installations can be done using PXE network installs only. A "
-"new script pxe-addfirmware is provided to support more hardware models "
-"needing firmware."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
-"Während der Installation per DVD wird eine vollständige Umgebung für den "
-"Start per PXE eingerichtet; damit können alle weiteren Installationen "
-"mittels PXE über das Netz erfolgen."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Remove all hard coded settings on workstations, and configure workstations "
-"and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
-"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
-"Entfernen aller hartcodierten Einstellungen auf Arbeitsplatzrechnern; "
-"Konfiguration (mobiler) Arbeitsplatzrechner mittels DNS, DHCP und LDAP in "
-"Abhängigkeit von deren Standort. Weitergehende Informationen unter <ulink "
-"url=\"http://people.skolelinux.org/pere/blog/"
-"No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Documentation and translation updates"
-msgstr "Aktualisierung von Dokumentation und Übersetzungen"
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
-"Aktualisierte Übersetzungen für die Einträge im Installationsprogramm. Diese "
-"liegen nun für 28 Sprachen vor."
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
-"proof-read with corrections was done by a native English linguist."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 msgstr ""
-"Das Benutzerhandbuch für Debian Edu »Squeeze« wurde überarbeitet und "
-"verbessert. Es erfolgte ein Korrekturlesen mit Fehlerbeseitigung durch einen "
-"Linguisten mit Englisch als Muttersprache."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
-"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
-"Spanish."
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
-"Das Benutzerhandbuch für Debian Edu »Squeeze« wurde vollständig ins "
-"Deutsche, Französische Italienische und Dänisch (neu) übersetzt. Teilweise "
-"übersetzte Versionen gibt es in Norwegisch Bokmål und in Spanisch."
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to many language tasks, especially French and Danish."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 msgstr ""
-"Verbesserung vieler sprachbezogener Tasks, insbesondere Französisch und "
-"Dänisch. "
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to the welcome web page shown at first logins."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 msgstr ""
-"Verbesserung der Web-Begrüßungseite, die bei der ersten Anmeldung angezeigt "
-"wird."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add new Japanese, Portuguese and Catalan translations of the welcome web "
-"page."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 msgstr ""
-"Neue Übersetzungen der Begrüßungs-Webseite ins Japanische, Portugiesische "
-"und Katalanische hinzugefügt."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr "Rückschritte"
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
-"installing a KDE environemnt."
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">Installationen mittels CD unterscheiden sich von solchen mittels DVD</"
-"ulink> - die DVD ist ausschließlich für die Installation der KDE-"
-"Arbeitsumgebung geeignet."
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
-"netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 msgstr ""
-"Auf der Installations-CD (»netinst«) wurde die Unterstützung für die "
-"<computeroutput>powerpc</computeroutput>-Architektur entfernt. Es ist "
-"weiterhin möglich, Debian Edu auf <computeroutput>powerpc</computeroutput> "
-"auszuführen, die Installation ist aber weniger automatisiert."
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop gtick in the default installation, because it doesn't work on thin "
-"clients (BTS #566335)."
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
-"Entfernen von gtick aus der Standardinstallation, da es auf Thin Clients "
-"nicht funktioniert (BTS #566335)."
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "New administration tool: GOsa²"
-msgstr "Neues Verwaltungswerkzeug: GOsa²"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
-"with:"
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
-"gosa (2.6.11-3+squeeze1~edu+1) aus dem kommenden Debian-Point-Release 6.0.5, "
-"mit:"
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fix DHCP host removal. Closes: #650258"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
-"Korekte DHCP-Konfiguration nach Entfernen eines Rechnereintrags. Schließt: "
-"#650258"
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Backport user generator unicode character transliteration. Closes: #657086"
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
-"Backport für die Generierung von Kennungen bei vorhandenem Unicode. "
-"Schließt: #657086"
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Customized GOsa² configuration to better suit the Debian Edu network "
-"architecture."
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 msgstr ""
-"Angepasste Konfiguration von GOsa², um der Architektur des DEbian-Edu-"
-"Netzwerks besser zu entsprechen. "
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"GOsa² updates DNS and NFS exports immediately when a system is updated in "
-"LDAP, making diskless workstations work right after they are added to the "
-"required netgroup."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
-"GOsa² aktualisiert Exporte für DNS und NFS unmittelbar nach Aktualisierung "
-"eines Systems in LDAP; Diskless Workstations funktionieren dadurch sofort, "
-"wenn sie der benötigten »Netgroup« hinzugefügt wurden."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
-"objects using information gathered by sitesummary, to make it easier to add "
-"new computers to the network."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 msgstr ""
-"Neues Skript »sitesummary2ldapdhcp«, um für Systeme in GOsa² von Sitesummary "
-"gesammelte Informationen zu aktualisieren oder zur Verfügung zu stellen; das "
-"Hinzufügen neuer Rechner wird so erleichtert."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "More software changes"
-msgstr "Weitere Änderungen von Software"
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 msgstr ""
-"Hinzufügen der Videobearbeitung Kdenlive 0.7.7 und des interaktiven "
-"Geometrieprogramms Geogebra, Version 3.2.42"
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change default package manager from adept to synaptic, to avoid getting two "
-"graphical package managers installed by default."
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
-"Änderung des voreingestellten Paketverwaltungswerkzeugs (synaptic statt "
-"adept), um die Installation von zwei graphischen Paketverwaltungswerkzeugen "
-"zu vermeiden."
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
-"KDE."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
-"Installation von openoffice.org-kde per Voreinstellung, damit OpenOffice die "
-"KDE-Dateiauswahl verwendet, wenn es unter KDE ausgeführt wird."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
-"Änderung der Einrichtung des Videoabspielers: Installation unterschiedlicher "
-"Abspieler in KDE (dragonplayer), Gnome (totem), und LXDE (totem)."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
-"default KDE installation."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
-"Hinzufügen der KDE-Werkzeuge freespacenotifier, kinfocenter, update-notifier-"
-"kde zur Standardinstallation von KDE."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Replace network-manager-kde with plasma-widget-networkmanagement in the "
-"standalone KDE profile"
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 msgstr ""
-"Ersetzen von network-manager-kde durch plasma-widget-networkmanagement im "
-"KDE-Profil »Einzelplatzrechner«"
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 msgstr ""
-"Installation von usb-modeswitch auf Laptops, um Dual-Mode-USB-Geräte zu "
-"unterstützen."
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add cifs-utils to the default installation to ensure SMB mounting can work "
-"in any profile."
-msgstr ""
-"Hinzufügen von cifs-utils zur Standardinstallation, um Dateizugriff mittels "
-"SMB in jedem Profil zu ermöglichen."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
-"and valgrind from the default installation and the DVD to make room for "
-"higher priority packages."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
-"Entfernen von octave, gpscorrelate, qlandkartegt, viking, starplot, kig, "
-"kseg, luma und valgrind aus der Standardinstallation und der DVD, um Platz "
-"für Pakete mit höherer Priorität zu schaffen."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
-"authoritive source of host names."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 msgstr ""
-"Entfernen von libnss-mdns stationären Profilen, um DNS als zuständige Quelle "
-"von Rechnernamen festzulegen."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
-"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
-"installed instead.)"
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
-"<computeroutput>freerdp-x11</computeroutput> wird voreingestellt als RDP- "
-"und VNC-Client installiert. (Früher wurde stattdessen "
-"<computeroutput>rdesktop</computeroutput> installiert."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
-msgstr "Sonstige Änderungen mit Bezug auf LDAP"
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make the LDAP server handle more clients after increasing the server's file "
-"descriptor limit from 1024 to 32768."
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
-"Der LDAP-Server kann nun mit mehr Clients umgehen, nachdem das Limit für die "
-"Anzahl gleichzeitig geöffneter Dateien von 1024 auf 32768 heraufgesetzt "
-"wurde. "
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
-"flush all CUPS queues every night. Both can be disabled in LDAP."
-msgstr ""
-"Deaktivierte CUPS-Warteschlangen werden auf dem Hauptserver stündlich neu "
-"gestartet und alle CUPS-Warteschlangen jede Nacht gelöscht. Beides kann in "
-"LDAP deaktiviert werden."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+msgstr "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Provide network blocking / exam mode by default, controlled by LDAP. In "
-"addition to network blocking, changes to the Squid proxy configuration is "
-"needed."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
-"Es wird voreingestellt das durch LDAP kontrollierbare Sperren von "
-"Netzwerkverbindungen / Prüfungsmodus bereitgestellt."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Enable automatic extending of full file systems on the Main Server by "
-"default. This can be disabled in LDAP."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
-"Auf dem Hauptserver werden volle Dateisysteme per Voreinstellung vergrößert. "
-"Dies kann in LDAP deaktiviert werden."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change SSL certificate name used by the LDAP server and adjust clients to "
-"use the new name to be able to enable certificate checking on clients."
-msgstr ""
-"Änderung des SSL-Zertifikatsnamens des LDAP-Servers und Anpassung der "
-"Clients, um mittels des neuen Namens die Überprüfung des Zertifikats auf den "
-"Clients zu ermöglichen. "
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
-"setup used for DNS."
+#. type: Content of: <article><section><title>
+msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
 msgstr ""
-"PowerDNS verwendet nun strikten LDAP-Modus, um eine vereinfachte Einrichtung "
-"von DNS in LDAP zu erreichen."
+"Anhang B -  für Wheezy gibt es zur Zeit keine Live-CDs/DVDs von Debian Edu"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Simplify autofs LDAP rules to make sure they work with extra home directory "
-"partitions exported from the main-server without any changes."
-msgstr ""
-"Vereinfachung der Regeln für Autofs in LDAP, um sicherzustellen, dass sie "
-"ohne Änderungen bei zusätzlichen Partionen für Home-Verzeichnisse "
-"funktionieren, die vom Hauptserver exportiert werden."
+#. type: Content of: <article><section><para>
+msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
+msgstr "Debian Edu Live-CD/DVDs für Wheezy gibt es zur Zeit nicht. "
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Make backup system more robust in handling LDAP database dump and restart."
-msgstr ""
-"Stabileres Verhalten des Backup-Systems in Bezug auf den Export der LDAP-"
-"Datenbank und deren Neustart."
+#. type: Content of: <article><section><section><title>
+msgid "Features of the Standalone image"
+msgstr "Eigenschaften des Profils »Einzelplatzrechner«"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Sonstige Änderungen"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Almost all packages from the Standalone profile"
+msgstr "Fast alle Pakete des Profils »Einzelplatzrechner«"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Root logins are denied for both KDM and GDM - see above and <link linkend="
-"\"GettingStarted\">Getting started</link> for details."
-msgstr ""
-"Anmeldungen von Root sind sowohl für KDM wie auch GDM nicht mehr erlaubt - "
-"siehe <link linkend=\"GettingStarted\">Erste Schritte</link> für "
-"weitergehende Informationen."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "All packages from the laptop task"
+msgstr "Alle Pakete aus »Laptoptask«"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Clients set up to shut down at night will stay up for at least an hour if "
-"they are turned on manually between 16:00 and 07:00."
-msgstr ""
-"Rechner, die für die Abschaltung während der Nacht eingerichtet wurden, "
-"werden nun für mindestens eine Stunde nicht ausgeschaltet, falls sie "
-"zwischen 16:00 Uhr und 07:00 manuell eingeschaltet wurden. "
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The KDE desktop profile for students/pupils."
+msgstr "Das KDE-Arbeitsflächenprofil für Studenten/Schüler"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Additionally use local NTP clock on the main-server to ensure clients and "
-"server sync clocks also when disconnected from the Internet."
-msgstr ""
-"Zusätzliche Nutzung der lokalen Zeitsynchronisation auf dem Hauptserver, um "
-"sicherzustellen, dass auch bei fehlender Internetverbindung die Uhren von "
-"Server und Clients übereinstimmen."
+#. type: Content of: <article><section><section><title>
+msgid "Activating translations and regional support"
+msgstr "Aktivieren von Übersetzungen und Regionalsupport"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
-"Zugriff auf die Debian-Repositorys erfolgt stets über einen Proxy auf dem "
-"Hauptserver - lesen Sie unter <ulink url=\"http://lists.debian."
-"org/20100704221022.GC30542 at login1.uio.no\">DHCP und WPAD verwenden</ulink> "
-"mehr zu den Implementierungsdetails."
+"Um eine spezielle Übersetzung zu aktivieren, booten Sie mit "
+"<computeroutput>locale=ll_CC.UTF-8</computeroutput> als Boot-Option, wobei "
+"ll_CC für den Locale-Namen steht. Um ein Tastaturlayout zu aktivieren "
+"benutzen Sie die <computeroutput>keyb=KB</computeroutput>-Option. Dabei ist "
+"KB das gewünschte Layout. Mehr Informationen über diese Funktion ist in der "
+"Dokumentation <ulink url=\"http://wiki.debian.org/DebianLive/l10n\">Live-Cd "
+"Build Script</ulink> zu finden. Es folgt eine Liste von oft genutzten Länder-"
+"Codes:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "The home0 partition is mounted nosuid, to increase security."
-msgstr ""
-"Die Partition für «home0« wird »nosuid« eingehängt, um die Sicherheit zu "
-"erhöhen."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
+msgstr "<emphasis role=\"strong\">Sprache (Region)</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
-"from 144 to 24 MiB."
-msgstr ""
-"Die Konfiguration von KDE/Akonadi wurde so geändert, dass die "
-"Plattenbelegung für jeden Benutzer von 144 auf 24 MiB reduziert ist."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Locale value</emphasis>"
+msgstr "<emphasis role=\"strong\">Lokale-Wert</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
-msgstr ""
-"Neues Werkzeug »notify-local-users«; damit können allen angemeldeten "
-"Benutzern Nachrichten auf die Arbeitsfläche geschickt werden - nützlich für "
-"Terminal-Server "
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
+msgstr "<emphasis role=\"strong\">Tastaturbelegung (layout)</emphasis>"
 
-#. type: Content of: <article><section><title>
-msgid "Copyright and authors"
-msgstr "Copyright und Autoren"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Bokmål"
+msgstr "Norwegisches Bokmål"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
-"GPL2 or any later version. Enjoy!"
-msgstr ""
-"Dieses Dokument wurde u. a. von folgenden Personen verfasst: Holger Levsen "
-"(2007, 2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, "
-"2003, 2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick "
-"Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
-"(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel "
-"Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim "
-"Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), "
-"Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, "
-"2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), "
-"David Prévot (2012), Wolfgang Schweer (2012) und Bernhard Hammes (2012). Es "
-"ist unter der GPL2 oder einer späteren Version lizenziert. Viel Freude!"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nb_NO.UTF-8"
+msgstr "nb_NO.UTF-8"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
-msgstr ""
-"Wenn Sie Inhalte hinzufügen wollen: <emphasis role=\"strong\">Bitte nur, "
-"wenn Sie auch dessen Autor sind und beabsichtigen, es unter den gleichen "
-"Bedingungen zu lizensieren!</emphasis> Dann fügen Sie hier Ihren Namen hinzu "
-"und lizensieren Sie die Inhalte unter der GPL2 oder einer späteren Version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no"
+msgstr "no"
 
-#. type: Content of: <article><section><title>
-msgid "Translation copyright and authors"
-msgstr "Autoren und Copyright der Übersetzungen"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Nynorsk"
+msgstr "Norwegisches Nynorsk"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
-msgstr ""
-"Das Copyright der spanischen Übersetzung liegt bei José L. Redrejo Rodríguez "
-"(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
-"2012). Sie wurde unter der GPL 2 oder einer späteren Version lizensiert."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nn_NO.UTF-8"
+msgstr "nn_NO.UTF-8"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
-msgstr ""
-"Das Copyright der norwegischen Bokmål-Übersetzung liegt bei Petter "
-"Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-"
-"Anders Andreassen (2010) and Jan Roar Rød (2010). Sie ist unter der GPL2 "
-"oder einer späteren Version lizenziert."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "German"
+msgstr "Deutsch"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
-"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
-"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
-"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
-msgstr ""
-"Die deutsche Übersetzung wurde erstellt und ist Copyright von Holger Levsen "
-"(2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
-"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2011), Ludger Sicking "
-"(2008), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
-"Philipp Hübner (2009), Andreas Mundt (2009, 2010) und Wolfgang Schweer "
-"(2012, 2013). Sie ist unter der GPL2 oder einer späteren Version lizenziert."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de_DE.UTF-8"
+msgstr "de_DE.UTF-8"
 
-#. 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."
-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."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de"
+msgstr "de"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
-msgstr ""
-"Die französische Übersetzung wurde von Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012) und dem französischen l10n-Team (2009, 2010) verfasst "
-"und ist unter der GPL2 oder später lizenziert."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "French (France)"
+msgstr "Französisch (Frankreich)"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
-msgstr ""
-"Die Chinesische Übersetzung wurde verfasst von Andrew Lee (李健秋) (2009) "
-"und ist unter der GPL2 oder später lizenziert."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr_FR.UTF-8"
+msgstr "fr_FR.UTF-8"
 
-#. 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."
-msgstr ""
-"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><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr"
+msgstr "fr"
 
-#. type: Content of: <article><section><title>
-msgid "Translations of this document"
-msgstr "Übersetzungen dieses Dokuments"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Greek (Greece)"
+msgstr "Griechisch (Griechenland)"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
-msgstr ""
-"Vollständige Übersetzungen dieses Dokuments ins Deutsche, Italienische, "
-"Französische und Dänische sind vorhanden. Es gibt unvollständige "
-"Übersetzungen in das norwegische Bokmål und ins Spanische; schauen Sie sich "
-"die Version in Ihrer Sprache <ulink url=\"http://maintainer.skolelinux.org/"
-"debian-edu-doc/\">hier</ulink> an."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el_GR.UTF-8"
+msgstr "el_GR.UTF-8"
 
-#. type: Content of: <article><section><section><title>
-msgid "HowTo translate this document"
-msgstr "Anleitung zum Übersetzen dieses Dokuments"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el"
+msgstr "el"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"As in many free software projects, translations of this document are kept in "
-"PO files. More information about the process can be found in "
-"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
-"contains this file too. Take a look there and at the <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-"specific conventions</ulink> if you want to help translating this document."
-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."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Japanese"
+msgstr "Japanisch"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
-"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
-"\">instructions on how to submit bugs</ulink> here."
-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>."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "ja_JP.UTF-8"
+msgstr "ja_JP.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "jp"
+msgstr "jp"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Northern Sami (Norway)"
+msgstr "Nördliches Sami (Norwegen)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "se_NO"
+msgstr "se_NO"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no(smi)"
+msgstr "no(smi)"
 
 #. 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):"
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
-"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):"
+"Eine vollständige Liste von Länder-Codes ist unter  <computeroutput>/usr/"
+"share/i18n/SUPPORTED</computeroutput> zu finden, von den Live-Images werden "
+"bisher nur UTF-8 Locales unterstützt. Jedoch sind nicht für alle Locales "
+"auch Übersetzungen installiert. Die Namen der verschiedenen Tastaturlayouts "
+"können in /usr/share/keymaps/i386/ gefunden werden."
+
+#. type: Content of: <article><section><section><title>
+msgid "Stuff to know"
+msgstr "Gut zu wissen"
 
 #. 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>"
+msgid "The password for the user is \"user\"; root has no passwd set."
 msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"Das Passwort für den Benutzer ist »user«, für root wurde kein Passwort "
+"gesetzt."
+
+#. type: Content of: <article><section><section><title>
+msgid "Known issues with the image"
+msgstr "Bekannte Probleme mit dem Image"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "There are no wheezy images yet"
+msgstr "Für Wheezy gibt es noch keine Images"
+
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/sad.png"
+msgstr "./images/sad.png"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+msgid ":("
+msgstr ":("
+
+#. type: Content of: <article><section><section><title>
+msgid "Download"
+msgstr "Download"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language "
-"code). There are many tools for translating available; we suggest using "
-"<computeroutput>lokalize</computeroutput>."
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
-"Dann editieren Sie <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> ($CC mit Ihrem Sprachenkürzel "
-"ersetzen). Es stehen viele Werkzeuge für das Übersetzen zur Verfügung; "
-"empfohlen wird <computeroutput>lokalize</computeroutput>."
+"Das Image hat 1.2 GiB und wäre (ist aber gegenwärtig noch nicht) zu bekommen "
+"via <ulink url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, "
+"<ulink url=\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> oder "
+"mittels rsync via <computeroutput>ftp.skolelinux.org</computeroutput> unter "
+"<computeroutput>cd-wheezy-live/</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><title>
+msgid "Appendix C - Features in older releases"
+msgstr "Anhang C - Neuerungen in alten Veröffentlichungen"
+
+#. type: Content of: <article><section><section><title>
 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."
+"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released 2013-0?-??"
 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."
+"Neuerungen in Debian Edu 6.0.6+r1, Codename »Squeeze«, *UN*released ?.?.2013"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 msgstr ""
-"Um Ihre lokale Kopie des Repository zu aktualisieren, verwenden Sie bitte "
-"den folgenden Befehl in Ihrem Verzeichnis <computeroutput>debian-edu-doc</"
-"computeroutput>:"
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "sitesummary was updated from 0.1.3 to 0.1.8"
+msgstr "sitesummary wurde von 0.1.3 auf 0.1.8 aktualisiert"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations to find information how to create a new PO file for your "
-"language if there isn't one yet, and how to update translations."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make Nagios configuration more robust and efficient"
+msgstr "Die Konfiguration von Nagios ist nun robuster und effizienter"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
 msgstr ""
-"Lesen Sie /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
-"Übersetzungen aktualisieren wollen."
+"debian-edu-doc wurde von  1.4~20120310~6.0.4+r0  auf 1.4~20120925~6.0.6+r0 "
+"aktualisiert"
 
-#.  <remark>
-#. status ignore</remark> 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Minor updates from the wiki"
+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"
+
+#. 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"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Please keep in mind that this manual is still under development, so don't "
-"translate any string which contains \" FIXME\"."
+"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
+"#664596"
 msgstr ""
-"Bitte beachten Sie, dass sich dieses Handbuch noch in der Entwicklung "
-"befindet; übersetzen Sie daher keine Zeilen, die den Vermerk »FIXME« "
-"aufweisen."
+"Berichtigte Benutzerrichtlinie für Kerberos: Das Passwort läuft nicht mehr "
+"nach zwei Tagen ab. Bug #664596 geschlossen"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><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\"/>."
+"Handle '#' characters in the root or first users password. Closes: #664976"
 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."
+"Erlaubt sind nun #-Zeichen für das Passwort von Root oder Erstbenutzer. Bug "
+"#664976 geschlossen"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-sync:"
+msgstr "Fehlerbehebungen von gosa-sync:"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't fail if password contains \""
 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."
+"Passwörter, die das Zeichen »\"« enthalten, verursachen keinen Fehler mehr"
 
-#. type: Content of: <article><section><section><para>
-msgid "Please report any problems."
-msgstr "Bitte melden Sie Fehler."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't disclose new password string in syslog"
+msgstr "Neue Passwörter erscheinen nicht mehr im Syslog"
 
-#. type: Content of: <article><section><title>
-msgid "Appendix A - The GNU General Public License"
-msgstr "Anhang A - The GNU General Public Licence"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-create:"
+msgstr "Fehlerbehebungen für gosa-create:"
 
-#. 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. ]]"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Invalidate libnss cache before applying changes"
+msgstr "Der Cache von libnss wird vor der Anwendung von Änderungen geleert "
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Multiple failures during mass user import into GOsa²"
 msgstr ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > und andere; die vollstandige "
-"Liste der Copyright-Inhaber gibt es im <link linkend=\"CopyRight\">Copyright-"
-"Kapitel</link>."
+"Mehrere Fehler während des massenhaften Imports von Benutzerkennungen in "
+"GOsa² behoben"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+"gosa-netgroups plugin: don't erase entries of attribute type "
+"\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+"gosa-netgroups plugin: Einträge des Attributtyps \"memberNisNetgroup\" "
+"werden nicht mehr gelöscht. Bug #687256 geschlossen"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "First user now uses the same Kerberos policy as all other users"
 msgstr ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"Der Erstbenutzer verwendet nun dieselbe Kerberosrichtlinie wie alle anderen "
+"Benutzer"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-msgstr ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Add Danish web page"
+msgstr "Dänische Webseite wurde hinzugefügt"
 
-#. type: Content of: <article><section><section><title>
-msgid "GNU GENERAL PUBLIC LICENSE"
-msgstr "GNU GENERAL PUBLIC LICENSE"
+#. 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"
 
-#. type: Content of: <article><section><section><para>
-msgid "Version 2, June 1991"
-msgstr "Version 2, June 1991"
+#. 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>
+#. type: Content of: <article><section><section><title>
 msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+"Neuerungen in Debian Edu 6.0.4+r0, Codename »Squeeze«, freigegeben am "
+"11.03.2012"
 
-#. type: Content of: <article><section><section><title>
-msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
+"the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
+msgstr ""
+"Ersetzen von LWAT durch GOsa² als Verwaltungswerkzeug für LDAP. Für "
+"weitergehende Informationen zu GOsa²: siehe unten sowie das Handbuchkapitel "
+"<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Erste Schritte</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "See below for a list of updated software."
+msgstr "Liste aktualisierter Software siehe unten."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"Show welcome page to users when they first log in. This default start page "
+"for Iceweasel is fetched from LDAP at installation and boot time for "
+"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
+"Standalone installations."
 msgstr ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"Zeigen einer Begrüßungsseite beim ersten Anmelden eines Benutzers. Diese "
+"voreingestellte Startseite von Iceweasel wird bei Netzwerkprofilen während "
+"Installation und Rechnerstart aus LDAP geholt. Für das Profil "
+"»Einzelplatzrechner« wird <ulink url=\"http://www.skolelinux.org/\"/> "
+"angezeigt."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+"Gnome option, the LXDE desktop option is only supported by the CD "
+"installation method."
+msgstr ""
+"Neue Option für die graphische Arbeitsumgebung LXDE, zusätzlich zu KDE "
+"(Voreinstellung) und Gnome. Wie für Gnome steht auch die Option LXDE "
+"ausschließlich für die Installtion per CD zur Verfügung. "
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Speed up LTSP client boot."
+msgstr "Schnelleres Starten von LTSP-Clients."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Provide a KDE menu entry for changing the password in GOsa²."
 msgstr ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"Bereitstellen eines KDE-Menüeintrags zum Ändern des Passworts mittels GOsa²."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</ulink> "
+"chapter of the manual."
 msgstr ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"Weitere Informationen zum Ändern von Passwörtern (eingeschlossen abgelaufene "
+"Passwörter bei der Anmeldung mittels KDM/GDM): Siehe <ulink url=\"http://"
+"wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for "
+"users</ulink> chapter of the manual."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
+"shown to new users."
 msgstr ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee"
+"Hinzufügen eines Verweises auf <ulink url=\"http://linuxsignpost.org/\"/> "
+"auf der neuen Benutzern angezeigten Startseite."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"Alle LTSP-Server sind per Voreinstellung auch <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Documentation/Squeeze/HowTo/"
+"NetworkClients#Remote_Desktop_Service\">RDP-Server</ulink>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"Improve handing of removable media on thin clients. Show desktop "
+"notification longer when inserting new media and provide an option to start "
+"dolphin when such media is inserted."
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"Verbesserter Umgang mit Wechseldatenträgern für Thin Clients. Die "
+"Benachrichtigung auf dem Bildschirm erfolgt nun für einen längeren Zeitraum, "
+"wenn ein neues Gerät angeschlossen oder ein neues Medium eingelegt wurde. Es "
+"gibt nun eine Option, den Dateimanager Dolphin in diesen Fällen zu starten."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"Neue Version des Debian-Installationsprogramms aus Debian Squeeze, siehe "
+"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual\">Debian-"
+"Installationshandbuch</ulink> für weitere Informationen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
+"is set up during installation of the Main Server. This user is up as GOsa² "
+"administrator and is also granted sudo access. The Debian Edu menu "
+"reordering has been enabled as well, by adding the user also to the "
+"<computeroutput>teachers</computeroutput> group."
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Da ein graphisches Anmelden für den Benutzer »root« mittels Gdm/Kdm nicht "
+"mehr zulässig ist, wird während der Installation des Hauptservers ein "
+"Benutzerkonto in LDAP angelegt und der entsprechende Benutzer als GOsa²-"
+"Administrator gesetzt. Diesem Erstbenutzer werden »sudo«-Rechte gegeben; da "
+"er der Gruppe »teachers« zugeordnet wird, gilt für ihn auch die Anpassung "
+"des Debian-Edu-Menüs."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
+"<computeroutput>cat</computeroutput>.."
 msgstr ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"Die <computeroutput>ISO</computeroutput>-Images können mittels "
+"<computeroutput>dd</computeroutput> (oder sogar <computeroutput>cat</"
+"computeroutput>) direkt auf USB-Sticks kopiert werden."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New roaming workstation profile for laptops."
+msgstr "Neues Profil »Mobiler Arbeitsplatzrechner« für Laptops"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"Device access for all users is handled by <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"Gerätezugriff für alle Benutzer wird von <ulink url=\"http://wiki.debian.org/"
+"PolicyKit#\">PolicyKit</ulink> geregelt; für den Zugriff auf Geräte ist "
+"keine zusätzliche Zugehörigkeit zu Gruppen mehr notwendig."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"Es wird eine Warnung ausgegeben, wenn die Festplatte(n) für das ausgesuchte "
+"Profil zu klein sind."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"Vereinfachte Partitionierung für das Profil »Einzelplatzrechner«, um eine "
+"separate Partion für /home, aber keine mehr für /usr anzulegen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"More tests in the test suite, and correct some of the tests that failed "
+"earlier."
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Es gibt mehr Tests in der Testsuite und Korrekturen für einige Test, die "
+"früher fehlschlugen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Make sure to report an error and abort the installation when trying to use "
+"the netinst images without a working Internet connection, instead of "
+"silently installing a broken system."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Statt ohne Rückmeldung ein fehlerhaftes System zu installieren, wird nun "
+"sichergestellt, dass eine Fehlermeldung erscheint und die Installation "
+"abgebrochen wird, wenn die Installation mittels Netinst-Image ohne "
+"Internetverbindung erfolgt."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Squeeze:"
+msgstr "Alles, was in Debian »Squeeze« neu ist:"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"compatibility with the FHS v2.3 and software developed for version 3.2 of "
+"the LSB."
+msgstr ""
+"Kompatibilität mit FHS v2.3 und Software, die für Version 3.2 des LSB "
+"entwickelt wurde."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 2.6.32"
+msgstr "Linux-Kernel in der Version 2.6.32"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+msgstr "Graphische Arbeitsumgebungen KDE »Plasma« 4.4 und GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 3.5"
+msgstr "Webbrowser Iceweasel 3.5"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "OpenOffice.org 3.2.1"
+msgstr "OpenOffice.org 3.2.1"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 9.3"
+msgstr "Lehrprogramme GCompris 9.3"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 10.04.2"
+msgstr "Musikprogramm Rosegarden 10.04.2"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.6.10"
+msgstr "Bildbearbeitung Gimp 2.6.10"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.0"
+msgstr "Virtuelles Universum Celestia 1.6.0"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.10.4"
+msgstr "Virtueller Sternenhimmel Stellarium 0.10.4"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Debian Squeeze enthält mehr als 10.000 neue installierbare Pakete, "
+"eingeschlossen der Browser Chromium."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"Weitere Information zu Debian Squeeze 6.0 sind in den <ulink url=\"http://"
+"www.debian.org/releases/squeeze/releasenotes\">release notes</ulink> und im "
+"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual\">Debian-"
+"Installationshandbuch</ulink> zu finden."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
+"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"Das Netzwerk 10.0.0.0/8 wird nun statt 10.0.2.0/23 genutzt; das »default "
+"gateway« hat die IP-Adresse 10.0.0.1/8, nicht mehr 10.0.2.1/8 wie früher."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"The dynamic DHCP range was extended on the backbone network to around 4k IP "
+"addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"Der dynamische DHCP-Bereich an IP-Adressen wurde im Hauptnetzwerk auf etwa "
+"4k und im Netzwerk der Thin Clients auf etwa 200 erweitert."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+"The DHCP network for 10.0.0.0/8 has been renamed from "
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+"Das DHCP-Netzwerk 10.0.0.0/8 wurde von <computeroutput>barebone</"
+"computeroutput> in <computeroutput>intern</computeroutput> umbenannt."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"There are no pre-defined host entries for client systems in DNS anymore "
+"(staticXX, ..., dhcpYY...)"
 msgstr ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"Es gibt für Client-Systeme keine vordefinierten Rechnernamen in DNS mehr "
+"(wie staticXX, ..., dhcpYY...)."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "MIT Kerberos5 used for user authentication, enabled for:"
 msgstr ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"Für die Benutzer-Authentifizierung wird MIT-Kerberos5 benutzt, und zwar für:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "PAM"
+msgstr "PAM"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "IMAP"
+msgstr "IMAP"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "SMTP"
+msgstr "SMTP"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"NFSv4, aber ohne ohne Kerberos-Authentifizierung für Privacy bzw. "
+"Integrität. Maschinen müssen immer noch der »Netgroup« »workstations« "
+"hinzugefügt weren, um dort die Home-Verzeichnisse einhängen zu können."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+msgstr "Volle Unterstützung von Samba-NT4-Domänen für Windows XP/Vista/7"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"A complete PXE boot environment is setup when installing from the DVD, so "
+"that further installations can be done using PXE network installs only. A "
+"new script pxe-addfirmware is provided to support more hardware models "
+"needing firmware."
 msgstr ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"Während der Installation per DVD wird eine vollständige Umgebung für den "
+"Start per PXE eingerichtet; damit können alle weiteren Installationen "
+"mittels PXE über das Netz erfolgen."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"Remove all hard coded settings on workstations, and configure workstations "
+"and roaming workstations using settings detected from the environment using "
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"Entfernen aller hartcodierten Einstellungen auf Arbeitsplatzrechnern; "
+"Konfiguration (mobiler) Arbeitsplatzrechner mittels DNS, DHCP und LDAP in "
+"Abhängigkeit von deren Standort. Weitergehende Informationen unter <ulink "
+"url=\"http://people.skolelinux.org/pere/blog/"
+"No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
 msgstr ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"Aktualisierte Übersetzungen für die Einträge im Installationsprogramm. Diese "
+"liegen nun für 28 Sprachen vor."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
+"proof-read with corrections was done by a native English linguist."
 msgstr ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"Das Benutzerhandbuch für Debian Edu »Squeeze« wurde überarbeitet und "
+"verbessert. Es erfolgte ein Korrekturlesen mit Fehlerbeseitigung durch einen "
+"Linguisten mit Englisch als Muttersprache."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"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."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to many language tasks, especially French and Danish."
 msgstr ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+"Verbesserung vieler sprachbezogener Tasks, insbesondere Französisch und "
+"Dänisch. "
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
-msgstr "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to the welcome web page shown at first logins."
+msgstr ""
+"Verbesserung der Web-Begrüßungseite, die bei der ersten Anmeldung angezeigt "
+"wird."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"Add new Japanese, Portuguese and Catalan translations of the welcome web "
+"page."
 msgstr ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"Neue Übersetzungen der Begrüßungs-Webseite ins Japanische, Portugiesische "
+"und Katalanische hinzugefügt."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
 msgstr ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
-
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
-msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">Installationen mittels CD unterscheiden sich von solchen mittels DVD</"
+"ulink> - die DVD ist ausschließlich für die Installation der KDE-"
+"Arbeitsumgebung geeignet."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
+"netinst installation CDs. It is still possible to run Debian Edu on "
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
 msgstr ""
-"Anhang B -  für Squeeze gibt es zur Zeit keine Live-CDs/DVDs von Debian Edu"
-
-#. type: Content of: <article><section><para>
-msgid "Debian Edu Live CD/DVDs for Squeeze are not available at the moment."
-msgstr "Debian Edu Live-CD/DVDs für Squeeze gibt es zur Zeit nicht. "
-
-#. type: Content of: <article><section><section><title>
-msgid "Features of the Standalone image"
-msgstr "Eigenschaften des Profils »Einzelplatzrechner«"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Almost all packages from the Standalone profile"
-msgstr "Fast alle Pakete des Profils »Einzelplatzrechner«"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "All packages from the laptop task"
-msgstr "Alle Pakete aus »Laptoptask«"
+"Auf der Installations-CD (»netinst«) wurde die Unterstützung für die "
+"<computeroutput>powerpc</computeroutput>-Architektur entfernt. Es ist "
+"weiterhin möglich, Debian Edu auf <computeroutput>powerpc</computeroutput> "
+"auszuführen, die Installation ist aber weniger automatisiert."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The KDE desktop profile for students/pupils."
-msgstr "Das KDE-Arbeitsflächenprofil für Studenten/Schüler"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop gtick in the default installation, because it doesn't work on thin "
+"clients (BTS #566335)."
+msgstr ""
+"Entfernen von gtick aus der Standardinstallation, da es auf Thin Clients "
+"nicht funktioniert (BTS #566335)."
 
-#. type: Content of: <article><section><section><title>
-msgid "Activating translations and regional support"
-msgstr "Aktivieren von Übersetzungen und Regionalsupport"
+#. type: Content of: <article><section><section><section><title>
+msgid "New administration tool: GOsa²"
+msgstr "Neues Verwaltungswerkzeug: GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want.  To activate a given keyboard layout, use the "
-"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
-"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live CD build script "
-"documentation</ulink>.  Here is a list of commonly used locale codes:"
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
-"Um eine spezielle Übersetzung zu aktivieren, booten Sie mit "
-"<computeroutput>locale=ll_CC.UTF-8</computeroutput> als Boot-Option, wobei "
-"ll_CC für den Locale-Namen steht. Um ein Tastaturlayout zu aktivieren "
-"benutzen Sie die <computeroutput>keyb=KB</computeroutput>-Option. Dabei ist "
-"KB das gewünschte Layout. Mehr Informationen über diese Funktion ist in der "
-"Dokumentation <ulink url=\"http://wiki.debian.org/DebianLive/l10n\">Live-Cd "
-"Build Script</ulink> zu finden. Es folgt eine Liste von oft genutzten Länder-"
-"Codes:"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
-msgstr "<emphasis role=\"strong\">Sprache (Region)</emphasis>"
+"gosa (2.6.11-3+squeeze1~edu+1) aus dem kommenden Debian-Point-Release 6.0.5, "
+"mit:"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Locale value</emphasis>"
-msgstr "<emphasis role=\"strong\">Lokale-Wert</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix DHCP host removal. Closes: #650258"
+msgstr ""
+"Korekte DHCP-Konfiguration nach Entfernen eines Rechnereintrags. Schließt: "
+"#650258"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
-msgstr "<emphasis role=\"strong\">Tastaturbelegung (layout)</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Backport user generator unicode character transliteration. Closes: #657086"
+msgstr ""
+"Backport für die Generierung von Kennungen bei vorhandenem Unicode. "
+"Schließt: #657086"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Bokmål"
-msgstr "Norwegisches Bokmål"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Customized GOsa² configuration to better suit the Debian Edu network "
+"architecture."
+msgstr ""
+"Angepasste Konfiguration von GOsa², um der Architektur des DEbian-Edu-"
+"Netzwerks besser zu entsprechen. "
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nb_NO.UTF-8"
-msgstr "nb_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"GOsa² updates DNS and NFS exports immediately when a system is updated in "
+"LDAP, making diskless workstations work right after they are added to the "
+"required netgroup."
+msgstr ""
+"GOsa² aktualisiert Exporte für DNS und NFS unmittelbar nach Aktualisierung "
+"eines Systems in LDAP; Diskless Workstations funktionieren dadurch sofort, "
+"wenn sie der benötigten »Netgroup« hinzugefügt wurden."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no"
-msgstr "no"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
+"objects using information gathered by sitesummary, to make it easier to add "
+"new computers to the network."
+msgstr ""
+"Neues Skript »sitesummary2ldapdhcp«, um für Systeme in GOsa² von Sitesummary "
+"gesammelte Informationen zu aktualisieren oder zur Verfügung zu stellen; das "
+"Hinzufügen neuer Rechner wird so erleichtert."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Nynorsk"
-msgstr "Norwegisches Nynorsk"
+#. type: Content of: <article><section><section><section><title>
+msgid "More software changes"
+msgstr "Weitere Änderungen von Software"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nn_NO.UTF-8"
-msgstr "nn_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+msgstr ""
+"Hinzufügen der Videobearbeitung Kdenlive 0.7.7 und des interaktiven "
+"Geometrieprogramms Geogebra, Version 3.2.42"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "German"
-msgstr "Deutsch"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change default package manager from adept to synaptic, to avoid getting two "
+"graphical package managers installed by default."
+msgstr ""
+"Änderung des voreingestellten Paketverwaltungswerkzeugs (synaptic statt "
+"adept), um die Installation von zwei graphischen Paketverwaltungswerkzeugen "
+"zu vermeiden."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de_DE.UTF-8"
-msgstr "de_DE.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
+"KDE."
+msgstr ""
+"Installation von openoffice.org-kde per Voreinstellung, damit OpenOffice die "
+"KDE-Dateiauswahl verwendet, wenn es unter KDE ausgeführt wird."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de"
-msgstr "de"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change video player setup to install different players in KDE "
+"(dragonplayer), Gnome (totem) and LXDE (totem)."
+msgstr ""
+"Änderung der Einrichtung des Videoabspielers: Installation unterschiedlicher "
+"Abspieler in KDE (dragonplayer), Gnome (totem), und LXDE (totem)."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "French (France)"
-msgstr "Französisch (Frankreich)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
+"default KDE installation."
+msgstr ""
+"Hinzufügen der KDE-Werkzeuge freespacenotifier, kinfocenter, update-notifier-"
+"kde zur Standardinstallation von KDE."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr_FR.UTF-8"
-msgstr "fr_FR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace network-manager-kde with plasma-widget-networkmanagement in the "
+"standalone KDE profile"
+msgstr ""
+"Ersetzen von network-manager-kde durch plasma-widget-networkmanagement im "
+"KDE-Profil »Einzelplatzrechner«"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr"
-msgstr "fr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+msgstr ""
+"Installation von usb-modeswitch auf Laptops, um Dual-Mode-USB-Geräte zu "
+"unterstützen."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Greek (Greece)"
-msgstr "Griechisch (Griechenland)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add cifs-utils to the default installation to ensure SMB mounting can work "
+"in any profile."
+msgstr ""
+"Hinzufügen von cifs-utils zur Standardinstallation, um Dateizugriff mittels "
+"SMB in jedem Profil zu ermöglichen."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el_GR.UTF-8"
-msgstr "el_GR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
+"and valgrind from the default installation and the DVD to make room for "
+"higher priority packages."
+msgstr ""
+"Entfernen von octave, gpscorrelate, qlandkartegt, viking, starplot, kig, "
+"kseg, luma und valgrind aus der Standardinstallation und der DVD, um Platz "
+"für Pakete mit höherer Priorität zu schaffen."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el"
-msgstr "el"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
+"authoritive source of host names."
+msgstr ""
+"Entfernen von libnss-mdns stationären Profilen, um DNS als zuständige Quelle "
+"von Rechnernamen festzulegen."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Japanese"
-msgstr "Japanisch"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
+"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
+"installed instead.)"
+msgstr ""
+"<computeroutput>freerdp-x11</computeroutput> wird voreingestellt als RDP- "
+"und VNC-Client installiert. (Früher wurde stattdessen "
+"<computeroutput>rdesktop</computeroutput> installiert."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "ja_JP.UTF-8"
-msgstr "ja_JP.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make the LDAP server handle more clients after increasing the server's file "
+"descriptor limit from 1024 to 32768."
+msgstr ""
+"Der LDAP-Server kann nun mit mehr Clients umgehen, nachdem das Limit für die "
+"Anzahl gleichzeitig geöffneter Dateien von 1024 auf 32768 heraufgesetzt "
+"wurde. "
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "jp"
-msgstr "jp"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
+msgstr ""
+"Deaktivierte CUPS-Warteschlangen werden auf dem Hauptserver stündlich neu "
+"gestartet und alle CUPS-Warteschlangen jede Nacht gelöscht. Beides kann in "
+"LDAP deaktiviert werden."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Northern Sami (Norway)"
-msgstr "Nördliches Sami (Norwegen)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide network blocking / exam mode by default, controlled by LDAP. In "
+"addition to network blocking, changes to the Squid proxy configuration is "
+"needed."
+msgstr ""
+"Es wird voreingestellt das durch LDAP kontrollierbare Sperren von "
+"Netzwerkverbindungen / Prüfungsmodus bereitgestellt."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "se_NO"
-msgstr "se_NO"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable automatic extending of full file systems on the Main Server by "
+"default. This can be disabled in LDAP."
+msgstr ""
+"Auf dem Hauptserver werden volle Dateisysteme per Voreinstellung vergrößert. "
+"Dies kann in LDAP deaktiviert werden."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no(smi)"
-msgstr "no(smi)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change SSL certificate name used by the LDAP server and adjust clients to "
+"use the new name to be able to enable certificate checking on clients."
+msgstr ""
+"Änderung des SSL-Zertifikatsnamens des LDAP-Servers und Anpassung der "
+"Clients, um mittels des neuen Namens die Überprüfung des Zertifikats auf den "
+"Clients zu ermöglichen. "
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
-"the live images. Not all locales have translations installed, though.  The "
-"keyboard layout names can be found in /usr/share/keymaps/i386/."
+"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
+"setup used for DNS."
 msgstr ""
-"Eine vollständige Liste von Länder-Codes ist unter  <computeroutput>/usr/"
-"share/i18n/SUPPORTED</computeroutput> zu finden, von den Live-Images werden "
-"bisher nur UTF-8 Locales unterstützt. Jedoch sind nicht für alle Locales "
-"auch Übersetzungen installiert. Die Namen der verschiedenen Tastaturlayouts "
-"können in /usr/share/keymaps/i386/ gefunden werden."
+"PowerDNS verwendet nun strikten LDAP-Modus, um eine vereinfachte Einrichtung "
+"von DNS in LDAP zu erreichen."
 
-#. type: Content of: <article><section><section><title>
-msgid "Stuff to know"
-msgstr "Gut zu wissen"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Simplify autofs LDAP rules to make sure they work with extra home directory "
+"partitions exported from the main-server without any changes."
+msgstr ""
+"Vereinfachung der Regeln für Autofs in LDAP, um sicherzustellen, dass sie "
+"ohne Änderungen bei zusätzlichen Partionen für Home-Verzeichnisse "
+"funktionieren, die vom Hauptserver exportiert werden."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The password for the user is \"user\"; root has no passwd set."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
-"Das Passwort für den Benutzer ist »user«, für root wurde kein Passwort "
-"gesetzt."
+"Stabileres Verhalten des Backup-Systems in Bezug auf den Export der LDAP-"
+"Datenbank und deren Neustart."
 
-#. type: Content of: <article><section><section><title>
-msgid "Known issues with the image"
-msgstr "Bekannte Probleme mit dem Image"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
+msgstr ""
+"Anmeldungen von Root sind sowohl für KDM wie auch GDM nicht mehr erlaubt - "
+"siehe <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Erste Schritte</ulink> für weitergehende Informationen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "There are no squeeze images yet"
-msgstr "Für Squeeze gibt es noch keine Images"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Clients set up to shut down at night will stay up for at least an hour if "
+"they are turned on manually between 16:00 and 07:00."
+msgstr ""
+"Rechner, die für die Abschaltung während der Nacht eingerichtet wurden, "
+"werden nun für mindestens eine Stunde nicht ausgeschaltet, falls sie "
+"zwischen 16:00 Uhr und 07:00 manuell eingeschaltet wurden. "
 
-#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/sad.png"
-msgstr "./images/sad.png"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Additionally use local NTP clock on the main-server to ensure clients and "
+"server sync clocks also when disconnected from the Internet."
+msgstr ""
+"Zusätzliche Nutzung der lokalen Zeitsynchronisation auf dem Hauptserver, um "
+"sicherzustellen, dass auch bei fehlender Internetverbindung die Uhren von "
+"Server und Clients übereinstimmen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-msgid ":("
-msgstr ":("
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Access to Debian repositories is always done via a proxy on the main server "
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+msgstr ""
+"Zugriff auf die Debian-Repositorys erfolgt stets über einen Proxy auf dem "
+"Hauptserver - lesen Sie unter <ulink url=\"http://lists.debian."
+"org/20100704221022.GC30542 at login1.uio.no\">DHCP und WPAD verwenden</ulink> "
+"mehr zu den Implementierungsdetails."
 
-#. type: Content of: <article><section><section><title>
-msgid "Download"
-msgstr "Download"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "The home0 partition is mounted nosuid, to increase security."
+msgstr ""
+"Die Partition für «home0« wird »nosuid« eingehängt, um die Sicherheit zu "
+"erhöhen."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
+"from 144 to 24 MiB."
 msgstr ""
-"Das Image hat 1.2 GiB und wäre (ist aber gegenwärtig noch nicht) zu bekommen "
-"via <ulink url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, "
-"<ulink url=\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> oder "
-"mittels rsync via <computeroutput>ftp.skolelinux.org</computeroutput> unter "
-"<computeroutput>cd-squeeze-live/</computeroutput>."
+"Die Konfiguration von KDE/Akonadi wurde so geändert, dass die "
+"Plattenbelegung für jeden Benutzer von 144 auf 24 MiB reduziert ist."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix C - Features in older releases"
-msgstr "Anhang C - Neuerungen in alten Veröffentlichungen"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New tool notify-local-users to send desktop notification to all logged in "
+"users on a machine.  Useful for thin client servers."
+msgstr ""
+"Neues Werkzeug »notify-local-users«; damit können allen angemeldeten "
+"Benutzern Nachrichten auf die Arbeitsfläche geschickt werden - nützlich für "
+"Terminal-Server "
 
 #. type: Content of: <article><section><section><title>
 msgid "New in Debian Edu 5.0.6+edu1 Codename \"Lenny\" released 2010-10-05"
@@ -11251,3 +11117,334 @@ msgstr ""
 "Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
+
+#~ msgid "to be documented, if any"
+#~ msgstr "to be documented, if any"
+
+#~ 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-wheezy-"
+#~ "manual-translations</computeroutput>. The Subversion repository (see "
+#~ "below) contains this file too. Take a look there and at the <ulink url="
+#~ "\"http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#"
+#~ "\">language specific conventions</ulink> if you want to help translating "
+#~ "this document."
+#~ msgstr ""
+#~ "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-wheezy-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."
+
+#~ 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 ""
+#~ "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>."
+
+#~ 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 ""
+#~ "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):"
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "Information über Alioth (auf dem sich das Subversion-Repository befindet) "
+#~ "und Subversion ist unter <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/"
+#~ "> verfügbar."
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "[attachment:welcome_to_tjener.png]"
+#~ msgstr "[attachment:welcome_to_tjener.png]"
+
+#~ msgid "Debian Edu login"
+#~ msgstr "Debian-Edu-Anmeldung"
+
+#~ msgid "Installer boot menu"
+#~ msgstr "Bootmenü des Installationsprograms"
+
+#~ msgid "Installer advanced options screen 1"
+#~ msgstr "Seite 1 der »Advanced options«"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Seite 2 der »Advanced options«"
+
+#~ msgid "Installer help screen"
+#~ msgstr "Hilfeseite des Installationaprogramms"
+
+#~ msgid "A note on some RAID controllers"
+#~ msgstr "Eine Bemerkung zu einzelnen RAID-Controllern"
+
+#~ msgid ""
+#~ "When using a USB drive to add missing firmware during install, with some "
+#~ "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
+#~ "installation results in a GRUB error. A workaround for this problem is to "
+#~ "remove the USB drive after the firmware is loaded, and preferably before "
+#~ "partitioning starts."
+#~ msgstr ""
+#~ "Bei Verwendung eines USB-Laufwerks zur Installation fehlender Firmware "
+#~ "wird bei manchen RAID-Controllern GRUB auf dem USB-Laufwerk installiert. "
+#~ "Dies führt beim Neustart zu einer GRUB-Fehlermeldung. Um das Problem zu "
+#~ "umgehen, entfernen Sie das USB-Laufwerk nach Installation der Firmware "
+#~ "und vorzugsweise noch vor der Partitionierung."
+
+#~ msgid ""
+#~ "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#~ "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#~ "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+#~ msgstr ""
+#~ "Mehr Information findet sich unter <ulink url=\"http://bugs.skolelinux."
+#~ "org/show_bug.cgi?id=1395\">Debian-Edu-Fehler #1395</ulink> und Debian Bug "
+#~ "<ulink url=\"http://bugs.debian.org/516280\">516280</ulink>."
+
+#~ msgid "pxe-tjener.png"
+#~ msgstr "pxe-tjener.png"
+
+#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#~ msgid "02-select_a_language.png"
+#~ msgstr "02-select_a_language.png"
+
+#~ msgid "03-select_your_location.png"
+#~ msgstr "03-select_your_location.png"
+
+#~ msgid "04-Configure_the_keyboard.png"
+#~ msgstr "04-Configure_the_keyboard.png"
+
+#~ msgid "05-Detect_and_mount_CD-ROM.png"
+#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#~ msgid "06-Load_installer_components_from_CD.png"
+#~ msgstr "06-Load_installer_components_from_CD.png"
+
+#~ msgid "07-Detect_network_hardware.png"
+#~ msgstr "07-Detect_network_hardware.png"
+
+#~ msgid "08-Choose_Debian_Edu_profile.png"
+#~ msgstr "08-Choose_Debian_Edu_profile.png"
+
+#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+
+#~ msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#~ msgid "12-Set_up_users_and_passwords.png"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#~ msgid "12a-Set_up_users_and_passwords.png"
+#~ msgstr "12a-Set_up_users_and_passwords.png"
+
+#~ msgid "12b-Set_up_users_and_passwords.png"
+#~ msgstr "12b-Set_up_users_and_passwords.png"
+
+#~ msgid "12c-Set_up_users_and_passwords.png"
+#~ msgstr "12c-Set_up_users_and_passwords.png"
+
+#~ msgid "13-Install the base system.png"
+#~ msgstr "13-Install the base system.png"
+
+#~ msgid "14-Select_and_install_software.png"
+#~ msgstr "14-Select_and_install_software.png"
+
+#~ msgid "17-Select_and_install_software.png"
+#~ msgstr "17-Select_and_install_software.png"
+
+#~ msgid "18-Build LTSP chroot.png"
+#~ msgstr "18-Build LTSP chroot.png"
+
+#~ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#~ msgid "20-Finish_the_Installation.png"
+#~ msgstr "20-Finish_the_Installation.png"
+
+#~ msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#~ msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#~ msgid "23-Tjener-KDM_Login.png"
+#~ msgstr "23-Tjener-KDM_Login.png"
+
+#~ msgid "24-Tjener-KDE_Start.png"
+#~ msgstr "24-Tjener-KDE_Start.png"
+
+#~ msgid "26-Tjener-KDE_Desktop_Browser.png"
+#~ msgstr "26-Tjener-KDE_Desktop_Browser.png"
+
+#~ msgid "27-Tjener-KDE_Desktop.png"
+#~ msgstr "27-Tjener-KDE_Desktop.png"
+
+#~ msgid "29-Diskless-WS-KDM_Login.png"
+#~ msgstr "29-Diskless-WS-KDM_Login.png"
+
+#~ msgid "30-ThinClient-LDM_Login.png"
+#~ msgstr "30-ThinClient-LDM_Login.png"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#~ msgid "Debian Edu desktop"
+#~ msgstr "Debian-Edu-Arbeitsfläche"
+
+#~ msgid "GOsa² overview page after login as the first user"
+#~ msgstr "GOsa²-Übersichtsseite nach dem Anmelden als Erstbenutzer"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
+#~ "to install the main server, all user passwords exept that one for the "
+#~ "first user will expire in only 2 days.  To fix this, please execute the "
+#~ "following script in a terminal.  This script is included in r1."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Bitte beachten:</emphasis> Wenn die "
+#~ "Installation des Hauptservers mittels Wheezy/r0 erfolgte, verlieren alle "
+#~ "Passwörter mit Ausnahme desjenigen des Erstbenutzers nach nur zwei Tagen "
+#~ "ihre Gültigkeit. Um dies zu reparieren, führen Sie bitte das folgende "
+#~ "Skript in einem Terminal aus. Das Skript ist in der Version r1 enthalten."
+
+#~ msgid ""
+#~ "#!/bin/bash\n"
+#~ "  #\n"
+#~ "  # /usr/share/debian-edu-config/tools/password-fix-wheezy-r0\n"
+#~ "  #\n"
+#~ "  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
+#~ "  # in Debian Edu Wheezy up to r0; for new users the password will\n"
+#~ "  # never expire. For existing users this will be the case after they've\n"
+#~ "  # changed their password. Give old users the chance to change the\n"
+#~ "  # password, exclude not affected accounts: templates and first user.\n"
+#~ "  #\n"
+#~ "  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|"
+#~ "newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
+#~ "    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
+#~ "  done\n"
+#~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
+#~ msgstr ""
+#~ "#!/bin/bash\n"
+#~ "  #\n"
+#~ "  # /usr/share/debian-edu-config/tools/password-fix-wheezy-r0\n"
+#~ "  #\n"
+#~ "  # Den Verfall von Passwörtern nach 2 Tagen stoppen (#664596), "
+#~ "irrtümlicherweise in\n"
+#~ "  # Debian Edu Wheezy bis r0 enthalten; für neue Benutzer wird das "
+#~ "Passwort nie \n"
+#~ "  # verfallen. Für bereits vorhandene Kennungen wird dies nach einer "
+#~ "Passwortänderung\n"
+#~ "  # der Fall sein. Alte Benutzer sollten die Chance zur Passwortänderung "
+#~ "bekommen,\n"
+#~ "  # nicht betroffene Kennungen werden ausnommen: Templates und "
+#~ "Erstbenutzer.\n"
+#~ "  #\n"
+#~ "  for i in $(getent passwd | grep home0 | egrep -v 'newteacher|"
+#~ "newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
+#~ "    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
+#~ "  done\n"
+#~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
+
+#~ msgid "Filterbox"
+#~ msgstr "Filterbox"
+
+#~ msgid "Editing user data"
+#~ msgstr "Benutzerdaten bearbeiten"
+
+#~ msgid "Set user password"
+#~ msgstr "Benutzer-Passwort setzen"
+
+#~ msgid "create group"
+#~ msgstr "Gruppe anlegen"
+
+#~ msgid "GOsa² systems listing"
+#~ msgstr "GOsa² systems listing"
+
+#~ msgid "Host details"
+#~ msgstr "Rechnereigenschaften"
+
+#~ msgid "Modify host"
+#~ msgstr "Rechner modifizieren"
+
+#~ msgid "Add netgroup"
+#~ msgstr "»Netgroup« hinzufügen"
+
+#~ msgid "slbackup-php Maintenance"
+#~ msgstr "slbackup-php Wartung"
+
+#~ msgid ""
+#~ "The Debian Edu Wheezy Manual has generally been cleaned up and improved. "
+#~ "A proof-read with corrections was done by a native English linguist."
+#~ msgstr ""
+#~ "Das Benutzerhandbuch für Debian Edu »Wheezy« wurde überarbeitet und "
+#~ "verbessert. Es erfolgte ein Korrekturlesen mit Fehlerbeseitigung durch "
+#~ "einen Linguisten mit Englisch als Muttersprache."
+
+#~ msgid ""
+#~ "gosa (2.6.11-3+wheezy1~edu+1) from the upcoming 6.0.5 Debian point "
+#~ "release, with:"
+#~ msgstr ""
+#~ "gosa (2.6.11-3+wheezy1~edu+1) aus dem kommenden Debian-Point-Release "
+#~ "6.0.5, mit:"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
similarity index 93%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index d5bf65c..ccf0d09 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -1,7 +1,7 @@
 # translation of release-manual.pot to Spanish
 # release-manual for debian edu
 # Copyright (C) 2007 Holger Levsen and others
-# Source URL: http://wiki.debian.org/DebianEdu/Documentation/Etch/
+# Source URL: http://wiki.debian.org/DebianEdu/Documentation/Lenny/
 # Copyright (C) 2007 José L. Redrejo Rodríguez <jredrejo at edu.juntaextremadura.net>, 2007.
 # <>, 2009, 2010.
 # <>, 2010.
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-14 14:40-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,32 +27,30 @@ 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 Wheezy 7.0.0+r0 Manual"
+msgstr "Debian Edu / Skolelinux 7.0.0+r0 Wheezy"
 
 #. 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 7.0.0+r0 Codename \"Wheezy\""
+msgstr "Manual para Debian-Edu 7.0.0+r0 rc2 nombre código \"Wheezy\""
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr "./images/welcome_to_tjener.png"
-
-#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu login"
-msgstr "Inicio de sesión Debian Edu"
+#. type: Content of: <article><section><para>
+msgid ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
+msgstr ""
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
-msgstr "Este es el manual de Debian-Edu Squeeze 6.0.6+r1"
+msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgstr "Este es el manual de Debian-Edu Wheezy 7.0.0+r0"
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> is a wiki and updated frequently."
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
-"La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> es un wiki actualizado frecuentemente."
+"La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy"
+"\"/> es un wiki actualizado frecuentemente."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -207,8 +205,8 @@ msgid "Network"
 msgstr "Red"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Debian_Edu_Network_Squeeze.png"
-msgstr "./images/Debian_Edu_Network_Squeeze.png"
+msgid "./images/Debian_Edu_Network_Wheezy.png"
+msgstr "./images/Debian_Edu_Network_Wheezy.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
@@ -603,8 +601,8 @@ msgstr ""
 #| "school has a fixed Internet-connection. Mailing lists are set up based on "
 #| "the user database, giving each class their own mailing list. Clients are "
 #| "set up to deliver mail to the server (using 'smarthost'), and users can "
-#| "<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
-#| "Architecture/DebianEdu/Documentation/Squeeze/HowTo/Users#Usingemail"
+#| "<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/"
+#| "Architecture/DebianEdu/Documentation/Wheezy/HowTo/Users#Usingemail"
 #| "\">access their personal mail</ulink> through either POP3 or IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
@@ -621,8 +619,8 @@ msgstr ""
 "utilizando la información en la base de datos de usuario, dando a cada clase "
 "su propia lista de correo. Los clientes están configurados para entregar "
 "correo al servidor (usando 'smarthost'), y los usuarios pueden <ulink url="
-"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/Architecture/"
-"DebianEdu/Documentation/Squeeze/HowTo/Users#Usingemail\">acceder a su correo "
+"\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Architecture/"
+"DebianEdu/Documentation/Wheezy/HowTo/Users#Usingemail\">acceder a su correo "
 "personal </ulink>mediante POP3 o IMAP."
 
 #. type: Content of: <article><section><section><section><para>
@@ -1236,16 +1234,16 @@ msgstr "Requisitos de hardware"
 #, fuzzy
 #| msgid ""
 #| "The purpose of the different profiles is explained in the <ulink url="
-#| "\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/Requirements/"
-#| "DebianEdu/Documentation/Squeeze/Architecture#\">network architecture</"
+#| "\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Requirements/"
+#| "DebianEdu/Documentation/Wheezy/Architecture#\">network architecture</"
 #| "ulink> chapter."
 msgid ""
 "The purpose of the different profiles is explained in the <link linkend="
 "\"Architecture\">network architecture</link> chapter."
 msgstr ""
 "El propósito de los diferentes perfiles es explicado en  el capítulo <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/Requirements/"
-"DebianEdu/Documentation/Squeeze/Architecture#\">Arquitecturas de red</ulink>."
+"url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Requirements/"
+"DebianEdu/Documentation/Wheezy/Architecture#\">Arquitecturas de red</ulink>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1576,8 +1574,8 @@ msgstr ""
 #| "procedure</ulink> to do this. If you are not forced to do this by an "
 #| "existing network infrastructure, we recommend against doing so and "
 #| "recommend you stay with the default <ulink url=\"http://wiki.debian.org/"
-#| "DebianEdu/Documentation/Squeeze/Requirements/DebianEdu/Documentation/"
-#| "Squeeze/Architecture#\">network architecture</ulink>."
+#| "DebianEdu/Documentation/Wheezy/Requirements/DebianEdu/Documentation/"
+#| "Wheezy/Architecture#\">network architecture</ulink>."
 msgid ""
 "It is possible to use a different network setup (there is a <ulink url="
 "\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
@@ -1591,8 +1589,8 @@ msgstr ""
 "ChangeIpSubnet\"> proceso documentado </ulink>. Si usted no esta forzado a "
 "utilizar esta configuración en una ingraestructura de red pre-existente, le "
 "recomendamos abstenerse de hacerlo, y mantener la <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Squeeze/Requirements/DebianEdu/"
-"Documentation/Squeeze/Architecture#\">configuración predeterminada de la "
+"debian.org/DebianEdu/Documentation/Wheezy/Requirements/DebianEdu/"
+"Documentation/Wheezy/Architecture#\">configuración predeterminada de la "
 "arquitectura de red </ulink>."
 
 #. type: Content of: <article><section><title>
@@ -1609,21 +1607,21 @@ msgstr "Donde encontrar información adicional"
 #, fuzzy
 #| msgid ""
 #| "We recommend that you read or at least take a look at the <ulink url="
-#| "\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-#| "Debian Squeeze</ulink> before you start installing a system for "
-#| "production use. Please give Debian Edu/Skolelinux a try, it should just "
-#| "work. <placeholder type=\"inlinemediaobject\" id=\"0\"/>"
+#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+#| "Debian Wheezy</ulink> before you start installing a system for production "
+#| "use. Please give Debian Edu/Skolelinux a try, it should just work. "
+#| "<placeholder type=\"inlinemediaobject\" id=\"0\"/>"
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-"Debian Squeeze</ulink> before you start installing a system for production "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 "Recomendamos leer, o al menos echar un vistazo a las <ulink url=\"http://www."
-"debian.org/releases/squeeze/releasenotes\">notas de la versión Debian "
-"Squeeze</ulink> antes de empezar a usar un sistema para uso en producción. "
-"Si sólo quieres probar Debian-Edu / Skolelinux, debería funcionar "
-"<placeholder type=\"inlinemediaobject\" id=\"0\"/>"
+"debian.org/releases/wheezy/releasenotes\">notas de la versión Debian Wheezy</"
+"ulink> antes de empezar a usar un sistema para uso en producción. Si sólo "
+"quieres probar Debian-Edu / Skolelinux, debería funcionar <placeholder type="
+"\"inlinemediaobject\" id=\"0\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid ":-)"
@@ -1641,43 +1639,43 @@ msgstr "/!\\"
 #, fuzzy
 #| msgid ""
 #| "Be sure to read the <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Squeeze/Installation/%5BDebianEdu/Documentation/Squeeze/"
-#| "GettingStarted#\">[DebianEdu/Documentation/Squeeze/GettingStarted</"
-#| "ulink>] chapter of this manual though, as it explains how to login for "
-#| "the first time."
+#| "Documentation/Wheezy/Installation/%5BDebianEdu/Documentation/Wheezy/"
+#| "GettingStarted#\">[DebianEdu/Documentation/Wheezy/GettingStarted</ulink>] "
+#| "chapter of this manual though, as it explains how to login for the first "
+#| "time."
 msgid ""
 "Be sure to read the <link linkend=\"GettingStarted\">getting started</link> "
 "chapter of this manual, though, as it explains how to log in for the first "
 "time."
 msgstr ""
 "Asegúrese de leer el <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Squeeze/Installation/%5BDebianEdu/Documentation/Squeeze/"
-"GettingStarted#\">[DebianEdu/Documentation/Squeeze/GettingStarted</ulink>] "
+"Documentation/Wheezy/Installation/%5BDebianEdu/Documentation/Wheezy/"
+"GettingStarted#\">[DebianEdu/Documentation/Wheezy/GettingStarted</ulink>] "
 "capítulo de este manual, ya que explica como iniciar sesión por primera vez."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "Further information can be found in the <ulink url=\"http://www.debian."
-#| "org/releases/squeeze/installmanual\">manual of the Debian Installer</"
+#| "org/releases/wheezy/installmanual\">manual of the Debian Installer</"
 #| "ulink>."
 msgid ""
-"Even more information about the Debian Squeeze release is available in its "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Even more information about the Debian Wheezy release is available in its "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
 "Más información puede ser encontrada en el <ulink url=\"http://www.debian."
-"org/releases/squeeze/installmanual\">manual del instalador Debian</ulink>."
+"org/releases/wheezy/installmanual\">manual del instalador Debian</ulink>."
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
 #| msgid ""
 #| "Download the installation media for Debian Edu 6.0.3 beta1 Codename "
-#| "\"Squeeze\""
+#| "\"Wheezy\""
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
-"Descargar un formato de instalación para Debian Edu 6.0.3 beta1 \"Squeeze\""
+"Descargar un formato de instalación para Debian Edu 6.0.3 beta1 \"Wheezy\""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
@@ -1700,40 +1698,46 @@ msgstr ""
 "con arquitecturas i386 y amd64. Para descargarlo puede utilizar cualquiera "
 "de estos métodos:"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-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-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-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-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/"
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-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-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/debian-"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
@@ -1753,37 +1757,37 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/"
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/debian-"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
@@ -1800,41 +1804,41 @@ msgstr "Los archivos fuente estan disponibles vía: "
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 #| "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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
 "ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 #| "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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
 "ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/"
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/squeeze-beta/debian-"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
@@ -1908,16 +1912,10 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Seleccione el tipo de instalación"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "01-Installer_boot_menu.png"
-msgid "Installer boot menu"
+msgid "[attachment:01-Installer_boot_menu.png]"
 msgstr "01-Installer_boot_menu.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1992,17 +1990,12 @@ msgstr ""
 "<emphasis role='strong'>POR CORREGIR</emphasis>, por ahora unas indicaciones "
 "básicas:"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "01-Installer_boot_menu.png"
-msgid "./images/Installer_advanced_options_a.png"
+msgid "[attachment:Installer_advanced_options_a.png]"
 msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-msgid "Installer advanced options screen 1"
-msgstr "Opciones de instalación"
-
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid ""
@@ -2065,17 +2058,12 @@ msgid ""
 "preseed file."
 msgstr "<emphasis role=\"strong\">Valores local</emphasis>"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "01-Installer_boot_menu.png"
-msgid "./images/Installer_advanced_options_b.png"
+msgid "[attachment:Installer_advanced_options_b.png]"
 msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-msgid "Installer advanced options screen 2"
-msgstr "Opciones de instalación"
-
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid ""
@@ -2134,16 +2122,12 @@ msgstr ""
 "<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
 "indicaciones básicas:"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "01-Installer_boot_menu.png"
-msgid "./images/Installer_help.png"
+msgid "[attachment:Installer_help.png]"
 msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer help screen"
-msgstr "Ventanas de ayuda de la instalación."
-
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
@@ -2279,7 +2263,7 @@ msgstr "El proceso de instalación "
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">system requirements</ulink> and make sure you have at "
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
@@ -2400,8 +2384,8 @@ msgstr ""
 #| "Clients without hard drives boot and run software from this server. This "
 #| "computer needs two network cards, a lot of memory, and ideally more than "
 #| "one processor or core. See the chapter about <ulink url=\"http://wiki."
-#| "debian.org/DebianEdu/Documentation/Squeeze/Installation/DebianEdu/"
-#| "Documentation/Squeeze/HowTo/NetworkClients#\">networked clients</ulink> "
+#| "debian.org/DebianEdu/Documentation/Wheezy/Installation/DebianEdu/"
+#| "Documentation/Wheezy/HowTo/NetworkClients#\">networked clients</ulink> "
 #| "for more information on this subject. Chosing this profile also enables "
 #| "the workstation profile (even if it is not selected), a thin client "
 #| "server can always be used as a workstation, too."
@@ -2419,7 +2403,7 @@ msgstr ""
 "aplicaciones desde el servidor. Estas computadoras necesitan al menos, dos "
 "tarjetas de red, mucha memoria e idealmente más de un procesador o núcleo. "
 "Revise el capítulo relacionado a   <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Documentation/Squeeze/Installation/DebianEdu/Documentation/Squeeze/"
+"DebianEdu/Documentation/Wheezy/Installation/DebianEdu/Documentation/Wheezy/"
 "HowTo/NetworkClients#\">clientes de red</ulink> para mayor información en "
 "este tema. Seleccionar este perfil también habilita el perfil de estación de "
 "trabajo (aún si no es seleccionado), un servidor de clientes delgados, "
@@ -2581,13 +2565,13 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2617,7 +2601,7 @@ msgstr ""
 "variarán de acuerdo al perfil seleccionado:"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
+msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2653,41 +2637,6 @@ msgid "Minimal: 12 of 83 MiB downloaded."
 msgstr "Mínimo: 12 de 83 MiB descargados."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on some RAID controllers"
-msgstr "Una nota sobre los controladores RAID"
-
-#. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When using a USB drive to add missing firmware during install, with some "
-#| "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-#| "installation results in a GRUB-error. A workaround for this problem is to "
-#| "remove the USB drive after the firmware is loaded, and preferably before "
-#| "partitioning starts."
-msgid ""
-"When using a USB drive to add missing firmware during install, with some "
-"RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-"installation results in a GRUB error. A workaround for this problem is to "
-"remove the USB drive after the firmware is loaded, and preferably before "
-"partitioning starts."
-msgstr ""
-"Cuando se utiliza un pendrive USB para agregar firmware necesario durante la "
-"instalación, algunas controladoras RAID, GRUB es instalado en el pendrive "
-"USB. Así que despues de reiniciar de la instalación, recibirá un error de "
-"gruB. Una forma de arreglarlo es el retirar el pendrive despúes que se "
-"instale el firmware, y preferiblemente antes que inicie el particionado."
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-msgstr ""
-"Más información esta disponible en <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>. "
-
-#. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
 msgstr "Una nota sobre la instalación de servidores de clientes ligeros"
 
@@ -2831,14 +2780,10 @@ msgstr ""
 "Así es como el menú PXE se mira con el perfil <emphasis role=\"strong"
 "\">Servidor-Principal</emphasis>"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid "pxe-tjener.png"
-msgid "./images/pxe-tjener.png"
-msgstr "pxe-tjener.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "pxe-tjener.png"
+msgid "[attachment:pxe-tjener.png]"
 msgstr "pxe-tjener.png"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2856,14 +2801,10 @@ msgstr ""
 "\">Servidor-Principal</emphasis> y <emphasis role=\"strong\">Servidor-"
 "Clientes-Ligeros</emphasis>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2885,17 +2826,17 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "More information about network clients can be found in the <ulink url="
-#| "\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/Installation/"
-#| "DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#\">Network clients "
+#| "\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Installation/"
+#| "DebianEdu/Documentation/Wheezy/HowTo/NetworkClients#\">Network clients "
 #| "HowTo</ulink> chapter."
 msgid ""
 "More information about network clients can be found in the <link linkend="
 "\"NetworkClients\">Network clients HowTo</link> chapter."
 msgstr ""
 "Más información acerca de los clientes de red puede ser encontrada en el "
-"capítulo  <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Installation/DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#"
-"\">Como clientes de red</ulink>."
+"capítulo  <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/"
+"Installation/DebianEdu/Documentation/Wheezy/HowTo/NetworkClients#\">Como "
+"clientes de red</ulink>."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Modifying PXE installations"
@@ -2923,8 +2864,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 ""
@@ -2942,10 +2883,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 "Más información puede ser encontrada en el <ulink url=\"http://www.debian."
-"org/releases/squeeze/installmanual\">manual del instalador Debian</ulink>."
+"org/releases/wheezy/installmanual\">manual del instalador Debian</ulink>."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -3039,304 +2980,182 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "FIXME: these screenshots need to be redone once we have wheezy artwork"
+msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "02-select_a_language.png"
-msgid "./images/02-select_a_language.png"
-msgstr "02-select_a_language.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "02-select_a_language.png"
+msgid "[attachment:02-select_a_language.png]"
 msgstr "02-select_a_language.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "03-select_your_location.png"
-msgid "./images/03-select_your_location.png"
-msgstr "03-select_your_location.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "03-select_your_location.png"
+msgid "[attachment:03-select_your_location.png]"
 msgstr "03-select_your_location.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "04-Configure_the_keyboard.png"
-msgid "./images/04-Configure_the_keyboard.png"
+msgid "[attachment:04-Configure_the_keyboard.png]"
 msgstr "04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "04-Configure_the_keyboard.png"
-msgstr "04-Configure_the_keyboard.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "05-Detect_and_mount_CD-ROM.png"
-msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "05-Detect_and_mount_CD-ROM.png"
+msgid "[attachment:05-Detect_and_mount_CD-ROM.png]"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "06-Load_installer_components_from_CD.png"
-msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr "06-Load_installer_components_from_CD.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "06-Load_installer_components_from_CD.png"
+msgid "[attachment:06-Load_installer_components_from_CD.png]"
 msgstr "06-Load_installer_components_from_CD.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "07-Detect_network_hardware.png"
-msgid "./images/07-Detect_network_hardware.png"
-msgstr "07-Detect_network_hardware.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "07-Detect_network_hardware.png"
+msgid "[attachment:07-Detect_network_hardware.png]"
 msgstr "07-Detect_network_hardware.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "08-Choose_Debian_Edu_profile.png"
-msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
 msgstr "08-Choose_Debian_Edu_profile.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "08-Choose_Debian_Edu_profile.png"
-msgstr "08-Choose_Debian_Edu_profile.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "11-Participate_in_the_package_usage_survey.png"
-msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "11-Participate_in_the_package_usage_survey.png"
+msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
 msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
-msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
-msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
-msgid "12a-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "12-Set_up_users_and_passwords.png"
-msgid "./images/12b-Set_up_users_and_passwords.png"
+msgid "[attachment:12-Set_up_users_and_passwords.png]"
 msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "12-Set_up_users_and_passwords.png"
-msgid "12b-Set_up_users_and_passwords.png"
+msgid "[attachment:12a-Set_up_users_and_passwords.png]"
 msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "12-Set_up_users_and_passwords.png"
-msgid "./images/12c-Set_up_users_and_passwords.png"
+msgid "[attachment:12b-Set_up_users_and_passwords.png]"
 msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "12-Set_up_users_and_passwords.png"
-msgid "12c-Set_up_users_and_passwords.png"
+msgid "[attachment:12c-Set_up_users_and_passwords.png]"
 msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "13-Install the base system.png"
-msgid "./images/13-Install+the+base+system.png"
-msgstr "13-Install the base system.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "13-Install the base system.png"
+msgid "[attachment:13-Install the base system.png]"
 msgstr "13-Install the base system.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "14-Select_and_install_software.png"
-msgid "./images/14-Select_and_install_software.png"
-msgstr "14-Select_and_install_software.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "14-Select_and_install_software.png"
+msgid "[attachment:14-Select_and_install_software.png]"
 msgstr "14-Select_and_install_software.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "17-Select_and_install_software.png"
-msgid "./images/17-Select_and_install_software.png"
+msgid "[attachment:17-Select_and_install_software.png]"
 msgstr "17-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "17-Select_and_install_software.png"
-msgstr "17-Select_and_install_software.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "18-Build LTSP chroot.png"
-msgid "./images/18-Build+LTSP+chroot.png"
-msgstr "18-Build LTSP chroot.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "18-Build LTSP chroot.png"
+msgid "[attachment:18-Build LTSP chroot.png]"
 msgstr "18-Build LTSP chroot.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "20-Finish_the_Installation.png"
-msgid "./images/20-Finish_the_Installation.png"
-msgstr "20-Finish_the_Installation.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "20-Finish_the_Installation.png"
+msgid "[attachment:20-Finish_the_Installation.png]"
 msgstr "20-Finish_the_Installation.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "21-Finish_the_Installation-Installation_complete.png"
-msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "21-Finish_the_Installation-Installation_complete.png"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr "22-Tjener_GRUB_boot_menu.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "22-Tjener_GRUB_boot_menu.png"
+msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "23-Tjener-KDM_Login.png"
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "23-Tjener-KDM_Login.png"
+msgid "[attachment:23-Tjener-KDM_Login.png]"
 msgstr "23-Tjener-KDM_Login.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "24-Tjener-KDE_Start.png"
-msgid "./images/24-Tjener-KDE_Start.png"
-msgstr "24-Tjener-KDE_Start.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "24-Tjener-KDE_Start.png"
+msgid "[attachment:24-Tjener-KDE_Start.png]"
 msgstr "24-Tjener-KDE_Start.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "26-Tjener-KDE_Desktop_Browser.png"
-msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 msgstr "26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "26-Tjener-KDE_Desktop_Browser.png"
-msgstr "26-Tjener-KDE_Desktop_Browser.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "27-Tjener-KDE_Desktop.png"
-msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr "27-Tjener-KDE_Desktop.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "27-Tjener-KDE_Desktop.png"
+msgid "[attachment:27-Tjener-KDE_Desktop.png]"
 msgstr "27-Tjener-KDE_Desktop.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "29-Diskless-WS-KDM_Login.png"
-msgid "./images/29-Diskless-WS-KDM_Login.png"
-msgstr "29-Diskless-WS-KDM_Login.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "29-Diskless-WS-KDM_Login.png"
+msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
 msgstr "29-Diskless-WS-KDM_Login.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "30-ThinClient-LDM_Login.png"
-msgid "./images/30-ThinClient-LDM_Login.png"
-msgstr "30-ThinClient-LDM_Login.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "30-ThinClient-LDM_Login.png"
+msgid "[attachment:30-ThinClient-LDM_Login.png]"
 msgstr "30-ThinClient-LDM_Login.png"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "31-ThinClient-KDE_Desktop.png"
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
+msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
 msgstr "31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -3418,7 +3237,7 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "The following <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Squeeze/GettingStarted/DebianEdu/Documentation/Squeeze/HowTo#\">HowTo</"
+#| "Wheezy/GettingStarted/DebianEdu/Documentation/Wheezy/HowTo#\">HowTo</"
 #| "ulink> chapter covers more tips and tricks and some frequently asked "
 #| "questions."
 msgid ""
@@ -3426,17 +3245,13 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 "El capítulo  <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/GettingStarted/DebianEdu/Documentation/Squeeze/HowTo#\">como</ulink> "
+"Wheezy/GettingStarted/DebianEdu/Documentation/Wheezy/HowTo#\">como</ulink> "
 "describe más trucos, pistas y preguntas frecuentes."
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/getting-started-desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:getting-started-desktop.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu desktop"
-msgstr "Escritorio Debian Edu"
-
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid ""
@@ -3502,7 +3317,7 @@ msgid ""
 "server_to_use_GOsa.2BALI-\">Installing a graphical environment on the main-"
 "server to use GOsa²</link>."
 msgstr ""
-"<ulink url=\"/DebianEdu/Documentation/Etch/Requirements\">Requisitos</"
+"<ulink url=\"/DebianEdu/Documentation/Lenny/Requirements\">Requisitos</"
 "ulink>para usar Debian-Edu"
 
 #. type: Content of: <article><section><section><para>
@@ -3523,10 +3338,10 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "In case you <emphasis role=\"strong\">are</emphasis> using a new Debian "
-#| "Edu Squeeze machine, the override rule will be already in place and you "
+#| "Edu Wheezy machine, the override rule will be already in place and you "
 #| "can't be bothered."
 msgid ""
-"If you are using a new Debian Edu Squeeze machine, the site certificate will "
+"If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
 "En caso que usted<emphasis role=\"strong\"> esté </emphasis> utilizando un "
@@ -3556,12 +3371,8 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa2_overview.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² overview page after login as the first user"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:gosa2_overview.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3713,43 +3524,12 @@ msgid ""
 "within your network."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Please note:</emphasis> If Squeeze/r0 was used to "
-"install the main server, all user passwords exept that one for the first "
-"user will expire in only 2 days.  To fix this, please execute the following "
-"script in a terminal.  This script is included in r1."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
 msgstr "Buscar, modificar y borrar usuarios"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/filterbox.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Filterbox"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:filterbox.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3785,14 +3565,10 @@ msgstr ""
 "al usuario directamente, cambiar su contraseña y modificar la lista de "
 "grupos a los que pertenece."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/edit_user.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:edit_user.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Editing user data"
-msgstr "Editar datos de usuarios"
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
 msgstr "Establecer contraseñas"
@@ -3839,18 +3615,12 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><para>
 #, fuzzy
-msgid "./images/change_password_administratively.png"
+msgid "[attachment:change_password_administratively.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
-"png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Set passwords"
-msgid "Set user password"
-msgstr "Establecer contraseñas"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+"arch.]png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -3958,16 +3728,12 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestión de Usuarios con lwat"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/create_group.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:create_group.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "create group"
-msgstr "crear un grupo"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/list_groups.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:list_groups.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4014,15 +3780,15 @@ 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>
 #, fuzzy
 #| msgid ""
 #| "This is explained in more detail in the <ulink url=\"http://wiki.debian."
-#| "org/DebianEdu/Documentation/Squeeze/GettingStarted/DebianEdu/"
-#| "Documentation/Squeeze/HowTo/"
+#| "org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/Documentation/"
+#| "Wheezy/HowTo/"
 #| "NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration"
 #| "\">HowTo/NetworkClients</ulink> chapter of this manual."
 msgid ""
@@ -4031,8 +3797,8 @@ msgid ""
 "\">HowTo/NetworkClients</link> chapter of this manual."
 msgstr ""
 "Esto se explica detalladamente en el capítulo <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Squeeze/GettingStarted/DebianEdu/"
-"Documentation/Squeeze/HowTo/"
+"debian.org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/"
+"Documentation/Wheezy/HowTo/"
 "NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration"
 "\">Guía para clientes de red</ulink> en este manual."
 
@@ -4050,8 +3816,8 @@ msgstr "Administración de equipos con lwat"
 #| "using lwat has a hostname, an IP-address, a MAC-address and a domain name "
 #| "which usually is \"intern\". For a more verbose description about the "
 #| "Debian Edu architecture see the <ulink url=\"http://wiki.debian.org/"
-#| "DebianEdu/Documentation/Squeeze/GettingStarted/DebianEdu/Documentation/"
-#| "Squeeze/Architecture#\">architecture</ulink> chapter of this manual."
+#| "DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/Documentation/"
+#| "Wheezy/Architecture#\">architecture</ulink> chapter of this manual."
 msgid ""
 "Machine management basically allows you to manage all networked devices in "
 "your Debian Edu network. Every machine added to the LDAP directory using "
@@ -4065,8 +3831,8 @@ msgstr ""
 "utilizando lwat, tiene un nombre de equipo, dirección IP, dirección MAC y un "
 "dominio, que regularmente es \"interno\". Para una mayor descripción acerca "
 "de la arquitectura de DebianEdu, vea el capítulo  <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Squeeze/GettingStarted/DebianEdu/"
-"Documentation/Squeeze/Architecture#\">architectura</ulink> en este manual."
+"debian.org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/"
+"Documentation/Wheezy/Architecture#\">architectura</ulink> en este manual."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4115,52 +3881,36 @@ msgstr ""
 #, no-wrap
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "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>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "13-Install the base system.png"
-msgid "./images/gosa_systems_list.png"
+msgid "[attachment:gosa_systems_list.png]"
 msgstr "13-Install the base system.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² systems listing"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_host_details.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Host details"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_edit_host.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_host_details.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Modify host"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_edit_host.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "13-Install the base system.png"
-msgid "./images/gosa_systems_add_netgroup.png"
+msgid "[attachment:gosa_systems_add_netgroup.png]"
 msgstr "13-Install the base system.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Add netgroup"
-msgstr ""
-
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4384,8 +4134,8 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "This is explained in more detail in the <ulink url=\"http://wiki.debian."
-#| "org/DebianEdu/Documentation/Squeeze/GettingStarted/DebianEdu/"
-#| "Documentation/Squeeze/HowTo/"
+#| "org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/Documentation/"
+#| "Wheezy/HowTo/"
 #| "NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration"
 #| "\">HowTo/NetworkClients</ulink> chapter of this manual."
 msgid ""
@@ -4399,8 +4149,8 @@ msgid ""
 "\">HowTo/NetworkClients</link> chapter of this manual."
 msgstr ""
 "Esto se explica detalladamente en el capítulo <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Squeeze/GettingStarted/DebianEdu/"
-"Documentation/Squeeze/HowTo/"
+"debian.org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/"
+"Documentation/Wheezy/HowTo/"
 "NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration"
 "\">Guía para clientes de red</ulink> en este manual."
 
@@ -4447,14 +4197,14 @@ msgstr ""
 #. type: Content of: <article><section><para>
 #, fuzzy
 #| msgid ""
-#| "<placeholder type=\"inlinemediaobject\" id=\"0\"/> there are no squeeze "
+#| "<placeholder type=\"inlinemediaobject\" id=\"0\"/> there are no wheezy "
 #| "images yet <placeholder type=\"inlinemediaobject\" id=\"1\"/>"
 msgid ""
 "If you use dialup or ISDN and pay per minute, you want to change this "
 "default setting."
 msgstr ""
 "<placeholder type=\"inlinemediaobject\" id=\"0\"/> aún no hay imágenes de "
-"squeeze <placeholder type=\"inlinemediaobject\" id=\"1\"/>"
+"wheezy <placeholder type=\"inlinemediaobject\" id=\"1\"/>"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -4481,7 +4231,7 @@ msgid ""
 "Resizing_Partitions\">administration HowTo chapter</link> for more "
 "information."
 msgstr ""
-"<ulink url=\"/DebianEdu/Documentation/Etch/Requirements\">Requisitos</"
+"<ulink url=\"/DebianEdu/Documentation/Lenny/Requirements\">Requisitos</"
 "ulink>para usar Debian-Edu"
 
 #. type: Content of: <article><section><title>
@@ -4594,14 +4344,14 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "<placeholder type=\"inlinemediaobject\" id=\"0\"/> there are no squeeze "
+#| "<placeholder type=\"inlinemediaobject\" id=\"0\"/> there are no wheezy "
 #| "images yet <placeholder type=\"inlinemediaobject\" id=\"1\"/>"
 msgid ""
 "Be aware that this backup scheme doesn't protect you from failing hard "
 "drives."
 msgstr ""
 "<placeholder type=\"inlinemediaobject\" id=\"0\"/> aún no hay imágenes de "
-"squeeze <placeholder type=\"inlinemediaobject\" id=\"1\"/>"
+"wheezy <placeholder type=\"inlinemediaobject\" id=\"1\"/>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4622,7 +4372,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>
@@ -4647,18 +4397,12 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "pxe-tjener.png"
-msgid "./images/slbackup-php_maintenance.png"
+msgid "[attachment:slbackup-php_maintenance.png]"
 msgstr "pxe-tjener.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Maintainance"
-msgid "slbackup-php Maintenance"
-msgstr "Mantenimiento"
-
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Monitorización del servidor"
@@ -4734,8 +4478,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 ""
@@ -4903,7 +4647,7 @@ msgid ""
 "administrators can be found in the <link linkend=\"Administration"
 "\">Administration Howto chapter</link>."
 msgstr ""
-"<ulink url=\"/DebianEdu/Documentation/Etch/Requirements\">Requisitos</"
+"<ulink url=\"/DebianEdu/Documentation/Lenny/Requirements\">Requisitos</"
 "ulink>para usar Debian-Edu"
 
 #. type: Content of: <article><section><title>
@@ -4968,7 +4712,7 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Further information can be found in the <ulink url=\"http://www.debian."
-#| "org/releases/squeeze/installmanual\">manual of the Debian Installer</"
+#| "org/releases/wheezy/installmanual\">manual of the Debian Installer</"
 #| "ulink>."
 msgid ""
 "Make sure to also read the information about the current Debian Stable "
@@ -4976,7 +4720,7 @@ msgid ""
 "installmanual\">installation manual</ulink>."
 msgstr ""
 "Más información puede ser encontrada en el <ulink url=\"http://www.debian."
-"org/releases/squeeze/installmanual\">manual del instalador Debian</ulink>."
+"org/releases/wheezy/installmanual\">manual del instalador Debian</ulink>."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -4995,12 +4739,12 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-msgid "Upgrades from Debian Edu Lenny"
+msgid "Upgrades from Debian Edu Squeeze"
 msgstr "Actualizar desde Debian-Edu sarge"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Lenny in a test "
+"Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
 
@@ -5012,13 +4756,13 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace "
-#| "all occurances of \"lenny\" with \"squeeze\"."
+#| "all occurances of \"squeeze\" with \"wheezy\"."
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"lenny\" with \"squeeze\"."
+"occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 "Edite <computeroutput> /etc/apt/sources.list</computeroutput> y reemplace "
-"\"lenny\" con \"squeeze\" en las líneas que lo encuentre."
+"\"squeeze\" con \"wheezy\" en las líneas que lo encuentre."
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get update</computeroutput>"
@@ -5040,6 +4784,11 @@ msgstr "el servicio LDAP necesita ser reparado"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
 "accounts, passwords, network settings, services and machines are treated is "
 "quite different now. So LDAP has to be rebuild from scratch. There's a "
@@ -5055,7 +4804,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will automatically support both thin-clients and diskless workstations."
+"will still support both thin-clients and diskless workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5087,21 +4836,21 @@ msgstr ""
 #. type: Content of: <article><section><title>
 #, fuzzy
 #| msgid ""
-#| "Upgrades from older Debian Edu / Skolelinux installations (before lenny)"
+#| "Upgrades from older Debian Edu / Skolelinux installations (before squeeze)"
 msgid ""
-"Upgrades from older Debian Edu / Skolelinux installations (before Lenny)"
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr ""
 "Actualizar desde instalaciones antiguas de Debian-Edu / Skolelinux (antes "
-"que lenny)"
+"que squeeze)"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"To upgrade from any older release, you will need to upgrade to the Lenny-"
+"To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian Edu Lenny</"
-"ulink> about how to upgrade to Lenny from the previous release, Etch, and "
-"the Etch manual covers the one before that!"
+"debian.org/DebianEdu/Documentation/Squeeze#\">Manual for Debian Edu Squeeze</"
+"ulink> about how to upgrade to Squeeze from the previous release, Lenny, and "
+"the Lenny manual covers the one before that! (Etch was it's name.)"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -5113,43 +4862,43 @@ msgstr "HowTo"
 msgid ""
 "HowTos for <link linkend=\"Administration\">general administration</link>"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones</ulink> "
-"de este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones</ulink> "
-"de este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"NetworkClients\">networked clients</link>"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones</ulink> "
-"de este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"Samba\">Samba</link>"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones</ulink> "
-"de este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"TeachAndLearn\">teaching and learning</link>"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones</ulink> "
-"de este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"Users\">users</link>"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones</ulink> "
-"de este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for general administration"
@@ -5158,11 +4907,11 @@ msgstr "Guías para administración general"
 #. type: Content of: <article><section><para>
 #, fuzzy
 #| msgid ""
-#| "The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
-#| "HowTo/Administration/DebianEdu/Documentation/Squeeze/GettingStarted#"
+#| "The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/"
+#| "HowTo/Administration/DebianEdu/Documentation/Wheezy/GettingStarted#"
 #| "\">Getting Started</ulink> and <ulink url=\"http://wiki.debian.org/"
-#| "DebianEdu/Documentation/Squeeze/HowTo/Administration/DebianEdu/"
-#| "Documentation/Squeeze/Maintainance#\">DebianEdu/Documentation/Squeeze/"
+#| "DebianEdu/Documentation/Wheezy/HowTo/Administration/DebianEdu/"
+#| "Documentation/Wheezy/Maintainance#\">DebianEdu/Documentation/Wheezy/"
 #| "Maintainance</ulink> chapters describe how to get started with Debian Edu "
 #| "and how to do the basic maintainance work. The howtos in this chapter "
 #| "have some more \"advanced\" tips and tricks."
@@ -5173,10 +4922,10 @@ msgid ""
 "in this chapter have some more \"advanced\" tips and tricks."
 msgstr ""
 "Los capítulos <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/HowTo/Administration/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"Wheezy/HowTo/Administration/DebianEdu/Documentation/Wheezy/GettingStarted#"
 "\">Iniciando</ulink> y <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Squeeze/HowTo/Administration/DebianEdu/Documentation/Squeeze/"
-"Maintainance#\">DebianEdu/Documentation/Squeeze/Maintainance</ulink> "
+"Documentation/Wheezy/HowTo/Administration/DebianEdu/Documentation/Wheezy/"
+"Maintainance#\">DebianEdu/Documentation/Wheezy/Maintainance</ulink> "
 "describen como empezar con DebianEdu y como realizar el trabajo de "
 "mantenimiento básico. Las guías en estos capítulos, tienen también trucos y "
 "recomendaciones más \"avanzadas\"."
@@ -5264,14 +5013,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 +5040,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 +5051,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 +5061,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 +5140,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 +5168,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 +5197,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>
@@ -5538,8 +5287,8 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5556,8 +5305,8 @@ msgstr "Actualizar con un CD o DVD ROM"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to upgrade from one version to another (for example from Squeeze "
-"6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical "
+"If you want to upgrade from one version to another (for example from Wheezy "
+"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
 "media, follow these steps:"
 msgstr ""
 
@@ -5570,10 +5319,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 +5357,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 +5425,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 +5481,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 +5525,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 +5549,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 +5637,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 +5653,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 +5806,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>
@@ -6082,7 +5831,7 @@ msgid ""
 "If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
 "\"Installation--The_installation_process\">installation instructions</link>."
 msgstr ""
-"<ulink url=\"/DebianEdu/Documentation/Etch/Translations\">Traducciones</"
+"<ulink url=\"/DebianEdu/Documentation/Lenny/Translations\">Traducciones</"
 "ulink> de este documento"
 
 #. type: Content of: <article><section><section><para>
@@ -6094,8 +5843,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 +5886,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"
@@ -6158,9 +5907,9 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6264,7 +6013,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 +6096,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 +6150,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 +6187,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 +6198,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 +6215,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 +6235,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 +6290,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 +6385,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 +6402,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 +6431,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 +6511,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 +6538,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 +6619,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 +6645,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 +6672,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 +6723,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6984,7 +6733,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 +6750,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 +6769,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 +6778,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)"
@@ -7070,7 +6819,7 @@ msgstr ""
 #| "required:"
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr ""
 "Para que los clientes Windows se puedan unir al dominio deben seguirse unos "
 "(pocos) pasos:"
@@ -7116,7 +6865,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 +7245,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7609,7 +7358,7 @@ msgstr "Instalando Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-"
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
 "style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
@@ -7895,7 +7644,7 @@ msgstr ""
 #, fuzzy
 msgid "HowTos for teaching and learning"
 msgstr ""
-"<ulink url=\"/DebianEdu/Documentation/Etch/Translations\">Traducciones</"
+"<ulink url=\"/DebianEdu/Documentation/Lenny/Translations\">Traducciones</"
 "ulink> de este documento"
 
 #. type: Content of: <article><section><para>
@@ -8013,7 +7762,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 +7789,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 +7798,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 +7831,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 +7840,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 +7855,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>
@@ -8289,7 +8038,7 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "The following <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Squeeze/GettingStarted/DebianEdu/Documentation/Squeeze/HowTo#\">HowTo</"
+#| "Wheezy/GettingStarted/DebianEdu/Documentation/Wheezy/HowTo#\">HowTo</"
 #| "ulink> chapter covers more tips and tricks and some frequently asked "
 #| "questions."
 msgid ""
@@ -8298,7 +8047,7 @@ msgid ""
 "<emphasis>support</emphasis> are two sides of the same coin."
 msgstr ""
 "El capítulo  <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/GettingStarted/DebianEdu/Documentation/Squeeze/HowTo#\">como</ulink> "
+"Wheezy/GettingStarted/DebianEdu/Documentation/Wheezy/HowTo#\">como</ulink> "
 "describe más trucos, pistas y preguntas frecuentes."
 
 #. type: Content of: <article><section><section><title>
@@ -8348,13 +8097,13 @@ msgstr ""
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> and you can contribute easily. Note: a user account is needed "
-"to edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 ". (la versión en <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Etch\">http://wiki.debian.org/DebianEdu/Documentation/Etch</ulink> es un "
-"wiki y se actualiza a menudo.) <ulink url=\"/DebianEdu/Documentation/Etch/"
+"Lenny\">http://wiki.debian.org/DebianEdu/Documentation/Lenny</ulink> es un "
+"wiki y se actualiza a menudo.) <ulink url=\"/DebianEdu/Documentation/Lenny/"
 "Translations\">Las traducciones</ulink> son parte del"
 
 #. type: Content of: <article><section><section><para>
@@ -8366,7 +8115,7 @@ msgid ""
 "link> of this book. Please consider helping the translation effort of this "
 "book!"
 msgstr ""
-"<ulink url=\"/DebianEdu/Documentation/Etch/Requirements\">Requisitos</"
+"<ulink url=\"/DebianEdu/Documentation/Lenny/Requirements\">Requisitos</"
 "ulink>para usar Debian-Edu"
 
 #. type: Content of: <article><section><title>
@@ -8503,1576 +8252,1698 @@ msgstr ""
 "http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp</ulink>."
 
 #. type: Content of: <article><section><title>
-msgid "New features in Debian Edu Squeeze"
-msgstr "Nuevas características en Debin Edu Squeeze"
+msgid "New features in Debian Edu Wheezy"
+msgstr "Nuevas características en Debin Edu Wheezy"
+
+#. type: Content of: <article><section><para>
+msgid ""
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
+msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
 #| msgid ""
-#| "New in Debian Edu 6.0.3 beta2 Codename \"Squeeze\" released 2012-01-07"
+#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
+#| "2012-03-11"
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
-"Nuevas características en Debian Edu 6.0.6+r1 nombre código \"Squeeze\" "
+"Nuevas características en Debian Edu 6.0.4+r0 nombre código \"Squeeze\" "
 "publicado el 11-03-2012"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "sitesummary was updated from 0.1.3 to 0.1.8"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Make Nagios configuration more robust and efficient"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-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"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Minor updates from the wiki"
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Danish translation now complete"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
+"installation, in the login screen and as desktop wallpaper."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: hopefully. h01ger is one it to ask gismo."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
-"#664596"
-msgstr ""
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Installation"
+msgid "Installation changes"
+msgstr "Cambios en la instalación"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Further information can be found in the <ulink url=\"http://www.debian."
+#| "org/releases/wheezy/installmanual\">manual of the Debian Installer</"
+#| "ulink>."
 msgid ""
-"Handle '#' characters in the root or first users password. Closes: #664976"
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
+"Más información puede ser encontrada en el <ulink url=\"http://www.debian."
+"org/releases/wheezy/installmanual\">manual del instalador Debian</ulink>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-sync:"
+#. type: Content of: <article><section><section><section><title>
+msgid "Software updates"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't fail if password contains \""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Wheezy:"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't disclose new password string in syslog"
-msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Linux kernel version 2.6.18"
+msgid "Linux kernel 3.2.x"
+msgstr "Versión del kernel linux 2.6.18"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-create:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Invalidate libnss cache before applying changes"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 10 ESR"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Multiple failures during mass user import into GOsa²"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LibreOffice 3.5.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"gosa-netgroups plugin: don't erase entries of attribute type "
-"\"memberNisNetgroup\". Closes: #687256"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 12.01"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "First user now uses the same Kerberos policy as all other users"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 12.04"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Add Danish web page"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.8.2"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.1"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Improve preseeding support and documentation"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.11.3"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Debian Wheezy includes over 10,000 new packages available for installation, "
+"including the Chromium browser"
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Wheezy 6.0 is provided in the <ulink url="
+#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
+#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
+#| "installmanual\">installation manual</ulink>."
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
-"Nuevas características en Debian Edu 6.0.4+r0 nombre código \"Squeeze\" "
-"publicado el 11-03-2012"
+"Más información sobre Debian Wheezy 6.0 puede ser encontrada en las  <ulink "
+"url=\"http://www.debian.org/releases/wheezy/releasenotes\">notas de "
+"publicación</ulink> y el <ulink url=\"http://www.debian.org/releases/wheezy/"
+"installmanual\">manual de instalación</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr ""
+#, fuzzy
+#| msgid "Installation"
+msgid "Infrastructural changes"
+msgstr "Instalación"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
-"installation, in the login screen and as desktop wallpaper."
+msgid "FIXME: to be documented, if any"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Documentation and translation updates"
+msgstr "Actualizaciones en documentación y traducciones"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <link linkend=\"GettingStarted\">Getting started chapter</link> of the "
-"manual for more information on GOsa²."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in FIXME languages."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "See below for a list of updated software."
+msgid ""
+"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
+"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Show welcome page to users when they first log in. This default start page "
-"for Iceweasel is fetched from LDAP at installation and boot time for "
-"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
-"Standalone installations."
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
-"installation method."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Sound with LTSP clients"
-msgid "Speed up LTSP client boot."
-msgstr "Sonido con clientes LTSP"
+#| msgid "package on"
+msgid "Other changes"
+msgstr "paquete en"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Provide a KDE menu entry for changing the password in GOsa²."
-msgstr ""
+#. type: Content of: <article><section><title>
+msgid "Copyright and authors"
+msgstr "Copyright y authores"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"For more information on how to change passwords (including expired passwords "
-"at the KDM/GDM login prompt), please see the <link linkend=\"Users\">HowTos "
-"for users</link> chapter of the manual."
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
+"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
+"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
+"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
+"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
+"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
+"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
+"GPL2 or any later version. Enjoy!"
 msgstr ""
+"Esto documento ha sido escrito con copyright de Holger Levsen, Petter "
+"Reinholdtsen, Daniel Heß and Patrick Winnertz  2007 y distribuido bajo la "
+"licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
-"shown to new users."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the GPL2 or later version."
 msgstr ""
+"¡Si le añades contenido <emphasis role=\"strong\"> hazlo sólo si eres su "
+"autor y planeas liberarlo bajo las mismas condiciones !</emphasis>. Después "
+"añade tu nombre aquí y libéralo bajo la GPL2 o posterior."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
+msgid "Translation copyright and authors"
+msgstr "Copyright de la traducción y Autores"
+
+#. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "all LTSP servers are now <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Squeeze/HowTo/NetworkClients#RemoteDesktopsService\">RDP "
-#| "servers by default</ulink> too"
 msgid ""
-"All LTSP servers are also <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP servers</link> by default."
+"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"todos los servidores de LTSP son ahora <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#RemoteDesktopsservice"
-"\">Servidores VNC por defecto</ulink> también."
+"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
+"está bajo la licencia GPL2 o versiones posteriores."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"Improve handing of removable media on thin clients. Show desktop "
-"notification longer when inserting new media and provide an option to start "
-"dolphin when such media is inserted."
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
+"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
+"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
 msgstr ""
+"La traducción a noruego es copyright 2007 de Petter Reinholdtsen y está bajo "
+"la licencia GPL2 o versiones posteriores."
 
-#. type: Content of: <article><section><section><section><title>
+#. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid "Installation"
-msgid "Installation changes"
-msgstr "Cambios en la instalación"
+msgid ""
+"The German translation is copyrighted by Holger Levsen (2007), Patrick "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
+"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
+"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
+"and is released under the GPL2 or any later version."
+msgstr ""
+"La traducción a alemán es copyright 2007 de Holger Levsen y está bajo la "
+"licencia GPL2 o versiones posteriores."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "Further information can be found in the <ulink url=\"http://www.debian."
-#| "org/releases/squeeze/installmanual\">manual of the Debian Installer</"
-#| "ulink>."
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
-"for more details."
+"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
-"Más información puede ser encontrada en el <ulink url=\"http://www.debian."
-"org/releases/squeeze/installmanual\">manual del instalador Debian</ulink>."
+"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
+"está bajo la licencia GPL2 o versiones posteriores."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
-"is set up during installation of the Main Server. This user is up as GOsa² "
-"administrator and is also granted sudo access. The Debian Edu menu "
-"reordering has been enabled as well, by adding the user also to the "
-"<computeroutput>teachers</computeroutput> group."
+"The French translation is copyrighted by Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
+"2010, 2012) and is released under the GPL2 or any later version."
 msgstr ""
+"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
+"está bajo la licencia GPL2 o versiones posteriores."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+"(2009) and is released under the GPL2 or any later version."
 msgstr ""
-"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
-"esta imagen como un archivo <computeroutput>dia</computeroutput>."
+"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
+"está bajo la licencia GPL2 o versiones posteriores."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid "new profile: roaming workstation"
-msgid "New roaming workstation profile for laptops."
-msgstr "Nuevo perfil: estaciones de trabajo itinerantes"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Device access for all users is handled by <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-"needed to get access to devices."
+"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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"A warning will be issued when installing on too small disks for the selected "
-"profile."
-msgstr ""
+#. type: Content of: <article><section><title>
+msgid "Translations of this document"
+msgstr "Traducciones de este documento"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/ "
-"but no seperate /usr anymore."
+"Versions of this document fully translated into German, Italian, French and "
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">take a look here</ulink> for your own language."
 msgstr ""
+"Todavía no están disponibles traducciones de este documento, puesto que el "
+"propio documento está incompleto. Hay traducciones incompletas para noruego "
+"y español."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"More tests in the test suite, and correct some of the tests that failed "
-"earlier."
-msgstr ""
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+msgid "HowTo translate this document"
+msgstr "Como traducir este documento"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make sure to report an error and abort the installation when trying to use "
-"the netinst images without a working Internet connection, instead of "
-"silently installing a broken system."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Software updates"
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-"
+"manual-translations</computeroutput>. The 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."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Squeeze:"
+#. type: Content of: <article><section><section><para>
+#, 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 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 ""
+". 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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
+#, fuzzy
 msgid ""
-"compatibility with the FHS v2.3 and software developed for version 3.2 of "
-"the LSB."
+"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):"
 msgstr ""
+"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
+"esta imagen como un archivo <computeroutput>dia</computeroutput>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Linux kernel version 2.6.18"
-msgid "Linux kernel 2.6.32"
-msgstr "Versión del kernel linux 2.6.18"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+msgid ""
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
+"<computeroutput>rsync ftp.skolelinux.org::/skolelinux-cd/wheezy-alpha/debian-"
+"edu-6.0.0+edua1-DVD.iso</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 3.5"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
+"<computeroutput>lokalize</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "OpenOffice.org 1.1."
-msgid "OpenOffice.org 3.2.1"
-msgstr "OpenOffice versión 2.0 "
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 9.3"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Music creator Rosegarden 10.04.2"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Image editor Gimp 2.6.10"
-msgstr ""
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual universe Celestia 1.6.0"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual stargazer Stellarium 0.10.4"
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation, "
-"including the browser Chromium"
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
+#, fuzzy
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
+"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 ""
-"Más información sobre Debian Squeeze 6.0 puede ser encontrada en las  <ulink "
-"url=\"http://www.debian.org/releases/squeeze/releasenotes\">notas de "
-"publicación</ulink> y el <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">manual de instalación</ulink>."
+"¡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/Lenny/AllInOne?action=format&"
+"mimetype=xml/docbook\">los fuentes</ulink>."
 
-#. type: Content of: <article><section><section><section><title>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "Installation"
-msgid "Infrastructural changes"
-msgstr "Instalación"
+msgid "Please report any problems."
+msgstr "Por favor, informa de otros posibles fallos importantes."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "The 10.0.0.0/8 network is now used instead of 10.0.2.0/23."
-msgid ""
-"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
-"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
-msgstr "La red 10.0.0.0/8 es ahora utilizada en lugade de 10.0.2.0/23."
+msgid "Appendix A - The GNU General Public License"
+msgstr "Apéndice A - La Licencia Pública GNU (GPL)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"The dynamic DHCP range was extended on the backbone network to around 4k IP "
-"addresses, and around 200 IP addresses for the thin client network."
+#. type: CDATA
+#, no-wrap
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "the DHCP network for 10.0.0.0/8 has been renamed from »barebone« to "
-#| "»intern«"
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
-"computeroutput>"
-msgstr "la red DHCP para 10.0.0.0/8 ha sido renombrada de »base« a  »interna«"
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "there are (currently) no pre-defined host entries for client systems in "
-#| "DNS anymore (staticXX, ..., dhcpYY...)"
+#. type: Content of: <article><section><section><para>
 msgid ""
-"There are no pre-defined host entries for client systems in DNS anymore "
-"(staticXX, ..., dhcpYY...)"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
-"no hay (actualmente), registros de equipos predeterminados para los clientes "
-"DNS, (staticXX, .... , dhcpYYY)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "MIT Kerberos5 used for user authentication"
-msgid "MIT Kerberos5 used for user authentication, enabled for:"
-msgstr "Autenticación por medio de MIT Kerberos5"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "PAM"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "IMAP"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "SMTP"
-msgstr ""
+#. type: Content of: <article><section><section><title>
+msgid "GNU GENERAL PUBLIC LICENSE"
+msgstr "LICENCIA PUBLICA GENERAL GNU"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "NFSv4, but without added kerberos privacy/integrity/authentication.  The "
-#| "machines still have to be added to the workstation-netgroup to be able to "
-#| "mount the home directories"
-msgid ""
-"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the <computeroutput>workstation</"
-"computeroutput> netgroup to be able to mount the home directories"
+#. type: Content of: <article><section><section><para>
+msgid "Version 2, June 1991"
 msgstr ""
-"NFSv4, pero sin agregar de kerberos privacidad/integridad/autenticación. Las "
-"estaciones aún deben de ser agregadas al grupo «estaciones de trabajo» para "
-"ser capaces de montar los directorios home."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "full Samba NT4 domain support for Windows XP/Vista/7"
-msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
-msgstr "soporte completo a Samba con dominios NT4 para Windows XP/Vista/7"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A complete PXE boot environment is setup when installing from the DVD, so "
-"that further installations can be done using PXE network installs only. A "
-"new script pxe-addfirmware is provided to support more hardware models "
-"needing firmware."
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Remove all hard coded settings on workstations, and configure workstations "
-"and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
-"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
+#. type: Content of: <article><section><section><title>
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Documentation and translation updates"
-msgstr "Actualizaciones en documentación y traducciones"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
-"proof-read with corrections was done by a native English linguist."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"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>
-msgid "Improvements to many language tasks, especially French and Danish."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to the welcome web page shown at first logins."
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add new Japanese, Portuguese and Catalan translations of the welcome web "
-"page."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "a regression: <ulink url=\"http://lists.debian.org/20100810061204."
-#| "GD7929 at login2.uio.no\">CD and DVD installs are different</ulink>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
-"installing a KDE environemnt."
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 msgstr ""
-"una regresión:  <ulink> url=\"http://lists.debian.org/20100810061204."
-"GD7929 at login2.uio.no\" instalaciónes desde CD y DVD son distintas</ulink>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Support for <computeroutput>powerpc</computeroutput> architecture dropped "
-#| "from netinst installation CDs. It is still possible to run Debian Edu on "
-#| "<computeroutput>powerpc</computeroutput> though, only the installation is "
-#| "less automated."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
-"netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 msgstr ""
-"El soporte para la arquitectura <computeroutput>powerpc</computeroutput> fué "
-"retirado de el disco de instalación por red. Aún es posible ejecutar Debian "
-"Edu desde <computeroutput>powerpc</computeroutput>, solo que el proceso de "
-"instalación es menos automatizado."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Drop gtick in the default installation, because it doesn't work on thin "
-"clients (BTS #566335)."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "User Administration (lwat)"
-msgid "New administration tool: GOsa²"
-msgstr "Nueva herramienta de administración: GOsa²"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
-"with:"
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fix DHCP host removal. Closes: #650258"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Backport user generator unicode character transliteration. Closes: #657086"
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Customized GOsa² configuration to better suit the Debian Edu network "
-"architecture."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"GOsa² updates DNS and NFS exports immediately when a system is updated in "
-"LDAP, making diskless workstations work right after they are added to the "
-"required netgroup."
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
-"objects using information gathered by sitesummary, to make it easier to add "
-"new computers to the network."
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "More software changes"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change default package manager from adept to synaptic, to avoid getting two "
-"graphical package managers installed by default."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
-"KDE."
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
-"default KDE installation."
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Replace network-manager-kde with plasma-widget-networkmanagement in the "
-"standalone KDE profile"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add cifs-utils to the default installation to ensure SMB mounting can work "
-"in any profile."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
-"and valgrind from the default installation and the DVD to make room for "
-"higher priority packages."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
-"authoritive source of host names."
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "(The <computeroutput>debian-edu-doc</computeroutput> source package "
-#| "contains this image as a <computeroutput>dia</computeroutput> file.)"
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
-"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
-"installed instead.)"
-msgstr ""
-"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
-"esta imagen como un archivo <computeroutput>dia</computeroutput>."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make the LDAP server handle more clients after increasing the server's file "
-"descriptor limit from 1024 to 32768."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
-"flush all CUPS queues every night. Both can be disabled in LDAP."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Provide network blocking / exam mode by default, controlled by LDAP. In "
-"addition to network blocking, changes to the Squid proxy configuration is "
-"needed."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Enable automatic extending of full file systems on the Main Server by "
-"default. This can be disabled in LDAP."
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change SSL certificate name used by the LDAP server and adjust clients to "
-"use the new name to be able to enable certificate checking on clients."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
-"setup used for DNS."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify autofs LDAP rules to make sure they work with extra home directory "
-"partitions exported from the main-server without any changes."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Make backup system more robust in handling LDAP database dump and restart."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "package on"
-msgid "Other changes"
-msgstr "paquete en"
+#. type: Content of: <article><section><title>
+msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
+msgstr "Apéndice B - Aún no hay CD/DVDs vivo de Debian Edu Wheezy "
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "root logins are denied for both KDM and GDM. See <ulink url=\"http://wiki."
-#| "debian.org/DebianEdu/Documentation/Squeeze/Features/DebianEdu/"
-#| "Documentation/Squeeze/GettingStarted#\">Getting started</ulink> for more "
-#| "information how to create a temporary local user to get started."
-msgid ""
-"Root logins are denied for both KDM and GDM - see above and <link linkend="
-"\"GettingStarted\">Getting started</link> for details."
+#. type: Content of: <article><section><para>
+msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
 msgstr ""
-"inicios de sesión como superusuario son denegados en KDM y GDM. Vea <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/Features/"
-"DebianEdu/Documentation/Squeeze/GettingStarted#\">Iniciándose</ulink> para "
-"más información acerca de como crear un usuario temporal para iniciar."
+"No hay imágenes de Debian Edu Wheezy para CD/DVDs disponibles en este "
+"momento."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Clients set up to shut down at night will stay up for at least an hour if "
-"they are turned on manually between 16:00 and 07:00."
+#. type: Content of: <article><section><section><title>
+msgid "Features of the Standalone image"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Additionally use local NTP clock on the main-server to ensure clients and "
-"server sync clocks also when disconnected from the Internet."
-msgstr ""
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Almost all packages from the Standalone profile"
+msgstr "Casi todos los paquetes del perfil predeterminado"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "access to Debian repositories is always done via a proxy on the main "
-#| "server. Read more about the implementation details <ulink url=\"http://"
-#| "lists.debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and "
-#| "WPAD</ulink>."
-msgid ""
-"Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
-msgstr ""
-"acceso a los repositorios de Debian son hechos siempre or medio del proxy en "
-"el servidor principal. Lea más acerca de los detalles de "
-"implementación<ulink> url=\"http://lists.debian.org/20100704221022."
-"GC30542 at login1.uio.no\"> usando DHCP y WPAD</ulink>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "All packages from the laptop task"
+msgstr "Todos los paquetes de la tarea «laptop»"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "The home0 partition is mounted nosuid, to increase security."
-msgstr ""
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The KDE desktop profile for students/pupils."
+msgstr "Perfil de escritorio KDE para estudiantes"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
-"from 144 to 24 MiB."
-msgstr ""
+#. type: Content of: <article><section><section><title>
+msgid "Activating translations and regional support"
+msgstr "Activando el soporte regional y traducciones"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Copyright and authors"
-msgstr "Copyright y authores"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
+msgstr "<emphasis role=\"strong\">Lenguaje (Región)</emphasis>"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
-"GPL2 or any later version. Enjoy!"
-msgstr ""
-"Esto documento ha sido escrito con copyright de Holger Levsen, Petter "
-"Reinholdtsen, Daniel Heß and Patrick Winnertz  2007 y distribuido bajo la "
-"licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Locale value</emphasis>"
+msgstr "<emphasis role=\"strong\">Valores local</emphasis>"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
+msgstr "<emphasis role=\"strong\">Distribución del teclado</emphasis>"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Bokmål"
+msgstr "Noruego (Bokmål)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nb_NO.UTF-8"
+msgstr "nb_NO.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no"
+msgstr "no"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Nynorsk"
+msgstr "Noruego (Nynorsk)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nn_NO.UTF-8"
+msgstr "nn_NO.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "German"
+msgstr "Alemán"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de_DE.UTF-8"
+msgstr "de_DE.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de"
+msgstr "de"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "French (France)"
+msgstr "Francés (Francia)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr_FR.UTF-8"
+msgstr "fr_FR.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr"
+msgstr "fr"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Greek (Greece)"
+msgstr "Griego (Grecia)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el_GR.UTF-8"
+msgstr "el_GR.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el"
+msgstr "el"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Japanese"
+msgstr "Japonés"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "ja_JP.UTF-8"
+msgstr "ja_JP.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "jp"
+msgstr "jp"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Northern Sami (Norway)"
+msgstr "Sami del Norte (Noruega)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "se_NO"
+msgstr "se_NO"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no(smi)"
+msgstr "no(smi)"
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
-"¡Si le añades contenido <emphasis role=\"strong\"> hazlo sólo si eres su "
-"autor y planeas liberarlo bajo las mismas condiciones !</emphasis>. Después "
-"añade tu nombre aquí y libéralo bajo la GPL2 o posterior."
+"La lista completa de los códigos locales esta disponible en <computeroutput>/"
+"usr/share/i18n/SUPPORTED</computeroutput>, pero únicamente los locales con "
+"UTF-8 son soportados por la imagen «live». No todas las traducciones locales "
+"tienen instalación. Las distribuciones de teclados pueden ser encontradas "
+"en  /usr/share/keymaps/i386/."
 
-#. type: Content of: <article><section><title>
-msgid "Translation copyright and authors"
-msgstr "Copyright de la traducción y Autores"
+#. type: Content of: <article><section><section><title>
+msgid "Stuff to know"
+msgstr "Cosas para saber"
 
-#. type: Content of: <article><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+#| msgid "the password for the user is \"user\", root has no passwd set."
+msgid "The password for the user is \"user\"; root has no passwd set."
+msgstr "la contraseña para el usuario es \"user\""
+
+#. type: Content of: <article><section><section><title>
+msgid "Known issues with the image"
+msgstr "Problemas conocidos con la imágen"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "There are no wheezy images yet"
+msgstr "No hay imágenes de wheezy todavía"
+
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/sad.png"
 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."
 
-#. type: Content of: <article><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+msgid ":("
+msgstr ":("
+
+#. type: Content of: <article><section><section><title>
+msgid "Download"
+msgstr "Descarga"
+
+#. type: Content of: <article><section><section><para>
 #, fuzzy
+#| msgid ""
+#| "The image is 1.2 GiB and currently NOT available. using <ulink url="
+#| "\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+#| "\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+#| "ftp.skolelinux.org at cd-wheezy-live/."
 msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
-"La traducción a noruego es copyright 2007 de Petter Reinholdtsen y está bajo "
-"la licencia GPL2 o versiones posteriores."
+"La imagen es de 1.2 GiB y NO ESTA disponible. Utilizando  <ulink url=\"ftp://"
+"ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url=\"http://ftp."
+"skolelinux.org/cd-wheezy-live/\">HTTP</ulink> o rsync desde  ftp.skolelinux."
+"org at cd-wheezy-live/."
 
-#. type: Content of: <article><section><para>
+#. type: Content of: <article><section><title>
+msgid "Appendix C - Features in older releases"
+msgstr "Apéndice C - Características de publicaciones anteriores"
+
+#. type: Content of: <article><section><section><title>
 #, fuzzy
+#| msgid ""
+#| "New in Debian Edu 6.0.3 beta2 Codename \"Squeeze\" released 2012-01-07"
 msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
-"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
-"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
-"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released 2013-0?-??"
 msgstr ""
-"La traducción a alemán es copyright 2007 de Holger Levsen y está bajo la "
-"licencia GPL2 o versiones posteriores."
+"Nuevas características en Debian Edu 6.0.6+r1 nombre código \"Squeeze\" "
+"publicado el 11-03-2012"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
+#. type: Content of: <article><section><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."
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 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."
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 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."
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make Nagios configuration more robust and efficient"
 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."
 
-#. 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."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Comply with 3.X kernel"
 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."
 
-#. type: Content of: <article><section><title>
-msgid "Translations of this document"
-msgstr "Traducciones de este documento"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
+msgstr ""
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Minor updates from the wiki"
 msgstr ""
-"Todavía no están disponibles traducciones de este documento, puesto que el "
-"propio documento está incompleto. Hay traducciones incompletas para noruego "
-"y español."
 
-#. type: Content of: <article><section><section><title>
-#, fuzzy
-msgid "HowTo translate this document"
-msgstr "Como traducir este documento"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Danish translation now complete"
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"As in many free software projects, translations of this document are kept in "
-"PO files. More information about the process can be found in "
-"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
-"contains this file too. Take a look there and at the <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-"specific conventions</ulink> if you want to help translating this document."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-config from 1.453 to 1.454"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
-"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
-"\">instructions on how to submit bugs</ulink> here."
+"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
+"#664596"
 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."
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><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):"
+"Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
-"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
-"esta imagen como un archivo <computeroutput>dia</computeroutput>."
 
-#. 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>"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-sync:"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::/skolelinux-cd/squeeze-alpha/"
-"debian-edu-6.0.0+edua1-DVD.iso</computeroutput>"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language "
-"code). There are many tools for translating available; we suggest using "
-"<computeroutput>lokalize</computeroutput>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't fail if password contains \""
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't disclose new password string in syslog"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-create:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Invalidate libnss cache before applying changes"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Multiple failures during mass user import into GOsa²"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+"gosa-netgroups plugin: don't erase entries of attribute type "
+"\"memberNisNetgroup\". Closes: #687256"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "First user now uses the same Kerberos policy as all other users"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Add Danish web page"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "debian-edu-install from 1.528 to 1.529"
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations to find information how to create a new PO file for your "
-"language if there isn't one yet, and how to update translations."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Improve preseeding support and documentation"
 msgstr ""
 
-#.  <remark>
-#. status ignore</remark> 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><title>
 msgid ""
-"Please keep in mind that this manual is still under development, so don't "
-"translate any string which contains \" FIXME\"."
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
+"Nuevas características en Debian Edu 6.0.4+r0 nombre código \"Squeeze\" "
+"publicado el 11-03-2012"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><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\"/>."
+"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
+"the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "See below for a list of updated software."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"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."
+"Show welcome page to users when they first log in. This default start page "
+"for Iceweasel is fetched from LDAP at installation and boot time for "
+"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
+"Standalone installations."
 msgstr ""
-"¡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>."
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid "Please report any problems."
-msgstr "Por favor, informa de otros posibles fallos importantes."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+"Gnome option, the LXDE desktop option is only supported by the CD "
+"installation method."
+msgstr ""
 
-#. type: Content of: <article><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-msgid "Appendix A - The GNU General Public License"
-msgstr "Apéndice A - La Licencia Pública GNU (GPL)"
+#| msgid "Sound with LTSP clients"
+msgid "Speed up LTSP client boot."
+msgstr "Sonido con clientes LTSP"
 
-#. type: CDATA
-#, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Provide a KDE menu entry for changing the password in GOsa²."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</ulink> "
+"chapter of the manual."
 msgstr ""
+"<ulink url=\"/DebianEdu/Documentation/Etch/Requirements\">Requisitos</"
+"ulink>para usar Debian-Edu"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
+"shown to new users."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "all LTSP servers are now <ulink url=\"http://wiki.debian.org/DebianEdu/"
+#| "Documentation/Wheezy/HowTo/NetworkClients#RemoteDesktopsService\">RDP "
+#| "servers by default</ulink> too"
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
+"todos los servidores de LTSP son ahora <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/Documentation/Wheezy/HowTo/NetworkClients#RemoteDesktopsservice"
+"\">Servidores VNC por defecto</ulink> también."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"Improve handing of removable media on thin clients. Show desktop "
+"notification longer when inserting new media and provide an option to start "
+"dolphin when such media is inserted."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "GNU GENERAL PUBLIC LICENSE"
-msgstr "LICENCIA PUBLICA GENERAL GNU"
-
-#. type: Content of: <article><section><section><para>
-msgid "Version 2, June 1991"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Further information can be found in the <ulink url=\"http://www.debian."
+#| "org/releases/squeeze/installmanual\">manual of the Debian Installer</"
+#| "ulink>."
+msgid ""
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
+"Más información puede ser encontrada en el <ulink url=\"http://www.debian."
+"org/releases/squeeze/installmanual\">manual del instalador Debian</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
+"is set up during installation of the Main Server. This user is up as GOsa² "
+"administrator and is also granted sudo access. The Debian Edu menu "
+"reordering has been enabled as well, by adding the user also to the "
+"<computeroutput>teachers</computeroutput> group."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+msgid ""
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
+"<computeroutput>cat</computeroutput>.."
 msgstr ""
+"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
+"esta imagen como un archivo <computeroutput>dia</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "new profile: roaming workstation"
+msgid "New roaming workstation profile for laptops."
+msgstr "Nuevo perfil: estaciones de trabajo itinerantes"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"Device access for all users is handled by <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"More tests in the test suite, and correct some of the tests that failed "
+"earlier."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"Make sure to report an error and abort the installation when trying to use "
+"the netinst images without a working Internet connection, instead of "
+"silently installing a broken system."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Squeeze:"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"compatibility with the FHS v2.3 and software developed for version 3.2 of "
+"the LSB."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Linux kernel version 2.6.18"
+msgid "Linux kernel 2.6.32"
+msgstr "Versión del kernel linux 2.6.18"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 3.5"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "OpenOffice.org 1.1."
+msgid "OpenOffice.org 3.2.1"
+msgstr "OpenOffice versión 2.0 "
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 9.3"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 10.04.2"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.6.10"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.0"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.10.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
+"Más información sobre Debian Squeeze 6.0 puede ser encontrada en las  <ulink "
+"url=\"http://www.debian.org/releases/squeeze/releasenotes\">notas de "
+"publicación</ulink> y el <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">manual de instalación</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "The 10.0.0.0/8 network is now used instead of 10.0.2.0/23."
 msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
-msgstr ""
+"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
+"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
+msgstr "La red 10.0.0.0/8 es ahora utilizada en lugade de 10.0.2.0/23."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"The dynamic DHCP range was extended on the backbone network to around 4k IP "
+"addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "the DHCP network for 10.0.0.0/8 has been renamed from »barebone« to "
+#| "»intern«"
 msgid ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
-msgstr ""
+"The DHCP network for 10.0.0.0/8 has been renamed from "
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
+msgstr "la red DHCP para 10.0.0.0/8 ha sido renombrada de »base« a  »interna«"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "there are (currently) no pre-defined host entries for client systems in "
+#| "DNS anymore (staticXX, ..., dhcpYY...)"
 msgid ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"There are no pre-defined host entries for client systems in DNS anymore "
+"(staticXX, ..., dhcpYY...)"
 msgstr ""
+"no hay (actualmente), registros de equipos predeterminados para los clientes "
+"DNS, (staticXX, .... , dhcpYYY)"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "MIT Kerberos5 used for user authentication"
+msgid "MIT Kerberos5 used for user authentication, enabled for:"
+msgstr "Autenticación por medio de MIT Kerberos5"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "PAM"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "IMAP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "NFSv4, but without added kerberos privacy/integrity/authentication.  The "
+#| "machines still have to be added to the workstation-netgroup to be able to "
+#| "mount the home directories"
 msgid ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
+"NFSv4, pero sin agregar de kerberos privacidad/integridad/autenticación. Las "
+"estaciones aún deben de ser agregadas al grupo «estaciones de trabajo» para "
+"ser capaces de montar los directorios home."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "full Samba NT4 domain support for Windows XP/Vista/7"
+msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+msgstr "soporte completo a Samba con dominios NT4 para Windows XP/Vista/7"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"A complete PXE boot environment is setup when installing from the DVD, so "
+"that further installations can be done using PXE network installs only. A "
+"new script pxe-addfirmware is provided to support more hardware models "
+"needing firmware."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"Remove all hard coded settings on workstations, and configure workstations "
+"and roaming workstations using settings detected from the environment using "
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
+"proof-read with corrections was done by a native English linguist."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to many language tasks, especially French and Danish."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to the welcome web page shown at first logins."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add new Japanese, Portuguese and Catalan translations of the welcome web "
+"page."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "a regression: <ulink url=\"http://lists.debian.org/20100810061204."
+#| "GD7929 at login2.uio.no\">CD and DVD installs are different</ulink>."
 msgid ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
 msgstr ""
+"una regresión:  <ulink> url=\"http://lists.debian.org/20100810061204."
+"GD7929 at login2.uio.no\" instalaciónes desde CD y DVD son distintas</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Support for <computeroutput>powerpc</computeroutput> architecture dropped "
+#| "from netinst installation CDs. It is still possible to run Debian Edu on "
+#| "<computeroutput>powerpc</computeroutput> though, only the installation is "
+#| "less automated."
 msgid ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
+"netinst installation CDs. It is still possible to run Debian Edu on "
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
 msgstr ""
+"El soporte para la arquitectura <computeroutput>powerpc</computeroutput> fué "
+"retirado de el disco de instalación por red. Aún es posible ejecutar Debian "
+"Edu desde <computeroutput>powerpc</computeroutput>, solo que el proceso de "
+"instalación es menos automatizado."
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop gtick in the default installation, because it doesn't work on thin "
+"clients (BTS #566335)."
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet"
-msgstr "Apéndice B - Aún no hay CD/DVDs vivo de Debian Edu Squeeze "
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "User Administration (lwat)"
+msgid "New administration tool: GOsa²"
+msgstr "Nueva herramienta de administración: GOsa²"
 
-#. type: Content of: <article><section><para>
-msgid "Debian Edu Live CD/DVDs for Squeeze are not available at the moment."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
-"No hay imágenes de Debian Edu Squeeze para CD/DVDs disponibles en este "
-"momento."
 
-#. type: Content of: <article><section><section><title>
-msgid "Features of the Standalone image"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix DHCP host removal. Closes: #650258"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Almost all packages from the Standalone profile"
-msgstr "Casi todos los paquetes del perfil predeterminado"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "All packages from the laptop task"
-msgstr "Todos los paquetes de la tarea «laptop»"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The KDE desktop profile for students/pupils."
-msgstr "Perfil de escritorio KDE para estudiantes"
-
-#. type: Content of: <article><section><section><title>
-msgid "Activating translations and regional support"
-msgstr "Activando el soporte regional y traducciones"
-
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want.  To activate a given keyboard layout, use the "
-"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
-"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live CD build script "
-"documentation</ulink>.  Here is a list of commonly used locale codes:"
+"Backport user generator unicode character transliteration. Closes: #657086"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
-msgstr "<emphasis role=\"strong\">Lenguaje (Región)</emphasis>"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Locale value</emphasis>"
-msgstr "<emphasis role=\"strong\">Valores local</emphasis>"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
-msgstr "<emphasis role=\"strong\">Distribución del teclado</emphasis>"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Bokmål"
-msgstr "Noruego (Bokmål)"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nb_NO.UTF-8"
-msgstr "nb_NO.UTF-8"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no"
-msgstr "no"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Customized GOsa² configuration to better suit the Debian Edu network "
+"architecture."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Nynorsk"
-msgstr "Noruego (Nynorsk)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"GOsa² updates DNS and NFS exports immediately when a system is updated in "
+"LDAP, making diskless workstations work right after they are added to the "
+"required netgroup."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nn_NO.UTF-8"
-msgstr "nn_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
+"objects using information gathered by sitesummary, to make it easier to add "
+"new computers to the network."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "German"
-msgstr "Alemán"
+#. type: Content of: <article><section><section><section><title>
+msgid "More software changes"
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de_DE.UTF-8"
-msgstr "de_DE.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de"
-msgstr "de"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change default package manager from adept to synaptic, to avoid getting two "
+"graphical package managers installed by default."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "French (France)"
-msgstr "Francés (Francia)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
+"KDE."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr_FR.UTF-8"
-msgstr "fr_FR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change video player setup to install different players in KDE "
+"(dragonplayer), Gnome (totem) and LXDE (totem)."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr"
-msgstr "fr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
+"default KDE installation."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Greek (Greece)"
-msgstr "Griego (Grecia)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace network-manager-kde with plasma-widget-networkmanagement in the "
+"standalone KDE profile"
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el_GR.UTF-8"
-msgstr "el_GR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el"
-msgstr "el"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add cifs-utils to the default installation to ensure SMB mounting can work "
+"in any profile."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Japanese"
-msgstr "Japonés"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
+"and valgrind from the default installation and the DVD to make room for "
+"higher priority packages."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "ja_JP.UTF-8"
-msgstr "ja_JP.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
+"authoritive source of host names."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "jp"
-msgstr "jp"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "(The <computeroutput>debian-edu-doc</computeroutput> source package "
+#| "contains this image as a <computeroutput>dia</computeroutput> file.)"
+msgid ""
+"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
+"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
+"installed instead.)"
+msgstr ""
+"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
+"esta imagen como un archivo <computeroutput>dia</computeroutput>."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Northern Sami (Norway)"
-msgstr "Sami del Norte (Noruega)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make the LDAP server handle more clients after increasing the server's file "
+"descriptor limit from 1024 to 32768."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "se_NO"
-msgstr "se_NO"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no(smi)"
-msgstr "no(smi)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide network blocking / exam mode by default, controlled by LDAP. In "
+"addition to network blocking, changes to the Squid proxy configuration is "
+"needed."
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
-"the live images. Not all locales have translations installed, though.  The "
-"keyboard layout names can be found in /usr/share/keymaps/i386/."
+"Enable automatic extending of full file systems on the Main Server by "
+"default. This can be disabled in LDAP."
 msgstr ""
-"La lista completa de los códigos locales esta disponible en <computeroutput>/"
-"usr/share/i18n/SUPPORTED</computeroutput>, pero únicamente los locales con "
-"UTF-8 son soportados por la imagen «live». No todas las traducciones locales "
-"tienen instalación. Las distribuciones de teclados pueden ser encontradas "
-"en  /usr/share/keymaps/i386/."
 
-#. type: Content of: <article><section><section><title>
-msgid "Stuff to know"
-msgstr "Cosas para saber"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change SSL certificate name used by the LDAP server and adjust clients to "
+"use the new name to be able to enable certificate checking on clients."
+msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "the password for the user is \"user\", root has no passwd set."
-msgid "The password for the user is \"user\"; root has no passwd set."
-msgstr "la contraseña para el usuario es \"user\""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
+"setup used for DNS."
+msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Known issues with the image"
-msgstr "Problemas conocidos con la imágen"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Simplify autofs LDAP rules to make sure they work with extra home directory "
+"partitions exported from the main-server without any changes."
+msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "There are no squeeze images yet"
-msgstr "No hay imágenes de squeeze todavía"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
+msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/sad.png"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "root logins are denied for both KDM and GDM. See <ulink url=\"http://wiki."
+#| "debian.org/DebianEdu/Documentation/Wheezy/Features/DebianEdu/"
+#| "Documentation/Wheezy/GettingStarted#\">Getting started</ulink> for more "
+#| "information how to create a temporary local user to get started."
+msgid ""
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
 msgstr ""
+"inicios de sesión como superusuario son denegados en KDM y GDM. Vea <ulink "
+"url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Features/"
+"DebianEdu/Documentation/Wheezy/GettingStarted#\">Iniciándose</ulink> para "
+"más información acerca de como crear un usuario temporal para iniciar."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-msgid ":("
-msgstr ":("
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Clients set up to shut down at night will stay up for at least an hour if "
+"they are turned on manually between 16:00 and 07:00."
+msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Download"
-msgstr "Descarga"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Additionally use local NTP clock on the main-server to ensure clients and "
+"server sync clocks also when disconnected from the Internet."
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "The image is 1.2 GiB and currently NOT available. using <ulink url="
-#| "\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-#| "\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-#| "ftp.skolelinux.org at cd-squeeze-live/."
+#| "access to Debian repositories is always done via a proxy on the main "
+#| "server. Read more about the implementation details <ulink url=\"http://"
+#| "lists.debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and "
+#| "WPAD</ulink>."
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Access to Debian repositories is always done via a proxy on the main server "
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
 msgstr ""
-"La imagen es de 1.2 GiB y NO ESTA disponible. Utilizando  <ulink url=\"ftp://"
-"ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url=\"http://ftp."
-"skolelinux.org/cd-squeeze-live/\">HTTP</ulink> o rsync desde  ftp.skolelinux."
-"org at cd-squeeze-live/."
+"acceso a los repositorios de Debian son hechos siempre or medio del proxy en "
+"el servidor principal. Lea más acerca de los detalles de "
+"implementación<ulink> url=\"http://lists.debian.org/20100704221022."
+"GC30542 at login1.uio.no\"> usando DHCP y WPAD</ulink>."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix C - Features in older releases"
-msgstr "Apéndice C - Características de publicaciones anteriores"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "The home0 partition is mounted nosuid, to increase security."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
+"from 144 to 24 MiB."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New tool notify-local-users to send desktop notification to all logged in "
+"users on a machine.  Useful for thin client servers."
+msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid "New in Debian Edu 5.0.6+edu1 Codename \"Lenny\" released 2010-10-05"
@@ -10687,6 +10558,192 @@ msgstr ""
 "Más información sobre lanzamientos anteriores puede ser encontrado en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "[attachment:welcome_to_tjener.png]"
+#~ msgstr "[attachment:welcome_to_tjener.png]"
+
+#~ msgid "Debian Edu login"
+#~ msgstr "Inicio de sesión Debian Edu"
+
+#, fuzzy
+#~| msgid "01-Installer_boot_menu.png"
+#~ msgid "Installer boot menu"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#, fuzzy
+#~ msgid "Installer advanced options screen 1"
+#~ msgstr "Opciones de instalación"
+
+#, fuzzy
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Opciones de instalación"
+
+#~ msgid "Installer help screen"
+#~ msgstr "Ventanas de ayuda de la instalación."
+
+#~ msgid "A note on some RAID controllers"
+#~ msgstr "Una nota sobre los controladores RAID"
+
+#, fuzzy
+#~| msgid ""
+#~| "When using a USB drive to add missing firmware during install, with some "
+#~| "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
+#~| "installation results in a GRUB-error. A workaround for this problem is "
+#~| "to remove the USB drive after the firmware is loaded, and preferably "
+#~| "before partitioning starts."
+#~ msgid ""
+#~ "When using a USB drive to add missing firmware during install, with some "
+#~ "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
+#~ "installation results in a GRUB error. A workaround for this problem is to "
+#~ "remove the USB drive after the firmware is loaded, and preferably before "
+#~ "partitioning starts."
+#~ msgstr ""
+#~ "Cuando se utiliza un pendrive USB para agregar firmware necesario durante "
+#~ "la instalación, algunas controladoras RAID, GRUB es instalado en el "
+#~ "pendrive USB. Así que despues de reiniciar de la instalación, recibirá un "
+#~ "error de gruB. Una forma de arreglarlo es el retirar el pendrive despúes "
+#~ "que se instale el firmware, y preferiblemente antes que inicie el "
+#~ "particionado."
+
+#~ msgid ""
+#~ "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#~ "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#~ "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+#~ msgstr ""
+#~ "Más información esta disponible en <ulink url=\"http://bugs.skolelinux."
+#~ "org/show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug "
+#~ "<ulink url=\"http://bugs.debian.org/516280#\">516280</ulink>. "
+
+#~ msgid "pxe-tjener.png"
+#~ msgstr "pxe-tjener.png"
+
+#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#~ msgid "02-select_a_language.png"
+#~ msgstr "02-select_a_language.png"
+
+#~ msgid "03-select_your_location.png"
+#~ msgstr "03-select_your_location.png"
+
+#~ msgid "04-Configure_the_keyboard.png"
+#~ msgstr "04-Configure_the_keyboard.png"
+
+#~ msgid "05-Detect_and_mount_CD-ROM.png"
+#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#~ msgid "06-Load_installer_components_from_CD.png"
+#~ msgstr "06-Load_installer_components_from_CD.png"
+
+#~ msgid "07-Detect_network_hardware.png"
+#~ msgstr "07-Detect_network_hardware.png"
+
+#~ msgid "08-Choose_Debian_Edu_profile.png"
+#~ msgstr "08-Choose_Debian_Edu_profile.png"
+
+#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+
+#~ msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#~ msgid "12-Set_up_users_and_passwords.png"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12-Set_up_users_and_passwords.png"
+#~ msgid "12a-Set_up_users_and_passwords.png"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12-Set_up_users_and_passwords.png"
+#~ msgid "12b-Set_up_users_and_passwords.png"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12-Set_up_users_and_passwords.png"
+#~ msgid "12c-Set_up_users_and_passwords.png"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#~ msgid "13-Install the base system.png"
+#~ msgstr "13-Install the base system.png"
+
+#~ msgid "14-Select_and_install_software.png"
+#~ msgstr "14-Select_and_install_software.png"
+
+#~ msgid "17-Select_and_install_software.png"
+#~ msgstr "17-Select_and_install_software.png"
+
+#~ msgid "18-Build LTSP chroot.png"
+#~ msgstr "18-Build LTSP chroot.png"
+
+#~ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#~ msgid "20-Finish_the_Installation.png"
+#~ msgstr "20-Finish_the_Installation.png"
+
+#~ msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#~ msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#~ msgid "23-Tjener-KDM_Login.png"
+#~ msgstr "23-Tjener-KDM_Login.png"
+
+#~ msgid "24-Tjener-KDE_Start.png"
+#~ msgstr "24-Tjener-KDE_Start.png"
+
+#~ msgid "26-Tjener-KDE_Desktop_Browser.png"
+#~ msgstr "26-Tjener-KDE_Desktop_Browser.png"
+
+#~ msgid "27-Tjener-KDE_Desktop.png"
+#~ msgstr "27-Tjener-KDE_Desktop.png"
+
+#~ msgid "29-Diskless-WS-KDM_Login.png"
+#~ msgstr "29-Diskless-WS-KDM_Login.png"
+
+#~ msgid "30-ThinClient-LDM_Login.png"
+#~ msgstr "30-ThinClient-LDM_Login.png"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#~ msgid "Debian Edu desktop"
+#~ msgstr "Escritorio Debian Edu"
+
+#~ msgid "Editing user data"
+#~ msgstr "Editar datos de usuarios"
+
+#, fuzzy
+#~| msgid "Set passwords"
+#~ msgid "Set user password"
+#~ msgstr "Establecer contraseñas"
+
+#~ msgid "create group"
+#~ msgstr "crear un grupo"
+
+#, fuzzy
+#~| msgid "Maintainance"
+#~ msgid "slbackup-php Maintenance"
+#~ msgstr "Mantenimiento"
+
+#, fuzzy
+#~| msgid ""
+#~| "New in Debian Edu 6.0.3 beta2 Codename \"Wheezy\" released 2012-01-07"
+#~ msgid ""
+#~ "Changes for Debian Edu 7.0.0+r0 Codename \"Wheezy\" *UN*released as of "
+#~ "2013-0?-??"
+#~ msgstr ""
+#~ "Nuevas características en Debian Edu 7.0.0+r0 nombre código \"Wheezy\" "
+#~ "publicado el 11-03-2012"
+
 #, fuzzy
 #~| msgid ""
 #~| "1. Create a user with membership in the \"admins\" group (if not already "
@@ -10766,10 +10823,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 +11636,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 +11644,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 +11726,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 +12457,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 +12819,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 +13519,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 +13653,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 +13674,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 +13692,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 +13712,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 +13728,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 +13739,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."
@@ -13723,17 +13779,6 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "If you want your Windows computers to be aware of what groups users are "
-#~ "in, you must create the groupmaps in LDAP manually, this is explained in "
-#~ "more detail in the <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#~ "Documentation/Lenny/HowTo/NetworkClients#\">HowTo/NetworkClients</ulink> "
-#~ "chapter of this manual."
-#~ msgstr ""
-#~ "<ulink url=\"/DebianEdu/Documentation/Etch/Requirements\">Requisitos</"
-#~ "ulink>para usar Debian-Edu"
-
-#, fuzzy
-#~ msgid ""
 #~ "Upgrades from the woody based Debian Edu / Skolelinux installation are "
 #~ "not supported. Upgrade to the sarge based version first, a howto can be "
 #~ "found at <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/"
@@ -13792,16 +13837,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 +13903,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 +13915,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 +13922,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 +14028,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-wheezy/debian-edu-wheezy-manual.fr.po
similarity index 93%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index e845da7..f70853e 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-14 14:40-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,32 +25,30 @@ 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 Wheezy 7.0.0+r0 Manual"
+msgstr "Manuel de Debian Edu / Skolelinux Wheezy 7.0.0+r0"
 
 #. 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 7.0.0+r0 Codename \"Wheezy\""
+msgstr "Manuel de Debian Edu 7.0.0+r0 nom de code « Wheezy »"
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr "./images/welcome_to_tjener.png"
-
-#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu login"
-msgstr "Connexion à Debian Edu"
+#. type: Content of: <article><section><para>
+msgid ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
+msgstr "FIXME: we need a wheezy login shot here once we have new artwork"
 
 #. 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 Wheezy 7.0.0+r0 release."
+msgstr "Voici le manuel de la version de Debian Edu Wheezy 7.0.0+r0."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> is a wiki and updated frequently."
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
 "La version disponible depuis <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Squeeze\"/> est un wiki fréquemment mis à jour."
+"Documentation/Wheezy\"/> est un wiki fréquemment mis à jour."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -182,8 +180,8 @@ msgid "Network"
 msgstr "Réseau"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Debian_Edu_Network_Squeeze.png"
-msgstr "./images/Debian_Edu_Network_Squeeze.png"
+msgid "./images/Debian_Edu_Network_Wheezy.png"
+msgstr "./images/Debian_Edu_Network_Wheezy.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
@@ -1356,13 +1354,13 @@ msgstr "Où trouver davantage d'informations"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-"Debian Squeeze</ulink> before you start installing a system for production "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 "Nous vous recommandons de lire ou au moins de jeter un œil aux <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">notes de publication "
-"de Debian Squeeze</ulink> avant de commencer à installer un système en "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">notes de publication "
+"de Debian Wheezy</ulink> avant de commencer à installer un système en "
 "production. Cependant, c'est inutile si vous voulez seulement essayer Debian "
 "Edu/Skolelinux, cela devrait fonctionner tout seul."
 
@@ -1390,20 +1388,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Even more information about the Debian Squeeze release is available in its "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Even more information about the Debian Wheezy release is available in its "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"Des informations supplémentaires sur Debian Squeeze sont disponibles dans "
-"son <ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
-"\">manuel d'installation</ulink>."
+"Des informations supplémentaires sur Debian Wheezy sont disponibles dans son "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual\">manuel "
+"d'installation</ulink>."
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
-"Téléchargement d'un support d'installation pour Debian Edu 6.0.6+r1 "
-"« Squeeze »"
+"Téléchargement d'un support d'installation pour Debian Edu 7.0.0+r0 "
+"« Wheezy »"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "DVD for i386, amd64"
@@ -1419,29 +1417,37 @@ msgstr ""
 "pour l'installation de machines amd64 et i386. Elle peut être téléchargée en "
 "utilisant FTP, HTTP ou rsync :"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+msgstr ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1457,27 +1463,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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1489,27 +1495,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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -1560,13 +1566,9 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Choisir un type d'installation"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
-msgstr "Menu de démarrage de l'installateur"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:01-Installer_boot_menu.png]"
+msgstr "[attachment:01-Installer_boot_menu.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1616,13 +1618,9 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> donne quelques conseils pour "
 "utiliser l'installateur"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
-msgstr "./images/Installer_advanced_options_a.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
-msgstr "Options avancées de l'installateur (écran 1)"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_a.png]"
+msgstr "[attachment:Installer_advanced_options_a.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1679,13 +1677,9 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> a besoin d'un "
 "fichier de configuration."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Options avancées de l'installateur (écran 2)"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_b.png]"
+msgstr "[attachment:Installer_advanced_options_b.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1739,13 +1733,9 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> a "
 "besoin d'un fichier de configuration."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
-msgstr "./images/Installer_help.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer help screen"
-msgstr "Écran d'aide de l'installateur"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_help.png]"
+msgstr "[attachment:Installer_help.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1857,12 +1847,12 @@ msgstr "Le processus d'installation"
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">system requirements</ulink> and make sure you have at "
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
 "Souvenez-vous des <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Squeeze/Requirements\">besoins matériels</ulink> et assurez-"
+"Documentation/Wheezy/Requirements\">besoins matériels</ulink> et assurez-"
 "vous d'avoir au moins deux cartes réseau si vous envisagez d'installer un "
 "serveur pour clients légers."
 
@@ -2102,13 +2092,13 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2134,8 +2124,8 @@ msgstr ""
 "Le nombre de paquets récupérés sur Internet varie selon le profil :"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
-msgstr "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
+msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "Main server: 8 out of 115 MiB downloaded."
@@ -2169,35 +2159,6 @@ msgid "Minimal: 12 of 83 MiB downloaded."
 msgstr "Minimal : 12 pour 83 Mio téléchargés."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on some RAID controllers"
-msgstr "Note à propos de certains contrôleurs RAID"
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"When using a USB drive to add missing firmware during install, with some "
-"RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-"installation results in a GRUB error. A workaround for this problem is to "
-"remove the USB drive after the firmware is loaded, and preferably before "
-"partitioning starts."
-msgstr ""
-"Quand vous utilisez un disque USB pour ajouter des microprogrammes manquants "
-"lors de l'installation, certains contrôleurs RAID causeront l'installation "
-"de GRUB sur le disque USB. Cela provoquera une erreur GRUB lors du "
-"redémarrage après l'installation. Pour contourner ce problème, enlever le "
-"disque USB une fois que le microprogramme est installé, et de préférence "
-"avant que le partitionnement ne débute."
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-msgstr ""
-"Plus d'informations sont disponibles dans le <ulink url=\"http://bugs."
-"skolelinux.org/show_bug.cgi?id=1395\">bogue Debian Edu nº 1395</ulink> et le "
-"bogue Debian nº <ulink url=\"http://bugs.debian.org/516280\">516280</ulink>."
-
-#. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
 msgstr "Note à propos des installations de serveur de clients légers"
 
@@ -2315,13 +2276,9 @@ msgstr ""
 "Voici à quoi ressemble le menu PXE avec uniquement le profil <emphasis role="
 "\"strong\">Serveur principal</emphasis> :"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/pxe-tjener.png"
-msgstr "./images/pxe-tjener.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "pxe-tjener.png"
-msgstr "pxe-tjener.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:pxe-tjener.png]"
+msgstr "[attachment:pxe-tjener.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2333,13 +2290,9 @@ msgstr ""
 "\">Serveur principal</emphasis> et <emphasis role=\"strong\">Serveur de "
 "clients légers</emphasis> :"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2384,8 +2337,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 ""
@@ -2414,9 +2367,9 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
-"Davantage <ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Davantage <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">d'informations à propos de Debian</ulink> sont disponibles dans son "
 "manuel d'installation."
 
@@ -2518,241 +2471,125 @@ msgstr ""
 "PXE sur le réseau des stations de travail et sur le réseau des clients "
 "légers :"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/02-select_a_language.png"
-msgstr "./images/02-select_a_language.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "02-select_a_language.png"
-msgstr "02-select_a_language.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/03-select_your_location.png"
-msgstr "./images/03-select_your_location.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "03-select_your_location.png"
-msgstr "03-select_your_location.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/04-Configure_the_keyboard.png"
-msgstr "./images/04-Configure_the_keyboard.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "04-Configure_the_keyboard.png"
-msgstr "04-Configure_the_keyboard.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "05-Detect_and_mount_CD-ROM.png"
-msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "06-Load_installer_components_from_CD.png"
-msgstr "06-Load_installer_components_from_CD.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/07-Detect_network_hardware.png"
-msgstr "./images/07-Detect_network_hardware.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "07-Detect_network_hardware.png"
-msgstr "07-Detect_network_hardware.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "08-Choose_Debian_Edu_profile.png"
-msgstr "08-Choose_Debian_Edu_profile.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "11-Participate_in_the_package_usage_survey.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12a-Set_up_users_and_passwords.png"
-msgstr "12a-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12b-Set_up_users_and_passwords.png"
-msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12b-Set_up_users_and_passwords.png"
-msgstr "12b-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12c-Set_up_users_and_passwords.png"
-msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12c-Set_up_users_and_passwords.png"
-msgstr "12c-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/13-Install+the+base+system.png"
-msgstr "./images/13-Install+the+base+system.png"
+#. type: Content of: <article><section><section><para>
+msgid "FIXME: these screenshots need to be redone once we have wheezy artwork"
+msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "13-Install the base system.png"
-msgstr "13-Install the base system.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:02-select_a_language.png]"
+msgstr "[attachment:02-select_a_language.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/14-Select_and_install_software.png"
-msgstr "./images/14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:03-select_your_location.png]"
+msgstr "[attachment:03-select_your_location.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "14-Select_and_install_software.png"
-msgstr "14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:04-Configure_the_keyboard.png]"
+msgstr "[attachment:04-Configure_the_keyboard.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/17-Select_and_install_software.png"
-msgstr "./images/17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:05-Detect_and_mount_CD-ROM.png]"
+msgstr "[attachment:05-Detect_and_mount_CD-ROM.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "17-Select_and_install_software.png"
-msgstr "17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:06-Load_installer_components_from_CD.png]"
+msgstr "[attachment:06-Load_installer_components_from_CD.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/18-Build+LTSP+chroot.png"
-msgstr "./images/18-Build+LTSP+chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:07-Detect_network_hardware.png]"
+msgstr "[attachment:07-Detect_network_hardware.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "18-Build LTSP chroot.png"
-msgstr "18-Build LTSP chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
+msgstr "[attachment:08-Choose_Debian_Edu_profile.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
+msgstr "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
+msgstr "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/20-Finish_the_Installation.png"
-msgstr "./images/20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
+msgstr "[attachment:11-Participate_in_the_package_usage_survey.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "20-Finish_the_Installation.png"
-msgstr "20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12-Set_up_users_and_passwords.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12a-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12a-Set_up_users_and_passwords.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "21-Finish_the_Installation-Installation_complete.png"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12b-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12b-Set_up_users_and_passwords.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12c-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12c-Set_up_users_and_passwords.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "22-Tjener_GRUB_boot_menu.png"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:13-Install the base system.png]"
+msgstr "[attachment:13-Install the base system.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:14-Select_and_install_software.png]"
+msgstr "[attachment:14-Select_and_install_software.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:17-Select_and_install_software.png]"
+msgstr "[attachment:17-Select_and_install_software.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/24-Tjener-KDE_Start.png"
-msgstr "./images/24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:18-Build LTSP chroot.png]"
+msgstr "[attachment:18-Build LTSP chroot.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "24-Tjener-KDE_Start.png"
-msgstr "24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
+msgstr "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:20-Finish_the_Installation.png]"
+msgstr "[attachment:20-Finish_the_Installation.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "26-Tjener-KDE_Desktop_Browser.png"
-msgstr "26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
+msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr "./images/27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "27-Tjener-KDE_Desktop.png"
-msgstr "27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/29-Diskless-WS-KDM_Login.png"
-msgstr "./images/29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:24-Tjener-KDE_Start.png]"
+msgstr "[attachment:24-Tjener-KDE_Start.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "29-Diskless-WS-KDM_Login.png"
-msgstr "29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+msgstr "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/30-ThinClient-LDM_Login.png"
-msgstr "./images/30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:27-Tjener-KDE_Desktop.png]"
+msgstr "[attachment:27-Tjener-KDE_Desktop.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "30-ThinClient-LDM_Login.png"
-msgstr "30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "./images/31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:30-ThinClient-LDM_Login.png]"
+msgstr "[attachment:30-ThinClient-LDM_Login.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
+msgstr "[attachment:31-ThinClient-KDE_Desktop.png]"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2814,13 +2651,9 @@ msgstr ""
 "Le chapitre <link linkend=\"HowTo\">Manuels (HowTo)</link> fournit davantage "
 "d'astuces et de réponses à des questions courantes."
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/getting-started-desktop.png"
-msgstr "./images/getting-started-desktop.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu desktop"
-msgstr "bureau Debian Edu"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:getting-started-desktop.png]"
+msgstr "[attachment:getting-started-desktop.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2895,10 +2728,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"If you are using a new Debian Edu Squeeze machine, the site certificate will "
+"If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
-"Si vous utilisez une nouvelle machine Debian Edu Squeeze, le certificat du "
+"Si vous utilisez une nouvelle machine Debian Edu Wheezy, le certificat du "
 "site sera connu du navigateur."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -2923,13 +2756,9 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "Connexion à GOsa² et aperçu"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa2_overview.png"
-msgstr "./images/gosa2_overview.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² overview page after login as the first user"
-msgstr "Page d'aperçu de GOsa² après connexion en tant que premier utilisateur"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:gosa2_overview.png]"
+msgstr "[attachment:gosa2_overview.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3137,66 +2966,13 @@ msgstr ""
 "capable de vous connecter avec cet identifiant sur n'importe quelle machine "
 "Skolelinux de votre réseau."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Please note:</emphasis> If Squeeze/r0 was used to "
-"install the main server, all user passwords exept that one for the first "
-"user will expire in only 2 days.  To fix this, please execute the following "
-"script in a terminal.  This script is included in r1."
-msgstr ""
-"<emphasis role=\"stong\">Remarque importante :</emphasis> Si Squeeze r0 a "
-"été utilisée pour installer le serveur principal, tous les mots de passe, "
-"sauf celui du premier utilisateur expireront après 2 jours. Pour corriger "
-"cela, veuillez exécuter le script suivant dans un terminal. Ce script est "
-"inclus dans la version r1."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-msgstr ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Corriger l'expiration des mots de passe après deux\n"
-"  # jours (#664596), introduite par erreur dans Debian Edu Squeeze\n"
-"  # jusqu'à la version r0.\n"
-"  # Pour les nouveaux utilisateurs, le mot de passe n'expirera jamais.\n"
-"  # Pour les utilisateurs existants ce sera le cas après que leur\n"
-"  # mot de passe aura été changé\n"
-"  # Donner la possibilité aux anciens utilisateurs de changer\n"
-"  # leur mot de passe, en excluant les comptes non concernés   # (modèles et premier utilisateur).\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v 'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
 msgstr "Rechercher, modifier et supprimer des utilisateurs"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/filterbox.png"
-msgstr "./images/filterbox.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Filterbox"
-msgstr "Boîte de filtre"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:filterbox.png]"
+msgstr "[attachment:filterbox.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3238,13 +3014,9 @@ msgstr ""
 "informations relatives à un utilisateur, changer son mot de passe et "
 "modifier la liste des groupes auxquels il appartient."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/edit_user.png"
-msgstr "./images/edit_user.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Editing user data"
-msgstr "Modifier les données d'utilisateur"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:edit_user.png]"
+msgstr "[attachment:edit_user.png]"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3295,13 +3067,9 @@ msgstr ""
 "Sur la page présentée, vous pouvez définir un nouveau mot de passe choisi "
 "par vous-même."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/change_password_administratively.png"
-msgstr "./images/change_password_administratively.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Set user password"
-msgstr "Définir le mot de passe utilisateur"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:change_password_administratively.png]"
+msgstr "[attachment:change_password_administratively.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3415,17 +3183,13 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestion des groupes avec GOsa²"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/create_group.png"
-msgstr "./images/create_group.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "create group"
-msgstr "Créer un groupe"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:create_group.png]"
+msgstr "[attachment:create_group.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/list_groups.png"
-msgstr "./images/list_groups.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:list_groups.png]"
+msgstr "[attachment:list_groups.png]"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3481,14 +3245,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 ""
@@ -3581,56 +3345,40 @@ msgstr ""
 #, no-wrap
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "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"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_list.png"
-msgstr "./images/gosa_systems_list.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² systems listing"
-msgstr "Liste des systèmes dans GOsa²"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_host_details.png"
-msgstr "./images/gosa_systems_host_details.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Host details"
-msgstr "Renseignements sur le système"
+"enter password: █"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_edit_host.png"
-msgstr "./images/gosa_systems_edit_host.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_list.png]"
+msgstr "[attachment:gosa_systems_list.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Modify host"
-msgstr "Modification du système"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_host_details.png]"
+msgstr "[attachment:gosa_systems_host_details.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_add_netgroup.png"
-msgstr "./images/gosa_systems_add_netgroup.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_edit_host.png]"
+msgstr "[attachment:gosa_systems_edit_host.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Add netgroup"
-msgstr "Ajout de groupe réseau"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgstr "[attachment:gosa_systems_add_netgroup.png]"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4095,11 +3843,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 ""
@@ -4130,13 +3878,9 @@ msgstr ""
 "« Maintenance » dans le menu de la page des sauvegarde et choisissez le "
 "dernier instantané à garder :"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/slbackup-php_maintenance.png"
-msgstr "./images/slbackup-php_maintenance.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "slbackup-php Maintenance"
-msgstr "Maintenance de slbackup-php"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:slbackup-php_maintenance.png]"
+msgstr "[attachment:slbackup-php_maintenance.png]"
 
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
@@ -4242,8 +3986,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 ""
@@ -4551,7 +4295,7 @@ msgid ""
 msgstr ""
 "Assurez-vous de lire également les informations à propos de la version "
 "stable actuelle de Debian dans son <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manuel d'installation</ulink>."
+"releases/wheezy/installmanual\">manuel d'installation</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4572,15 +4316,15 @@ msgstr ""
 "ulink>, Debian Edu devra faire de même."
 
 #. type: Content of: <article><section><title>
-msgid "Upgrades from Debian Edu Lenny"
-msgstr "Mises à jour depuis Debian Edu Lenny"
+msgid "Upgrades from Debian Edu Squeeze"
+msgstr "Mises à jour depuis Debian Edu Squeeze"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Lenny in a test "
+"Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
-"Soyez prêt : assurez-vous d'avoir testé la mise à jour à partir de Lenny "
+"Soyez prêt : assurez-vous d'avoir testé la mise à jour à partir de Squeeze "
 "dans un environnement de test, ou bien d'avoir des sauvegardes prêtes à être "
 "restaurées."
 
@@ -4591,10 +4335,10 @@ msgstr "La mise à jour de base"
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"lenny\" with \"squeeze\"."
+"occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 "Éditez <computeroutput>/etc/apt/sources.list</computeroutput> et remplacez "
-"toutes les occurrences de « Lenny » par « Squeeze »."
+"toutes les occurrences de « Squeeze » par « Wheezy »."
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get update</computeroutput>"
@@ -4614,6 +4358,12 @@ msgstr "Le service LDAP doit être reconfiguré"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+msgstr ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
 "accounts, passwords, network settings, services and machines are treated is "
 "quite different now. So LDAP has to be rebuild from scratch. There's a "
@@ -4637,11 +4387,11 @@ msgstr "Recréer un chroot LTSP"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will automatically support both thin-clients and diskless workstations."
+"will still support both thin-clients and diskless workstations."
 msgstr ""
 "Sur le(s) serveur(s) LTSP, le chroot LTSP doit être recréé. Le nouveau "
-"chroot gérera automatiquement les clients légers et les stations de travail "
-"sans disque."
+"chroot gérera encore les clients légers et les stations de travail sans "
+"disque."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4667,27 +4417,27 @@ msgstr "Bien sûr, vous pouvez mettre à jour le chroot comme d'habitude."
 
 #. type: Content of: <article><section><title>
 msgid ""
-"Upgrades from older Debian Edu / Skolelinux installations (before Lenny)"
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr ""
 "Mises à jour depuis des installations antérieures de Debian Edu / Skolelinux "
-"(avant Lenny)"
+"(avant Squeeze)"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"To upgrade from any older release, you will need to upgrade to the Lenny-"
+"To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian Edu Lenny</"
-"ulink> about how to upgrade to Lenny from the previous release, Etch, and "
-"the Etch manual covers the one before that!"
+"debian.org/DebianEdu/Documentation/Squeeze#\">Manual for Debian Edu Squeeze</"
+"ulink> about how to upgrade to Squeeze from the previous release, Lenny, and "
+"the Lenny manual covers the one before that! (Etch was it's name.)"
 msgstr ""
 "Pour mettre à jour à partir de toute autre version plus ancienne, vous devez "
-"d'abord mettre à jour à la version Lenny de Debian Edu avant de pouvoir "
-"suivre les instructions fournies ci-dessus. La façon de migrer vers Lenny "
+"d'abord mettre à jour à la version Squeeze de Debian Edu avant de pouvoir "
+"suivre les instructions fournies ci-dessus. La façon de migrer vers Squeeze "
 "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."
+"Documentation/Squeeze#\">Manuel pour Debian Edu Squeeze</ulink>. Le manuel "
+"pour Squeeze contient les instructions pour mettre à jour à partir de la "
+"version précédente, Etch."
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -4810,14 +4560,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 +4583,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 +4594,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 +4606,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 +4722,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 +4762,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 +4788,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 ""
@@ -5163,11 +4913,11 @@ msgstr "Utiliser backport.debian.org est simple :"
 #. type: CDATA
 #, 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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"apt-get update"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5188,12 +4938,12 @@ msgstr "Mettre à jour avec un CD ou DVD"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to upgrade from one version to another (for example from Squeeze "
-"6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical "
+"If you want to upgrade from one version to another (for example from Wheezy "
+"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
 "media, follow these steps:"
 msgstr ""
 "Si vous voulez mettre à jour d'une version à une autre (par exemple de "
-"Squeeze 6.0.6 à 6.0.7) mais que vous ne possédez pas de connexion Internet, "
+"Wheezy 7.0.0 à 7.0.1) mais que vous ne possédez pas de connexion Internet, "
 "mais seulement un support physique, suivez ces étapes :"
 
 #. type: Content of: <article><section><section><para>
@@ -5207,10 +4957,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 +4996,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 +5075,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 +5095,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 +5170,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 +5185,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 +5242,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 +5274,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 +5399,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 +5422,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 +5573,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 +5608,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 +5664,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"
@@ -5936,9 +5686,9 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# installez le trousseau debian en toute sécurité :\n"
 "apt-get install debian-keyring\n"
@@ -5947,9 +5697,9 @@ msgstr ""
 "# vérifiez avec certitude que la clé est correcte et si tel est le cas, l'ajouter au trousseau utilisé par apt :\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# 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"
+"echo \"deb http://deb-multimedia.org wheezy 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 +5809,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 +5823,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 +5910,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 +5977,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 +6024,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 +6037,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 +6059,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 +6081,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 +6153,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 +6289,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 +6313,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 +6355,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 +6472,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 +6504,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 +6519,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 +6632,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 +6660,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 +6696,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 +6768,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 +6779,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 +6802,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 +6819,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 +6828,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)"
@@ -7108,10 +6858,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr ""
 "Afin d'ajouter des clients Windows au domaine, les étapes décrites dans le "
-"<link linkend=\"Samba\">manuel Samba pour Debian Edu Squeeze</link>."
+"<link linkend=\"Samba\">manuel Samba pour Debian Edu Wheezy</link>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7156,11 +6906,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 +7414,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"
@@ -7781,12 +7531,12 @@ msgstr "Samba dans Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-"
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
 "style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
 msgstr ""
-"La version 3 de Samba incluse dans Debian Edu Squeeze a été préparée pour "
+"La version 3 de Samba incluse dans Debian Edu Wheezy a été préparée pour "
 "être utilisée comme un contrôleur de domaine dans le style de NT4 avec "
 "Windows XP, Windows Vista et Windows 7 comme clients. Après qu'une machine a "
 "rejoint le domaine, elle peut être complètement gérée avec GOsa²."
@@ -8328,7 +8078,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 +8087,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 +8107,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 +8120,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 +8152,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 +8163,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 +8178,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 ""
@@ -8725,13 +8475,13 @@ msgstr ""
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> and you can contribute easily. Note: a user account is needed "
-"to edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 "Le source du texte est un wiki et peut être édité avec un simple navigateur "
 "web. Faites le pointer sur <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Squeeze/\"/> et vous pourrez contribuer facilement. Note : un "
+"Documentation/Wheezy/\"/> et vous pourrez contribuer facilement. Note : un "
 "compte utilisateur est requis pour modifier les pages, vous devez d'abord "
 "<ulink url=\"http://wiki.debian.org/UserPreferences\">créer un utilisateur "
 "sur le wiki</ulink>."
@@ -8870,1920 +8620,2034 @@ msgstr ""
 "ProfessionalHelp\"/>."
 
 #. type: Content of: <article><section><title>
-msgid "New features in Debian Edu Squeeze"
-msgstr "Nouvelles fonctionnalités dans Debian Edu Squeeze"
+msgid "New features in Debian Edu Wheezy"
+msgstr "Nouvelles fonctionnalités dans Debian Edu Wheezy"
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><para>
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
 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"
-msgstr "mise à jour de sitesummary de la version 0.1.3 vers la version 0.1.8"
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Make Nagios configuration more robust and efficient"
-msgstr "configuration Nagios plus robuste et efficace"
+#. type: Content of: <article><section><section><title>
+msgid ""
+"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
+msgstr ""
+"Nouvelles fonctionnalités de Debian Edu 7.0.0+r0 « Wheezy », publiée "
+"le ?? ?? 2013"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Comply with 3.X kernel"
-msgstr "mise en conformité avec le noyau 3.X"
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Changements visibles pour l'utilisateur"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
+"installation, in the login screen and as desktop wallpaper."
 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"
+"Décor mis à jour et nouveau logo Debian Edu/Skolelinux visible pendant "
+"l'installation, sur l'écran de connexion et sur le fond d'écran du bureau."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Minor updates from the wiki"
-msgstr "mises à jour mineures depuis le wiki"
+#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Danish translation now complete"
-msgstr "traduction en danois maintenant complète"
+#. type: Content of: <article><section><section><section><title>
+msgid "Installation changes"
+msgstr "Changements dans l'installation"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
-"mise à jour de debian-edu-config de la version 1.453 vers la version 1.454"
+"Nouvelle version de l'installateur Debian de Wheezy. Consultez le <ulink url="
+"\"http://www.debian.org/releases/wheezy/installmanual\">manuel "
+"d'installation</ulink> pour plus de détails."
 
-#. 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 ""
-"correction de la politique utilisateur Kerberos : ne pas faire expirer le "
-"mot de passe après deux jours (correction du bogue nº 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 ""
-"prise en charge des caractères « # » dans les mots de passe du "
-"superutilisateur ou du premier utilisateur (correction du bogue nº 664976)"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-sync:"
-msgstr "corrections pour gosa-sync :"
+#. type: Content of: <article><section><section><section><title>
+msgid "Software updates"
+msgstr "Mises à jour des logiciels"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't fail if password contains \""
-msgstr "ne pas échouer si le mot de passe contient le caractère « \" »"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Wheezy:"
+msgstr "Toutes les nouveautés de Debian « Wheezy » :"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't disclose new password string in syslog"
-msgstr ""
-"ne pas révéler le nouveau mot de passe dans le journal système (syslog)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 3.2.x"
+msgstr "Noyau Linux version 3.2.x"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-create:"
-msgstr "corrections pour gosa-create :"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+msgstr "Environnements de bureau KDE « Plasma » 4.8.4 et GNOME 3.4"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Invalidate libnss cache before applying changes"
-msgstr "invalider le cache libnss avant d'appliquer les changements"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 10 ESR"
+msgstr "Navigateur web Iceweasel 10 ESR"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Multiple failures during mass user import into GOsa²"
-msgstr ""
-"échecs multiples lors de l'importation massive d'utilisateurs dans GOsa²"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LibreOffice 3.5.4"
+msgstr "LibreOffice 3.5.4"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"gosa-netgroups plugin: don't erase entries of attribute type "
-"\"memberNisNetgroup\". Closes: #687256"
-msgstr ""
-"gosa-netgroups plugin : ne pas effacer les entrées du type attribut "
-"« memberNisNetgroup » (correction du bogue nº 687256)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 12.01"
+msgstr "Boîte à outils éducative GCompris 12.01"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "First user now uses the same Kerberos policy as all other users"
-msgstr ""
-"utilisation pour le premier utilisateur de la même politique Kerberos que "
-"pour les autres utilisateurs"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 12.04"
+msgstr "Créateur de musique Rosegarden 12.04"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Add Danish web page"
-msgstr "ajout d'une page web en danois"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.8.2"
+msgstr "Éditeur d'images Gimp 2.8.2"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
-msgstr ""
-"mise à jour de debian-edu-install de la version 1.528 à la version 1.529"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.1"
+msgstr "Univers virtuel Celestia 1.6.1"
 
-#. 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><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.11.3"
+msgstr "Planétarium virtuel Stellarium 0.11.3"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Debian Wheezy includes over 10,000 new packages available for installation, "
+"including the Chromium browser"
 msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Debian Wheezy contient plus de 10 000 nouveaux paquets prêts à être "
+"installés, dont le navigateur Chromium."
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
-"Nouvelles fonctionnalités de Debian Edu 6.0.4+r0 « Squeeze », publiée le "
-"11 mars 2012"
+"Des informations supplémentaires sur Debian Wheezy 7.0 sont disponibles dans "
+"les <ulink url=\"http://www.debian.org/releases/wheezy/releasenotes\">notes "
+"de publication</ulink> et le <ulink url=\"http://www.debian.org/releases/"
+"wheezy/installmanual\">manuel d'installation</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Changements visibles pour l'utilisateur"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
-"installation, in the login screen and as desktop wallpaper."
-msgstr ""
-"Décor mis à jour et nouveau logo Debian Edu/Skolelinux visible pendant "
-"l'installation, sur l'écran de connexion et sur le fond d'écran du bureau."
+msgid "Infrastructural changes"
+msgstr "Changements d'infrastructure"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <link linkend=\"GettingStarted\">Getting started chapter</link> of the "
-"manual for more information on GOsa²."
-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²."
+msgid "FIXME: to be documented, if any"
+msgstr "FIXME: to be documented, if any"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "See below for a list of updated software."
-msgstr "Voir plus loin pour la liste des logiciels mis à jour."
+#. type: Content of: <article><section><section><section><title>
+msgid "Documentation and translation updates"
+msgstr "Mises à jour des documentations et des traductions"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Show welcome page to users when they first log in. This default start page "
-"for Iceweasel is fetched from LDAP at installation and boot time for "
-"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
-"Standalone installations."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in FIXME languages."
 msgstr ""
-"Affichage d'une page d'accueil à la première connexion des utilisateurs. La "
-"page de démarrage par défaut d'Iceweasel est récupérée par LDAP à "
-"l'installation et au démarrage pour les profils en réseau. La page est "
-"réglée sur <ulink url=\"http://www.skolelinux.org/\"/> pour les "
-"installations autonomes."
+"Mise à jour des traduction pour les chaînes utilisées dans l'installateur. "
+"Ces chaînes sont maintenant disponibles en FIXME langues."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
-"installation method."
+"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
+"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
-"Nouveau option de choix de bureau LXDE, en de KDE (par défaut) et Gnome. "
-"Tout comme l'option Gnome, l'option de bureau LXDE n'est prise en charge que "
-"par la méthode d'installation par CD."
+"Le manuel de Debian Edu Wheezy est traduit entièrement en allemand, "
+"français, italien et danois. Des traductions partielles existent en espagnol "
+"et norvégien Bokmål."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Speed up LTSP client boot."
-msgstr "Accélérer l'amorçage des clients LTSP."
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
+msgstr "Régressions"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Provide a KDE menu entry for changing the password in GOsa²."
-msgstr "Entrée de menu KDE pour changer de mot de passe dans GOsa²."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr "Autres changements liés à LDAP"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Autres changements"
+
+#. type: Content of: <article><section><title>
+msgid "Copyright and authors"
+msgstr "Droits d'auteur et auteurs"
+
+#. type: Content of: <article><section><para>
 msgid ""
-"For more information on how to change passwords (including expired passwords "
-"at the KDM/GDM login prompt), please see the <link linkend=\"Users\">HowTos "
-"for users</link> chapter of the manual."
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
+"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
+"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
+"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
+"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
+"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
+"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
+"GPL2 or any later version. Enjoy!"
 msgstr ""
-"Pour plus de renseignements sur la façon de changer les mots de passe (en "
-"particulier pour les mots de passe expirés à l'écran de connexion KDM/GDM), "
-"veuillez consulter le chapitre <link linkend=\"Users\">Manuels pour les "
-"utilisateurs</link> de ce document."
+"Ce document a été écrit (droits d'auteur) par Holger Levsen (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012), Wolfgang Schweer (2012) et Bernhard Hammes (2012) et est distribué "
+"sous GPL2 ou toute version ultérieure. Profitez-en !"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
-"shown to new users."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the GPL2 or later version."
 msgstr ""
-"Ajout d'un lien vers <ulink url=\"http://linuxsignpost.org/\"/> sur la page "
-"d'accueil présentée aux nouveaux utilisateurs."
+"Si vous enrichissez son contenu, <emphasis role=\"strong\">veuillez ne le "
+"faire que si vous êtes l'auteur des ajouts. Vous devez les distribuer sous "
+"les mêmes conditions</emphasis> ! Ensuite, ajoutez votre nom ici et "
+"distribuez-les sous GPL2 ou toute version ultérieure."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
+msgid "Translation copyright and authors"
+msgstr "Droits d'auteur et auteurs des traductions"
+
+#. type: Content of: <article><section><para>
 msgid ""
-"All LTSP servers are also <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP servers</link> by default."
+"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Tous les serveurs LTSP sont des <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">serveurs RDP</link> par défaut."
+"La traduction espagnole, dont les droits d'auteur appartiennent à José L. "
+"Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) et Norman "
+"Garcia (2010, 2012), est distribuée sous GPL2 ou toute version ultérieure."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Improve handing of removable media on thin clients. Show desktop "
-"notification longer when inserting new media and provide an option to start "
-"dolphin when such media is inserted."
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
+"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
+"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
 msgstr ""
-"Amélioration de la prise en charge des périphériques amovibles sur les "
-"clients légers. Affichage plus long de la notification et ajout d'une option "
-"pour démarrer dolphin lors de l'insertion de nouveaux périphériques."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Installation changes"
-msgstr "Changements dans l'installation"
+"La traduction norvégienne Bokmål, dont les droits d'auteur appartiennent à "
+"Petter Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly "
+"(2008), Ole-Anders Andreassen (2010) et Jan Roar Rød (2010), est distribuée "
+"sous GPL2 ou toute version ultérieure."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
-"for more details."
+"The German translation is copyrighted by Holger Levsen (2007), Patrick "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
+"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
+"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
+"and is released under the GPL2 or any later version."
 msgstr ""
-"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."
+"La traduction allemande, dont les droits d'auteur appartiennent à Holger "
+"Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), "
+"Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), "
+"Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), "
+"Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) "
+"et Wolfgang Schweer (2012, 2013), est distribuée sous GPL2 ou toute version "
+"ultérieure."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
-"is set up during installation of the Main Server. This user is up as GOsa² "
-"administrator and is also granted sudo access. The Debian Edu menu "
-"reordering has been enabled as well, by adding the user also to the "
-"<computeroutput>teachers</computeroutput> group."
+"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
-"Puisque la connexion du superutilisateur par GDM/KDM n'est plus autorisée, "
-"un utilisateur est créé dans LDAP pendant l'installation du serveur "
-"principal. Cet utilisateur sera administrateur de GOsa². Il possèdera aussi "
-"les droits sudo, et sera autorisé à réordonner le menu Debian Edu, étant "
-"ajouté au groupe <computeroutput>teachers</computeroutput>."
+"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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"The French translation is copyrighted by Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
+"2010, 2012) and is released under the GPL2 or any later version."
 msgstr ""
-"Les images <computeroutput>.iso</computeroutput> peuvent être copiées "
-"directement sur des clés USB en utilisant par exemple <computeroutput>dd</"
-"computeroutput>, ou même <computeroutput>cat</computeroutput>."
+"La traduction française, dont les droits d'auteur appartiennent à Christophe "
+"Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-"
+"Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) et "
+"l'équipe française de localisation (2009, 2010, 2012), est distribuée sous "
+"GPL2 ou toute version ultérieure."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New roaming workstation profile for laptops."
+#. type: Content of: <article><section><para>
+msgid ""
+"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+"(2009) and is released under the GPL2 or any later version."
 msgstr ""
-"Nouveau profil de station de travail mobile pour les ordinateurs portables."
+"La traduction chinoise, dont les droits d'auteur appartiennent à Andrew Lee "
+"(李健秋) (2009), est distribuée sous GPL2 ou toute version ultérieure."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Device access for all users is handled by <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-"needed to get access to devices."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"L'accès aux périphériques pour tous les utilisateurs est maintenant géré par "
-"<ulink url=\"http://wiki.debian.org/PolicyKit#\">PolicyKit</ulink>. Il n'est "
-"plus nécessaire d'appartenir à des groupes supplémentaires pour accéder aux "
-"périphériques."
+"La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
+"(2012, 2013), est distribuée sous GPL2 ou toute version ultérieure."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
+msgid "Translations of this document"
+msgstr "Traductions de ce document"
+
+#. type: Content of: <article><section><para>
 msgid ""
-"A warning will be issued when installing on too small disks for the selected "
-"profile."
+"Versions of this document fully translated into German, Italian, French and "
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">take a look here</ulink> for your own language."
 msgstr ""
-"Un avertissement sera affiché quand les disques sont trop petits pour "
-"installer le profil sélectionné."
+"Des versions complètement traduites de ce document sont disponibles en "
+"allemand, italien, français et danois. Des versions incomplètes en norvégien "
+"Bokmål, espagnol et chinois existent. Vous pouvez les consulter <ulink url="
+"\"http://maintainer.skolelinux.org/debian-edu-doc/\">ici</ulink> dans votre "
+"propre langue."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><title>
+msgid "HowTo translate this document"
+msgstr "Comment traduire ce document"
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/ "
-"but no seperate /usr anymore."
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-"
+"manual-translations</computeroutput>. The 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."
 msgstr ""
-"Modification du partitionnement pour les installations autonomes pour avoir "
-"seulement une partition /home séparée, mais plus de partition /usr."
+"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-wheezy-manual-translations</"
+"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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More tests in the test suite, and correct some of the tests that failed "
-"earlier."
+"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."
 msgstr ""
-"La suite de tests en contient davantage et corrige certains tests qui "
-"échouaient avant."
+"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 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="
+"\"http://bugs.debian.org\">ici</ulink> des explications sur comment "
+"soumettre des rapports de bogues."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make sure to report an error and abort the installation when trying to use "
-"the netinst images without a working Internet connection, instead of "
-"silently installing a broken system."
+"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):"
 msgstr ""
-"Quand la connexion à Internet ne fonctionne pas lors de l'utilisation d'une "
-"image d'installation par le réseau, une erreur est signalée et "
-"l'installation est abandonnée au lieu d'installer un système défectueux sans "
-"prévenir."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Software updates"
-msgstr "Mises à jour des logiciels"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Squeeze:"
-msgstr "Toutes les nouveautés de Debian « Squeeze » :"
+"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>git</computeroutput> pour cela) :"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"compatibility with the FHS v2.3 and software developed for version 3.2 of "
-"the LSB."
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"compatibilité avec la norme de la hiérarchie des systèmes de fichiers FHS "
-"v2.3 et les logiciels développés pour la version 3.2 de la base standard "
-"Linux LSB."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Linux kernel 2.6.32"
-msgstr "Noyau Linux version 2.6.32"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
-msgstr "Environnements de bureau KDE « Plasma » 4.4 et GNOME 2.30"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 3.5"
-msgstr "Navigateur web Iceweasel 3.5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "OpenOffice.org 3.2.1"
-msgstr "OpenOffice.org 3.2.1"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 9.3"
-msgstr "Boîte à outils éducative GCompris 9.3"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Music creator Rosegarden 10.04.2"
-msgstr "Créateur de musique Rosegarden 10.04.2"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Image editor Gimp 2.6.10"
-msgstr "Éditeur d'images Gimp 2.6.10"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual universe Celestia 1.6.0"
-msgstr "Univers virtuel Celestia 1.6.0"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual stargazer Stellarium 0.10.4"
-msgstr "Planétarium virtuel Stellarium 0.10.4"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation, "
-"including the browser Chromium"
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
+"<computeroutput>lokalize</computeroutput>."
 msgstr ""
-"Debian Squeeze contient plus de 10 000 nouveaux paquets prêts à être "
-"installés, dont le navigateur Chromium."
+"Ensuite éditez le fichier <computeroutput>documentation/debian-edu-wheezy/"
+"debian-edu-wheezy-manual.$CC.po</computeroutput> (où vous remplacez $CC par "
+"votre code de langue). Il existe de nombreux outils de traduction "
+"disponibles, nous vous suggérons d'utiliser <computeroutput>lokalize</"
+"computeroutput>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
+"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 ""
-"Des informations supplémentaires sur Debian Squeeze 6.0 sont disponibles "
-"dans les <ulink url=\"http://www.debian.org/releases/squeeze/releasenotes"
-"\">notes de publication</ulink> et le <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manuel d'installation</ulink>."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
-msgstr "Changements d'infrastructure"
+"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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
-"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
-"Le réseau 10.0.0.0/8 est utilisé à la place de 10.0.2.0/23. La passerelle "
-"par défaut est 10.0.0.1/8 et non plus 10.0.2.1/8."
+"Pour mettre à jour votre copie locale du dépôt, utilisez la commande "
+"suivante dans le répertoire <computeroutput>debian-edu-doc</computeroutput> :"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The dynamic DHCP range was extended on the backbone network to around 4k IP "
-"addresses, and around 200 IP addresses for the thin client network."
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
 msgstr ""
-"L'intervalle du DHCP dynamique a été étendu sur le réseau central à environ "
-"4000 adresses IP, et environ 200 adresses IP pour le réseau des clients "
-"légers."
+"Lisez /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations pour apprendre comment créer un nouveau fichier PO pour votre "
+"langue s'il n'existe pas déjà et comment mettre à jour les traductions."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
-"computeroutput>"
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
 msgstr ""
-"Le réseau DHCP pour 10.0.0.0/8 a été renommé de <computeroutput>barebone</"
-"computeroutput> en <computeroutput>intern</computeroutput>."
+"Souvenez-vous que ce manuel est toujours en développement, aussi ne "
+"traduisez aucune chaîne comportant « FIXME »."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"There are no pre-defined host entries for client systems in DNS anymore "
-"(staticXX, ..., dhcpYY...)"
+"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 ""
-"Il n'y a plus d'entrées d'hôtes prédéfinies pour les systèmes clients dans "
-"DNS (staticXX, ..., dhcpYY...)."
+"Des informations de base à propos de Alioth (la machine hébergeant notre "
+"dépôt Git) et de Git sont disponibles à <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "MIT Kerberos5 used for user authentication, enabled for:"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"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 ""
-"Utilisation de MIT Kerberos 5 pour l'authentification des utilisateurs, "
-"activée pour :"
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "PAM"
-msgstr "PAM"
+#. type: Content of: <article><section><section><para>
+msgid "Please report any problems."
+msgstr "Veuillez signaler tout problème."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "IMAP"
-msgstr "IMAP"
+#. type: Content of: <article><section><title>
+msgid "Appendix A - The GNU General Public License"
+msgstr "Annexe A — La Licence Publique Générale GNU"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "SMTP"
-msgstr "SMTP"
+#. 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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the <computeroutput>workstation</"
-"computeroutput> netgroup to be able to mount the home directories"
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
-"NFSv4, mais sans confidentialité/intégrité/authentification Kerberos. Les "
-"machines doivent toujours être ajoutées au groupe réseau "
-"<computeroutput>workstation</computeroutput> pour pouvoir monter les "
-"répertoires personnels."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
-msgstr "Prise en charge complète de Samba NT4 pour Windows XP/Vista/7."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"A complete PXE boot environment is setup when installing from the DVD, so "
-"that further installations can be done using PXE network installs only. A "
-"new script pxe-addfirmware is provided to support more hardware models "
-"needing firmware."
-msgstr ""
-"Un environnement complet d'amorçage PXE est configuré lors de l'installation "
-"depuis le DVD, de sorte que les installations suivantes peuvent se faire via "
-"PXE uniquement. Un nouveau script pxe-addfirmware est fourni pour prendre en "
-"charge plus de matériel nécessitant des microprogrammes (« firmware »)."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Remove all hard coded settings on workstations, and configure workstations "
-"and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
-"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
-msgstr ""
-"Suppression de tous les réglages sur les stations de travail, et configurer "
-"les stations de travail (mobiles ou non) pour utiliser les réglages détectés "
-"depuis l'environnement par DNS, DHCP et LDAP. Consultez cet <ulink url="
-"\"http://people.skolelinux.org/pere/blog/"
-"No_hardcoded_config_on_Debian_Edu_clients.html\">article de blog</ulink> qui "
-"contient plus d'informations sur les changements."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Documentation and translation updates"
-msgstr "Mises à jour des documentations et des traductions"
+"Droits d'auteur (C) 2007-2013 à Holger Levsen < <ulink url=\"mailto:"
+"holger at layer-acht.org\">holger at layer-acht.org</ulink> > et autres, "
+"consulter le chapitre <link linkend=\"CopyRight\">Droits d'auteur</link> "
+"pour la liste complète des détenteurs des droits d'auteur."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
-"Mise à jour des traduction pour les chaînes utilisées dans l'installateur. "
-"Ces chaînes sont maintenant disponibles en 28 langues."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
-"proof-read with corrections was done by a native English linguist."
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
-"Le manuel de Debian Edu Squeeze a été retravaillé et amélioré. Une relecture "
-"et des corrections ont été faites par un linguiste dont l'anglais est la "
-"langue maternelle."
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
-"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
-"Spanish."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 msgstr ""
-"Le manuel de Debian Edu Squeeze est traduit entièrement en allemand, "
-"français, italien et danois (nouveau). Des traductions partielles existent "
-"en espagnol et norvégien Bokmål."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to many language tasks, especially French and Danish."
-msgstr ""
-"Améliorations apportées à de nombreuses langues, notamment le français et le "
-"danois."
+#. type: Content of: <article><section><section><title>
+msgid "GNU GENERAL PUBLIC LICENSE"
+msgstr "GNU GENERAL PUBLIC LICENSE"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to the welcome web page shown at first logins."
-msgstr ""
-"Améliorations apportées à la page d'accueil affichée à la première connexion."
+#. type: Content of: <article><section><section><para>
+msgid "Version 2, June 1991"
+msgstr "Version 2, June 1991"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add new Japanese, Portuguese and Catalan translations of the welcome web "
-"page."
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 msgstr ""
-"Ajout de traductions japonaise, portugaise et catalane de la page d'accueil."
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr "Régressions"
+#. type: Content of: <article><section><section><title>
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
-"installing a KDE environemnt."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">les installations par CD et DVD sont différentes</ulink> — le DVD n'est "
-"adapté qu'à l'installation d'un environnement KDE."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
-"netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
-"Arrêt de la prise en charge de l'architecture <computeroutput>powerpc</"
-"computeroutput> par les CD d'installation par le réseau. Il est toujours "
-"possible de faire fonctionner Debian Edu sur <computeroutput>powerpc</"
-"computeroutput>, mais l'installation est moins automatisée."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop gtick in the default installation, because it doesn't work on thin "
-"clients (BTS #566335)."
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
-"Retrait de gtick de l'installation par défaut, car il ne marche plus sur les "
-"clients légers (BTS #566335)."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "New administration tool: GOsa²"
-msgstr "Nouvel outil d'administration : GOsa²"
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
-"with:"
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 msgstr ""
-"gosa (2.6.11-3+squeeze1~edu+1) de la version 6.0.5 à venir de Debian, avec :"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fix DHCP host removal. Closes: #650258"
-msgstr "Correction de la suppression d'hôte DHCP, bogue nº 650258."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Backport user generator unicode character transliteration. Closes: #657086"
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
-"Rétroportage de la translitération en caractères Unicode du créateur "
-"d'utilisateur, bogue nº 657086."
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Customized GOsa² configuration to better suit the Debian Edu network "
-"architecture."
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 msgstr ""
-"Configuration de GOsa² adaptée pour mieux convenir à l'architecture du "
-"réseau Debian Edu."
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"GOsa² updates DNS and NFS exports immediately when a system is updated in "
-"LDAP, making diskless workstations work right after they are added to the "
-"required netgroup."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 msgstr ""
-"GOsa² met le DNS et les partages NFS immédiatement à jour quand un système "
-"est mis à jour dans LDAP, rendant les stations de travail sans disque "
-"fonctionnelles tout de suite après qu'elles aient été ajoutées au groupe "
-"réseau requis."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
-"objects using information gathered by sitesummary, to make it easier to add "
-"new computers to the network."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 msgstr ""
-"Ajout du script sitesummary2ldapdhcp pour mettre à jour ou peupler GOsa² "
-"avec des objets du système en utilisant des informations collectées par "
-"sitesummary, pour simplifier l'ajout de nouvelles machines sur le réseau."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "More software changes"
-msgstr "Changements d'infrastructure"
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
-"Ajout de l'éditeur vidéo Kdenlive 0.7.7 et de l'outil de géométrie "
-"interactive Geogebra 3.2.42."
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change default package manager from adept to synaptic, to avoid getting two "
-"graphical package managers installed by default."
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 msgstr ""
-"Remplacement du gestionnaire de paquets par défaut adept par synaptic pour "
-"éviter d'avoir deux gestionnaires de paquets en mode graphique installés par "
-"défaut."
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
-"KDE."
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
-"Installation d'openoffice.org-kde par défaut pour assurer qu'OpenOffice.org "
-"utilise les boîtes de dialogue KDE dans le bureau KDE."
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
-"Changement de la configuration du lecteur vidéo pour installer différents "
-"lecteurs dans KDE (dragonplayer), Gnome (totem) et LXDE (totem)."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
-"default KDE installation."
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
-"Ajout des outils KDE freespacenotifier, kinfocenter et update-notifier-kde à "
-"l'installation KDE par défaut."
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace network-manager-kde with plasma-widget-networkmanagement in the "
-"standalone KDE profile"
-msgstr ""
-"Remplacement de network-manager-kde par plasma-widget-networkmanagement dans "
-"le profil autonome KDE."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
-"Installation d'usb-modeswitch sur les portables pour prendre en charge les "
-"appareils USB à double mode."
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add cifs-utils to the default installation to ensure SMB mounting can work "
-"in any profile."
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 msgstr ""
-"Ajout de cifs-utils à l'installation par défaut pour assurer que le montage "
-"SMB fonctionne avec n'importe quel profil."
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
-"and valgrind from the default installation and the DVD to make room for "
-"higher priority packages."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
-"Retrait d'octave, gpscorrelate, qlandkarteqt, viking, starplot, kig, kseg, "
-"luma et valgrind de l'installation par défaut et du DVD pour faire de la "
-"place pour des paquets à la priorité plus élevée."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
-"authoritive source of host names."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 msgstr ""
-"Abandon de libnss-mdns des profils statiques, pour assurer que le DNS est la "
-"source autoritaire des noms d'hôtes."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
-"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
-"installed instead.)"
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 msgstr ""
-"<computeroutput>freerdp-x11</computeroutput> est le client RDP et VNC "
-"installé par défaut (à la place de <computeroutput>rdesktop</"
-"computeroutput>)."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
-msgstr "Autres changements liés à LDAP"
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make the LDAP server handle more clients after increasing the server's file "
-"descriptor limit from 1024 to 32768."
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
-"Prise en charge par le serveur LDAP de plus de clients après l'augmentation "
-"du descripteur de fichiers du serveur de 1024 à 32768."
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
-"flush all CUPS queues every night. Both can be disabled in LDAP."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
-"Ajout de code pour réactiver les files CUPS arrêtées toutes les heures sur "
-"le serveur principal, et purge des files CUPS toutes les nuits. Ces deux "
-"fonctions peuvent être désactivées dans LDAP."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Provide network blocking / exam mode by default, controlled by LDAP. In "
-"addition to network blocking, changes to the Squid proxy configuration is "
-"needed."
-msgstr ""
-"Modes blocage et examen pour le réseau fournis par défaut et contrôlés par "
-"LDAP. En plus du blocage réseau, des changements dans la configuration du "
-"serveur mandataire (« proxy ») Squid sont nécessaires."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Enable automatic extending of full file systems on the Main Server by "
-"default. This can be disabled in LDAP."
-msgstr ""
-"Activation de l'extension automatique des systèmes de fichiers pleins sur le "
-"serveur principal par défaut. Cela peut être désactivé dans LDAP."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change SSL certificate name used by the LDAP server and adjust clients to "
-"use the new name to be able to enable certificate checking on clients."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
-"Changement du nom de certificat SSL utilisé par le serveur LDAP et "
-"ajustement des clients pour utiliser le nouveau nom et activer la "
-"vérification du certificat."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
-"setup used for DNS."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
-"Réglage de PowerDNS pour utiliser le mode LDAP strict, pour simplifier la "
-"configuration utilisée pour le DNS."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify autofs LDAP rules to make sure they work with extra home directory "
-"partitions exported from the main-server without any changes."
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 msgstr ""
-"Simplifications des règles autofs LDAP pour assurer leur fonctionnement sans "
-"modifications avec les partitions supplémentaires contenant les répertoires "
-"personnels, exportées depuis le serveur principal."
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make backup system more robust in handling LDAP database dump and restart."
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 msgstr ""
-"Système de sauvegarde rendu plus robuste en prenant effectuant une "
-"sauvegarde de la base de données de LDAP ainsi que son redémarrage."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Autres changements"
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Root logins are denied for both KDM and GDM - see above and <link linkend="
-"\"GettingStarted\">Getting started</link> for details."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
-"La connexion du superutilisateur est refusée pour KDM et GDM — voir ci-"
-"dessus et la section <link linkend=\"GettingStarted\">Démarrage rapide</"
-"link> pour les détails."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Clients set up to shut down at night will stay up for at least an hour if "
-"they are turned on manually between 16:00 and 07:00."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 msgstr ""
-"Les clients configurés pour s'éteindre pour la nuit resteront en activité "
-"pendant au moins une heure s'ils ont été allumés manuellement entre 16 h 00 "
-"et 7 h 00."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Additionally use local NTP clock on the main-server to ensure clients and "
-"server sync clocks also when disconnected from the Internet."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
-"Utilisation additionnelle d'une horloge NTP locale sur serveur principal "
-"pour s'assurer que les clients et le serveur se synchronisent même quand ils "
-"ne sont pas connectés à Internet."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
-"L'accès aux dépôts Debian se fait toujours par l'intermédiaire d'un "
-"mandataire sur le serveur principal — plus d'information sur les détails "
-"d'implémentation sont disponibles en utilisant <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">DHCP et WPAD</ulink>."
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "The home0 partition is mounted nosuid, to increase security."
-msgstr ""
-"La partition home0 est montée avec l'option nosuid pour améliorer la "
-"sécurité."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+msgstr "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
-"from 144 to 24 MiB."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
-"La configuration de KDE/Akonadi a été modifiée pour réduire l'empreinte "
-"mémoire de chaque utilisateur sur le disque de 144 à 24 Mio."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
-"Nouvel outils notify-local-users pour envoyer des notifications à tous les "
-"utilisateurs connectés à une station de travail. Très utile pour les "
-"serveurs de clients légers."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
 #. type: Content of: <article><section><title>
-msgid "Copyright and authors"
-msgstr "Droits d'auteur et auteurs"
+msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
+msgstr "Annexe B — À propos des CD/DVD d'installation autonome Debian Edu"
 
 #. type: Content of: <article><section><para>
-msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
-"GPL2 or any later version. Enjoy!"
+msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
 msgstr ""
-"Ce document a été écrit (droits d'auteur) par Holger Levsen (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
-"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
-"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
-"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
-"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
-"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
-"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
-"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
-"(2012), Wolfgang Schweer (2012) et Bernhard Hammes (2012) et est distribué "
-"sous GPL2 ou toute version ultérieure. Profitez-en !"
+"Les CD et DVD d'installation autonome Debian Edu pour Wheezy ne sont pas "
+"disponibles actuellement."
 
-#. type: Content of: <article><section><para>
-msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
-msgstr ""
-"Si vous enrichissez son contenu, <emphasis role=\"strong\">veuillez ne le "
-"faire que si vous êtes l'auteur des ajouts. Vous devez les distribuer sous "
-"les mêmes conditions</emphasis> ! Ensuite, ajoutez votre nom ici et "
-"distribuez-les sous GPL2 ou toute version ultérieure."
+#. type: Content of: <article><section><section><title>
+msgid "Features of the Standalone image"
+msgstr "Caractéristiques de l'image Autonome"
 
-#. type: Content of: <article><section><title>
-msgid "Translation copyright and authors"
-msgstr "Droits d'auteur et auteurs des traductions"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Almost all packages from the Standalone profile"
+msgstr "presque tous les paquets du profil Autonome ;"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
-msgstr ""
-"La traduction espagnole, dont les droits d'auteur appartiennent à José L. "
-"Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) et Norman "
-"Garcia (2010, 2012), est distribuée sous GPL2 ou toute version ultérieure."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "All packages from the laptop task"
+msgstr "tous les paquets de l'utilisation ordinateur portable ;"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
-msgstr ""
-"La traduction norvégienne Bokmål, dont les droits d'auteur appartiennent à "
-"Petter Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly "
-"(2008), Ole-Anders Andreassen (2010) et Jan Roar Rød (2010), est distribuée "
-"sous GPL2 ou toute version ultérieure."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The KDE desktop profile for students/pupils."
+msgstr "Le profil de bureau KDE pour étudiants/élèves."
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
-"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
-"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
-"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
-msgstr ""
-"La traduction allemande, dont les droits d'auteur appartiennent à Holger "
-"Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), "
-"Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), "
-"Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), "
-"Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) "
-"et Wolfgang Schweer (2012, 2013), est distribuée sous GPL2 ou toute version "
-"ultérieure."
+#. type: Content of: <article><section><section><title>
+msgid "Activating translations and regional support"
+msgstr "Activation des traductions et de la prise en charge de la localisation"
 
-#. type: Content of: <article><section><para>
+#. type: Content of: <article><section><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."
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
-"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."
+"Pour activer une traduction spécifique, amorcez en utilisant l'option "
+"<computeroutput>locale=ll_CC.UTF-8</computeroutput>, où ll_CC.UTF-8 est le "
+"code des paramètres régionaux souhaités. Pour activer une disposition de "
+"clavier spécifique, utilisez l'option <computeroutput>keyb=KB</"
+"computeroutput>, où KB est la disposition souhaitée. Davantage "
+"d'informations sur cette fonctionnalité <ulink url=\"http://wiki.debian.org/"
+"DebianLive/l10n\">sont disponibles dans la documentation du script de "
+"construction du CD d'installation autonome</ulink>. Voici une liste de codes "
+"de paramètres régionaux couramment utilisés :"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
-msgstr ""
-"La traduction française, dont les droits d'auteur appartiennent à Christophe "
-"Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-"
-"Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) et "
-"l'équipe française de localisation (2009, 2010, 2012), est distribuée sous "
-"GPL2 ou toute version ultérieure."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
+msgstr "<emphasis role=\"strong\">Langue (Région)</emphasis>"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
-msgstr ""
-"La traduction chinoise, dont les droits d'auteur appartiennent à Andrew Lee "
-"(李健秋) (2009), est distribuée sous GPL2 ou toute version ultérieure."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Locale value</emphasis>"
+msgstr "<emphasis role=\"strong\">Code de paramètres régionaux</emphasis>"
 
-#. 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."
-msgstr ""
-"La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
-"(2012, 2013), est distribuée sous GPL2 ou toute version ultérieure."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
+msgstr "<emphasis role=\"strong\">Disposition de clavier</emphasis>"
 
-#. type: Content of: <article><section><title>
-msgid "Translations of this document"
-msgstr "Traductions de ce document"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Bokmål"
+msgstr "norvégien Bokmål"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
-msgstr ""
-"Des versions complètement traduites de ce document sont disponibles en "
-"allemand, italien, français et danois. Des versions incomplètes en norvégien "
-"Bokmål, espagnol et chinois existent. Vous pouvez les consulter <ulink url="
-"\"http://maintainer.skolelinux.org/debian-edu-doc/\">ici</ulink> dans votre "
-"propre langue."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nb_NO.UTF-8"
+msgstr "nb_NO.UTF-8"
 
-#. type: Content of: <article><section><section><title>
-msgid "HowTo translate this document"
-msgstr "Comment traduire ce document"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no"
+msgstr "no"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"As in many free software projects, translations of this document are kept in "
-"PO files. More information about the process can be found in "
-"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
-"contains this file too. Take a look there and at the <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-"specific conventions</ulink> if you want to help translating this document."
-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."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Nynorsk"
+msgstr "norvégien nynorsk"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
-"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
-"\">instructions on how to submit bugs</ulink> here."
-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."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nn_NO.UTF-8"
+msgstr "nn_NO.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "German"
+msgstr "allemand"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de_DE.UTF-8"
+msgstr "de_DE.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de"
+msgstr "de"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "French (France)"
+msgstr "français (France)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr_FR.UTF-8"
+msgstr "fr_FR.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr"
+msgstr "fr"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Greek (Greece)"
+msgstr "grec (Grèce)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el_GR.UTF-8"
+msgstr "el_GR.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el"
+msgstr "el"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Japanese"
+msgstr "japonais"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "ja_JP.UTF-8"
+msgstr "ja_JP.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "jp"
+msgstr "jp"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Northern Sami (Norway)"
+msgstr "same du Nord (Norvège)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "se_NO"
+msgstr "se_NO"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no(smi)"
+msgstr "no(smi)"
 
 #. 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):"
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
-"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) :"
+"Une liste complète des codes de paramètres régionaux est disponible dans "
+"<computeroutput>/usr/share/i18n/SUPPORTED</computeroutput>, mais seuls les "
+"paramètres régionaux UTF-8 sont pris en charge par les images d'installation "
+"autonome. Cependant, toutes les localisations ne disposent pas de "
+"traductions. Les noms de dispositions de clavier peuvent être trouvés dans /"
+"usr/share/keymaps/i386/."
+
+#. type: Content of: <article><section><section><title>
+msgid "Stuff to know"
+msgstr "Choses à savoir"
 
 #. 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>"
+msgid "The password for the user is \"user\"; root has no passwd set."
 msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"Le mot de passe pour l'utilisateur est « user », le superutilisateur n'a pas "
+"de mot de passe défini."
+
+#. type: Content of: <article><section><section><title>
+msgid "Known issues with the image"
+msgstr "Problèmes connus avec l'image"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "There are no wheezy images yet"
+msgstr "Il n'existe pas encore d'images pour Wheezy."
+
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/sad.png"
+msgstr "./images/sad.png"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+msgid ":("
+msgstr ":("
+
+#. type: Content of: <article><section><section><title>
+msgid "Download"
+msgstr "Téléchargement"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language "
-"code). There are many tools for translating available; we suggest using "
-"<computeroutput>lokalize</computeroutput>."
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
-"Ensuite éditez le fichier <computeroutput>documentation/debian-edu-squeeze/"
-"debian-edu-squeeze-manual.$CC.po</computeroutput> (où vous remplacez $CC par "
-"votre code de langue). Il existe de nombreux outils de traduction "
-"disponibles, nous vous suggérons d'utiliser <computeroutput>lokalize</"
-"computeroutput>."
+"L'image, de taille 1.2 Gio, devrait être disponible (mais pas pour "
+"l'instant) en utilisant <ulink url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/"
+"\">FTP</ulink>, <ulink url=\"http://ftp.skolelinux.org/cd-wheezy-live/"
+"\">HTTP</ulink> ou rsync depuis <computeroutput>ftp.skolelinux.org</"
+"computeroutput> à <computeroutput>cd-wheezy-live/</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><title>
+msgid "Appendix C - Features in older releases"
+msgstr "Annexe C — Fonctionnalités dans les publications précédentes"
+
+#. type: Content of: <article><section><section><title>
 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."
+"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released 2013-0?-??"
 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."
+"Nouvelles fonctionnalités de Debian Edu 6.0.6+r1 « Squeeze », *non* publiée "
+"le ?? janvier 2013"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 msgstr ""
-"Pour mettre à jour votre copie locale du dépôt, utilisez la commande "
-"suivante dans le répertoire <computeroutput>debian-edu-doc</computeroutput> :"
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "sitesummary was updated from 0.1.3 to 0.1.8"
+msgstr "mise à jour de sitesummary de la version 0.1.3 vers la version 0.1.8"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations to find information how to create a new PO file for your "
-"language if there isn't one yet, and how to update translations."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make Nagios configuration more robust and efficient"
+msgstr "configuration Nagios plus robuste et efficace"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
 msgstr ""
-"Lisez /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations pour apprendre comment créer un nouveau fichier PO pour votre "
-"langue s'il n'existe pas déjà et comment mettre à jour les traductions."
+"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"
 
-#.  <remark>
-#. status ignore</remark> 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Please keep in mind that this manual is still under development, so don't "
-"translate any string which contains \" FIXME\"."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Minor updates from the wiki"
+msgstr "mises à jour mineures depuis le wiki"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
 msgstr ""
-"Souvenez-vous que ce manuel est toujours en développement, aussi ne "
-"traduisez aucune chaîne comportant « FIXME »."
+"mise à jour de debian-edu-config de la version 1.453 vers la version 1.454"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><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\"/>."
+"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
+"#664596"
 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\"/>."
+"correction de la politique utilisateur Kerberos : ne pas faire expirer le "
+"mot de passe après deux jours (correction du bogue nº 664596)"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><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."
+"Handle '#' characters in the root or first users password. Closes: #664976"
 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."
-
-#. type: Content of: <article><section><section><para>
-msgid "Please report any problems."
-msgstr "Veuillez signaler tout problème."
+"prise en charge des caractères « # » dans les mots de passe du "
+"superutilisateur ou du premier utilisateur (correction du bogue nº 664976)"
 
-#. type: Content of: <article><section><title>
-msgid "Appendix A - The GNU General Public License"
-msgstr "Annexe A — La Licence Publique Générale GNU"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-sync:"
+msgstr "corrections pour gosa-sync :"
 
-#. 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.]]"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't fail if password contains \""
+msgstr "ne pas échouer si le mot de passe contient le caractère « \" »"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't disclose new password string in syslog"
 msgstr ""
-"Droits d'auteur (C) 2007-2013 à Holger Levsen < <ulink url=\"mailto:"
-"holger at layer-acht.org\">holger at layer-acht.org</ulink> > et autres, "
-"consulter le chapitre <link linkend=\"CopyRight\">Droits d'auteur</link> "
-"pour la liste complète des détenteurs des droits d'auteur."
+"ne pas révéler le nouveau mot de passe dans le journal système (syslog)"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-create:"
+msgstr "corrections pour gosa-create :"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Invalidate libnss cache before applying changes"
+msgstr "invalider le cache libnss avant d'appliquer les changements"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Multiple failures during mass user import into GOsa²"
 msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+"échecs multiples lors de l'importation massive d'utilisateurs dans GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"gosa-netgroups plugin: don't erase entries of attribute type "
+"\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"gosa-netgroups plugin : ne pas effacer les entrées du type attribut "
+"« memberNisNetgroup » (correction du bogue nº 687256)"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "First user now uses the same Kerberos policy as all other users"
 msgstr ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"utilisation pour le premier utilisateur de la même politique Kerberos que "
+"pour les autres utilisateurs"
 
-#. type: Content of: <article><section><section><title>
-msgid "GNU GENERAL PUBLIC LICENSE"
-msgstr "GNU GENERAL PUBLIC LICENSE"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Add Danish web page"
+msgstr "ajout d'une page web en danois"
 
-#. type: Content of: <article><section><section><para>
-msgid "Version 2, June 1991"
-msgstr "Version 2, June 1991"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-install from 1.528 to 1.529"
+msgstr ""
+"mise à jour de debian-edu-install de la version 1.528 à la version 1.529"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Improve preseeding support and documentation"
 msgstr ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+"amélioration de la prise en charge du préamorçage et de la documentation"
 
 #. type: Content of: <article><section><section><title>
-msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-
-#. type: Content of: <article><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"Nouvelles fonctionnalités de Debian Edu 6.0.4+r0 « Squeeze », publiée le "
+"11 mars 2012"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
+"the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"Remplacement de LWAT par GOsa² en tant qu'interface d'administration LDAP. "
+"Voir plus loin et le chapitre <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/GettingStarted#\">Démarrage rapide</ulink> du manuel "
+"pour plus d'informations sur GOsa²."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
-msgstr ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "See below for a list of updated software."
+msgstr "Voir plus loin pour la liste des logiciels mis à jour."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"Show welcome page to users when they first log in. This default start page "
+"for Iceweasel is fetched from LDAP at installation and boot time for "
+"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
+"Standalone installations."
 msgstr ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"Affichage d'une page d'accueil à la première connexion des utilisateurs. La "
+"page de démarrage par défaut d'Iceweasel est récupérée par LDAP à "
+"l'installation et au démarrage pour les profils en réseau. La page est "
+"réglée sur <ulink url=\"http://www.skolelinux.org/\"/> pour les "
+"installations autonomes."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+"Gnome option, the LXDE desktop option is only supported by the CD "
+"installation method."
 msgstr ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"Nouveau option de choix de bureau LXDE, en de KDE (par défaut) et Gnome. "
+"Tout comme l'option Gnome, l'option de bureau LXDE n'est prise en charge que "
+"par la méthode d'installation par CD."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
-msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Speed up LTSP client boot."
+msgstr "Accélérer l'amorçage des clients LTSP."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Provide a KDE menu entry for changing the password in GOsa²."
+msgstr "Entrée de menu KDE pour changer de mot de passe dans GOsa²."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</ulink> "
+"chapter of the manual."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"Pour plus de renseignements sur la façon de changer les mots de passe (en "
+"particulier pour les mots de passe expirés à l'écran de connexion KDM/GDM), "
+"veuillez consulter le chapitre <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/Users#\">Manuels pour les utilisateurs</ulink> "
+"de ce document."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
+"shown to new users."
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Ajout d'un lien vers <ulink url=\"http://linuxsignpost.org/\"/> sur la page "
+"d'accueil présentée aux nouveaux utilisateurs."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"Tous les serveurs LTSP sont des <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service"
+"\">serveurs RDP</ulink> par défaut."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"Improve handing of removable media on thin clients. Show desktop "
+"notification longer when inserting new media and provide an option to start "
+"dolphin when such media is inserted."
 msgstr ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"Amélioration de la prise en charge des périphériques amovibles sur les "
+"clients légers. Affichage plus long de la notification et ajout d'une option "
+"pour démarrer dolphin lors de l'insertion de nouveaux périphériques."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"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."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
+"is set up during installation of the Main Server. This user is up as GOsa² "
+"administrator and is also granted sudo access. The Debian Edu menu "
+"reordering has been enabled as well, by adding the user also to the "
+"<computeroutput>teachers</computeroutput> group."
 msgstr ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"Puisque la connexion du superutilisateur par GDM/KDM n'est plus autorisée, "
+"un utilisateur est créé dans LDAP pendant l'installation du serveur "
+"principal. Cet utilisateur sera administrateur de GOsa². Il possèdera aussi "
+"les droits sudo, et sera autorisé à réordonner le menu Debian Edu, étant "
+"ajouté au groupe <computeroutput>teachers</computeroutput>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
+"<computeroutput>cat</computeroutput>.."
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Les images <computeroutput>.iso</computeroutput> peuvent être copiées "
+"directement sur des clés USB en utilisant par exemple <computeroutput>dd</"
+"computeroutput>, ou même <computeroutput>cat</computeroutput>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New roaming workstation profile for laptops."
+msgstr ""
+"Nouveau profil de station de travail mobile pour les ordinateurs portables."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Device access for all users is handled by <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"L'accès aux périphériques pour tous les utilisateurs est maintenant géré par "
+"<ulink url=\"http://wiki.debian.org/PolicyKit#\">PolicyKit</ulink>. Il n'est "
+"plus nécessaire d'appartenir à des groupes supplémentaires pour accéder aux "
+"périphériques."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Un avertissement sera affiché quand les disques sont trop petits pour "
+"installer le profil sélectionné."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"Modification du partitionnement pour les installations autonomes pour avoir "
+"seulement une partition /home séparée, mais plus de partition /usr."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"More tests in the test suite, and correct some of the tests that failed "
+"earlier."
 msgstr ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"La suite de tests en contient davantage et corrige certains tests qui "
+"échouaient avant."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"Make sure to report an error and abort the installation when trying to use "
+"the netinst images without a working Internet connection, instead of "
+"silently installing a broken system."
 msgstr ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"Quand la connexion à Internet ne fonctionne pas lors de l'utilisation d'une "
+"image d'installation par le réseau, une erreur est signalée et "
+"l'installation est abandonnée au lieu d'installer un système défectueux sans "
+"prévenir."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Squeeze:"
+msgstr "Toutes les nouveautés de Debian « Squeeze » :"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"compatibility with the FHS v2.3 and software developed for version 3.2 of "
+"the LSB."
+msgstr ""
+"compatibilité avec la norme de la hiérarchie des systèmes de fichiers FHS "
+"v2.3 et les logiciels développés pour la version 3.2 de la base standard "
+"Linux LSB."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 2.6.32"
+msgstr "Noyau Linux version 2.6.32"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+msgstr "Environnements de bureau KDE « Plasma » 4.4 et GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 3.5"
+msgstr "Navigateur web Iceweasel 3.5"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "OpenOffice.org 3.2.1"
+msgstr "OpenOffice.org 3.2.1"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 9.3"
+msgstr "Boîte à outils éducative GCompris 9.3"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 10.04.2"
+msgstr "Créateur de musique Rosegarden 10.04.2"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.6.10"
+msgstr "Éditeur d'images Gimp 2.6.10"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.0"
+msgstr "Univers virtuel Celestia 1.6.0"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.10.4"
+msgstr "Planétarium virtuel Stellarium 0.10.4"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+"Debian Squeeze contient plus de 10 000 nouveaux paquets prêts à être "
+"installés, dont le navigateur Chromium."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"Des informations supplémentaires sur Debian Squeeze 6.0 sont disponibles "
+"dans les <ulink url=\"http://www.debian.org/releases/squeeze/releasenotes"
+"\">notes de publication</ulink> et le <ulink url=\"http://www.debian.org/"
+"releases/squeeze/installmanual\">manuel d'installation</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
+"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"Le réseau 10.0.0.0/8 est utilisé à la place de 10.0.2.0/23. La passerelle "
+"par défaut est 10.0.0.1/8 et non plus 10.0.2.1/8."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"The dynamic DHCP range was extended on the backbone network to around 4k IP "
+"addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"L'intervalle du DHCP dynamique a été étendu sur le réseau central à environ "
+"4000 adresses IP, et environ 200 adresses IP pour le réseau des clients "
+"légers."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"The DHCP network for 10.0.0.0/8 has been renamed from "
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"Le réseau DHCP pour 10.0.0.0/8 a été renommé de <computeroutput>barebone</"
+"computeroutput> en <computeroutput>intern</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"There are no pre-defined host entries for client systems in DNS anymore "
+"(staticXX, ..., dhcpYY...)"
 msgstr ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"Il n'y a plus d'entrées d'hôtes prédéfinies pour les systèmes clients dans "
+"DNS (staticXX, ..., dhcpYY...)."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "MIT Kerberos5 used for user authentication, enabled for:"
 msgstr ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"Utilisation de MIT Kerberos 5 pour l'authentification des utilisateurs, "
+"activée pour :"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
-msgstr ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "PAM"
+msgstr "PAM"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "IMAP"
+msgstr "IMAP"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "SMTP"
+msgstr "SMTP"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"NFSv4, mais sans confidentialité/intégrité/authentification Kerberos. Les "
+"machines doivent toujours être ajoutées au groupe réseau "
+"<computeroutput>workstation</computeroutput> pour pouvoir monter les "
+"répertoires personnels."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+msgstr "Prise en charge complète de Samba NT4 pour Windows XP/Vista/7."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+"A complete PXE boot environment is setup when installing from the DVD, so "
+"that further installations can be done using PXE network installs only. A "
+"new script pxe-addfirmware is provided to support more hardware models "
+"needing firmware."
 msgstr ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
-
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
-msgstr "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+"Un environnement complet d'amorçage PXE est configuré lors de l'installation "
+"depuis le DVD, de sorte que les installations suivantes peuvent se faire via "
+"PXE uniquement. Un nouveau script pxe-addfirmware est fourni pour prendre en "
+"charge plus de matériel nécessitant des microprogrammes (« firmware »)."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"Remove all hard coded settings on workstations, and configure workstations "
+"and roaming workstations using settings detected from the environment using "
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"Suppression de tous les réglages sur les stations de travail, et configurer "
+"les stations de travail (mobiles ou non) pour utiliser les réglages détectés "
+"depuis l'environnement par DNS, DHCP et LDAP. Consultez cet <ulink url="
+"\"http://people.skolelinux.org/pere/blog/"
+"No_hardcoded_config_on_Debian_Edu_clients.html\">article de blog</ulink> qui "
+"contient plus d'informations sur les changements."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+"Mise à jour des traduction pour les chaînes utilisées dans l'installateur. "
+"Ces chaînes sont maintenant disponibles en 28 langues."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
+"proof-read with corrections was done by a native English linguist."
 msgstr ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"Le manuel de Debian Edu Squeeze a été retravaillé et amélioré. Une relecture "
+"et des corrections ont été faites par un linguiste dont l'anglais est la "
+"langue maternelle."
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
-msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
+msgstr ""
+"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."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet"
-msgstr "Annexe B — À propos des CD/DVD d'installation autonome Debian Edu"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to many language tasks, especially French and Danish."
+msgstr ""
+"Améliorations apportées à de nombreuses langues, notamment le français et le "
+"danois."
 
-#. type: Content of: <article><section><para>
-msgid "Debian Edu Live CD/DVDs for Squeeze are not available at the moment."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to the welcome web page shown at first logins."
 msgstr ""
-"Les CD et DVD d'installation autonome Debian Edu pour Squeeze ne sont pas "
-"disponibles actuellement."
+"Améliorations apportées à la page d'accueil affichée à la première connexion."
 
-#. type: Content of: <article><section><section><title>
-msgid "Features of the Standalone image"
-msgstr "Caractéristiques de l'image Autonome"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add new Japanese, Portuguese and Catalan translations of the welcome web "
+"page."
+msgstr ""
+"Ajout de traductions japonaise, portugaise et catalane de la page d'accueil."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Almost all packages from the Standalone profile"
-msgstr "presque tous les paquets du profil Autonome ;"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
+msgstr ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">les installations par CD et DVD sont différentes</ulink> — le DVD n'est "
+"adapté qu'à l'installation d'un environnement KDE."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "All packages from the laptop task"
-msgstr "tous les paquets de l'utilisation ordinateur portable ;"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
+"netinst installation CDs. It is still possible to run Debian Edu on "
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+msgstr ""
+"Arrêt de la prise en charge de l'architecture <computeroutput>powerpc</"
+"computeroutput> par les CD d'installation par le réseau. Il est toujours "
+"possible de faire fonctionner Debian Edu sur <computeroutput>powerpc</"
+"computeroutput>, mais l'installation est moins automatisée."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The KDE desktop profile for students/pupils."
-msgstr "Le profil de bureau KDE pour étudiants/élèves."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop gtick in the default installation, because it doesn't work on thin "
+"clients (BTS #566335)."
+msgstr ""
+"Retrait de gtick de l'installation par défaut, car il ne marche plus sur les "
+"clients légers (BTS #566335)."
 
-#. type: Content of: <article><section><section><title>
-msgid "Activating translations and regional support"
-msgstr "Activation des traductions et de la prise en charge de la localisation"
+#. type: Content of: <article><section><section><section><title>
+msgid "New administration tool: GOsa²"
+msgstr "Nouvel outil d'administration : GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want.  To activate a given keyboard layout, use the "
-"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
-"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live CD build script "
-"documentation</ulink>.  Here is a list of commonly used locale codes:"
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
-"Pour activer une traduction spécifique, amorcez en utilisant l'option "
-"<computeroutput>locale=ll_CC.UTF-8</computeroutput>, où ll_CC.UTF-8 est le "
-"code des paramètres régionaux souhaités. Pour activer une disposition de "
-"clavier spécifique, utilisez l'option <computeroutput>keyb=KB</"
-"computeroutput>, où KB est la disposition souhaitée. Davantage "
-"d'informations sur cette fonctionnalité <ulink url=\"http://wiki.debian.org/"
-"DebianLive/l10n\">sont disponibles dans la documentation du script de "
-"construction du CD d'installation autonome</ulink>. Voici une liste de codes "
-"de paramètres régionaux couramment utilisés :"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
-msgstr "<emphasis role=\"strong\">Langue (Région)</emphasis>"
+"gosa (2.6.11-3+squeeze1~edu+1) de la version 6.0.5 à venir de Debian, avec :"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Locale value</emphasis>"
-msgstr "<emphasis role=\"strong\">Code de paramètres régionaux</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix DHCP host removal. Closes: #650258"
+msgstr "Correction de la suppression d'hôte DHCP, bogue nº 650258."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
-msgstr "<emphasis role=\"strong\">Disposition de clavier</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Backport user generator unicode character transliteration. Closes: #657086"
+msgstr ""
+"Rétroportage de la translitération en caractères Unicode du créateur "
+"d'utilisateur, bogue nº 657086."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Bokmål"
-msgstr "norvégien Bokmål"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Customized GOsa² configuration to better suit the Debian Edu network "
+"architecture."
+msgstr ""
+"Configuration de GOsa² adaptée pour mieux convenir à l'architecture du "
+"réseau Debian Edu."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nb_NO.UTF-8"
-msgstr "nb_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"GOsa² updates DNS and NFS exports immediately when a system is updated in "
+"LDAP, making diskless workstations work right after they are added to the "
+"required netgroup."
+msgstr ""
+"GOsa² met le DNS et les partages NFS immédiatement à jour quand un système "
+"est mis à jour dans LDAP, rendant les stations de travail sans disque "
+"fonctionnelles tout de suite après qu'elles aient été ajoutées au groupe "
+"réseau requis."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no"
-msgstr "no"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
+"objects using information gathered by sitesummary, to make it easier to add "
+"new computers to the network."
+msgstr ""
+"Ajout du script sitesummary2ldapdhcp pour mettre à jour ou peupler GOsa² "
+"avec des objets du système en utilisant des informations collectées par "
+"sitesummary, pour simplifier l'ajout de nouvelles machines sur le réseau."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Nynorsk"
-msgstr "norvégien nynorsk"
+#. type: Content of: <article><section><section><section><title>
+msgid "More software changes"
+msgstr "Changements d'infrastructure"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nn_NO.UTF-8"
-msgstr "nn_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+msgstr ""
+"Ajout de l'éditeur vidéo Kdenlive 0.7.7 et de l'outil de géométrie "
+"interactive Geogebra 3.2.42."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "German"
-msgstr "allemand"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change default package manager from adept to synaptic, to avoid getting two "
+"graphical package managers installed by default."
+msgstr ""
+"Remplacement du gestionnaire de paquets par défaut adept par synaptic pour "
+"éviter d'avoir deux gestionnaires de paquets en mode graphique installés par "
+"défaut."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de_DE.UTF-8"
-msgstr "de_DE.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
+"KDE."
+msgstr ""
+"Installation d'openoffice.org-kde par défaut pour assurer qu'OpenOffice.org "
+"utilise les boîtes de dialogue KDE dans le bureau KDE."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de"
-msgstr "de"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change video player setup to install different players in KDE "
+"(dragonplayer), Gnome (totem) and LXDE (totem)."
+msgstr ""
+"Changement de la configuration du lecteur vidéo pour installer différents "
+"lecteurs dans KDE (dragonplayer), Gnome (totem) et LXDE (totem)."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "French (France)"
-msgstr "français (France)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
+"default KDE installation."
+msgstr ""
+"Ajout des outils KDE freespacenotifier, kinfocenter et update-notifier-kde à "
+"l'installation KDE par défaut."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr_FR.UTF-8"
-msgstr "fr_FR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace network-manager-kde with plasma-widget-networkmanagement in the "
+"standalone KDE profile"
+msgstr ""
+"Remplacement de network-manager-kde par plasma-widget-networkmanagement dans "
+"le profil autonome KDE."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr"
-msgstr "fr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+msgstr ""
+"Installation d'usb-modeswitch sur les portables pour prendre en charge les "
+"appareils USB à double mode."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Greek (Greece)"
-msgstr "grec (Grèce)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add cifs-utils to the default installation to ensure SMB mounting can work "
+"in any profile."
+msgstr ""
+"Ajout de cifs-utils à l'installation par défaut pour assurer que le montage "
+"SMB fonctionne avec n'importe quel profil."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el_GR.UTF-8"
-msgstr "el_GR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
+"and valgrind from the default installation and the DVD to make room for "
+"higher priority packages."
+msgstr ""
+"Retrait d'octave, gpscorrelate, qlandkarteqt, viking, starplot, kig, kseg, "
+"luma et valgrind de l'installation par défaut et du DVD pour faire de la "
+"place pour des paquets à la priorité plus élevée."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el"
-msgstr "el"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
+"authoritive source of host names."
+msgstr ""
+"Abandon de libnss-mdns des profils statiques, pour assurer que le DNS est la "
+"source autoritaire des noms d'hôtes."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Japanese"
-msgstr "japonais"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
+"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
+"installed instead.)"
+msgstr ""
+"<computeroutput>freerdp-x11</computeroutput> est le client RDP et VNC "
+"installé par défaut (à la place de <computeroutput>rdesktop</"
+"computeroutput>)."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "ja_JP.UTF-8"
-msgstr "ja_JP.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make the LDAP server handle more clients after increasing the server's file "
+"descriptor limit from 1024 to 32768."
+msgstr ""
+"Prise en charge par le serveur LDAP de plus de clients après l'augmentation "
+"du descripteur de fichiers du serveur de 1024 à 32768."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "jp"
-msgstr "jp"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
+msgstr ""
+"Ajout de code pour réactiver les files CUPS arrêtées toutes les heures sur "
+"le serveur principal, et purge des files CUPS toutes les nuits. Ces deux "
+"fonctions peuvent être désactivées dans LDAP."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Northern Sami (Norway)"
-msgstr "same du Nord (Norvège)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide network blocking / exam mode by default, controlled by LDAP. In "
+"addition to network blocking, changes to the Squid proxy configuration is "
+"needed."
+msgstr ""
+"Modes blocage et examen pour le réseau fournis par défaut et contrôlés par "
+"LDAP. En plus du blocage réseau, des changements dans la configuration du "
+"serveur mandataire (« proxy ») Squid sont nécessaires."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "se_NO"
-msgstr "se_NO"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable automatic extending of full file systems on the Main Server by "
+"default. This can be disabled in LDAP."
+msgstr ""
+"Activation de l'extension automatique des systèmes de fichiers pleins sur le "
+"serveur principal par défaut. Cela peut être désactivé dans LDAP."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no(smi)"
-msgstr "no(smi)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change SSL certificate name used by the LDAP server and adjust clients to "
+"use the new name to be able to enable certificate checking on clients."
+msgstr ""
+"Changement du nom de certificat SSL utilisé par le serveur LDAP et "
+"ajustement des clients pour utiliser le nouveau nom et activer la "
+"vérification du certificat."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
-"the live images. Not all locales have translations installed, though.  The "
-"keyboard layout names can be found in /usr/share/keymaps/i386/."
+"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
+"setup used for DNS."
 msgstr ""
-"Une liste complète des codes de paramètres régionaux est disponible dans "
-"<computeroutput>/usr/share/i18n/SUPPORTED</computeroutput>, mais seuls les "
-"paramètres régionaux UTF-8 sont pris en charge par les images d'installation "
-"autonome. Cependant, toutes les localisations ne disposent pas de "
-"traductions. Les noms de dispositions de clavier peuvent être trouvés dans /"
-"usr/share/keymaps/i386/."
+"Réglage de PowerDNS pour utiliser le mode LDAP strict, pour simplifier la "
+"configuration utilisée pour le DNS."
 
-#. type: Content of: <article><section><section><title>
-msgid "Stuff to know"
-msgstr "Choses à savoir"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Simplify autofs LDAP rules to make sure they work with extra home directory "
+"partitions exported from the main-server without any changes."
+msgstr ""
+"Simplifications des règles autofs LDAP pour assurer leur fonctionnement sans "
+"modifications avec les partitions supplémentaires contenant les répertoires "
+"personnels, exportées depuis le serveur principal."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The password for the user is \"user\"; root has no passwd set."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
-"Le mot de passe pour l'utilisateur est « user », le superutilisateur n'a pas "
-"de mot de passe défini."
+"Système de sauvegarde rendu plus robuste en prenant effectuant une "
+"sauvegarde de la base de données de LDAP ainsi que son redémarrage."
 
-#. type: Content of: <article><section><section><title>
-msgid "Known issues with the image"
-msgstr "Problèmes connus avec l'image"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
+msgstr ""
+"La connexion du superutilisateur est refusée pour KDM et GDM — voir ci-"
+"dessus et la section <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/GettingStarted#\">Démarrage rapide</ulink> pour les "
+"détails."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "There are no squeeze images yet"
-msgstr "Il n'existe pas encore d'images pour Squeeze."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Clients set up to shut down at night will stay up for at least an hour if "
+"they are turned on manually between 16:00 and 07:00."
+msgstr ""
+"Les clients configurés pour s'éteindre pour la nuit resteront en activité "
+"pendant au moins une heure s'ils ont été allumés manuellement entre 16 h 00 "
+"et 7 h 00."
 
-#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/sad.png"
-msgstr "./images/sad.png"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Additionally use local NTP clock on the main-server to ensure clients and "
+"server sync clocks also when disconnected from the Internet."
+msgstr ""
+"Utilisation additionnelle d'une horloge NTP locale sur serveur principal "
+"pour s'assurer que les clients et le serveur se synchronisent même quand ils "
+"ne sont pas connectés à Internet."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-msgid ":("
-msgstr ":("
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Access to Debian repositories is always done via a proxy on the main server "
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+msgstr ""
+"L'accès aux dépôts Debian se fait toujours par l'intermédiaire d'un "
+"mandataire sur le serveur principal — plus d'information sur les détails "
+"d'implémentation sont disponibles en utilisant <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">DHCP et WPAD</ulink>."
 
-#. type: Content of: <article><section><section><title>
-msgid "Download"
-msgstr "Téléchargement"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "The home0 partition is mounted nosuid, to increase security."
+msgstr ""
+"La partition home0 est montée avec l'option nosuid pour améliorer la "
+"sécurité."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
+"from 144 to 24 MiB."
 msgstr ""
-"L'image, de taille 1.2 Gio, devrait être disponible (mais pas pour "
-"l'instant) en utilisant <ulink url=\"ftp://ftp.skolelinux.org/cd-squeeze-"
-"live/\">FTP</ulink>, <ulink url=\"http://ftp.skolelinux.org/cd-squeeze-live/"
-"\">HTTP</ulink> ou rsync depuis <computeroutput>ftp.skolelinux.org</"
-"computeroutput> à <computeroutput>cd-squeeze-live/</computeroutput>."
+"La configuration de KDE/Akonadi a été modifiée pour réduire l'empreinte "
+"mémoire de chaque utilisateur sur le disque de 144 à 24 Mio."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix C - Features in older releases"
-msgstr "Annexe C — Fonctionnalités dans les publications précédentes"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New tool notify-local-users to send desktop notification to all logged in "
+"users on a machine.  Useful for thin client servers."
+msgstr ""
+"Nouvel outils notify-local-users pour envoyer des notifications à tous les "
+"utilisateurs connectés à une station de travail. Très utile pour les "
+"serveurs de clients légers."
 
 #. type: Content of: <article><section><section><title>
 msgid "New in Debian Edu 5.0.6+edu1 Codename \"Lenny\" released 2010-10-05"
@@ -11317,6 +11181,245 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "[attachment:welcome_to_tjener.png]"
+#~ msgstr "[attachment:welcome_to_tjener.png]"
+
+#~ msgid "Debian Edu login"
+#~ msgstr "Connexion à Debian Edu"
+
+#~ msgid "Installer boot menu"
+#~ msgstr "Menu de démarrage de l'installateur"
+
+#~ msgid "Installer advanced options screen 1"
+#~ msgstr "Options avancées de l'installateur (écran 1)"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Options avancées de l'installateur (écran 2)"
+
+#~ msgid "Installer help screen"
+#~ msgstr "Écran d'aide de l'installateur"
+
+#~ msgid "A note on some RAID controllers"
+#~ msgstr "Note à propos de certains contrôleurs RAID"
+
+#~ msgid ""
+#~ "When using a USB drive to add missing firmware during install, with some "
+#~ "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
+#~ "installation results in a GRUB error. A workaround for this problem is to "
+#~ "remove the USB drive after the firmware is loaded, and preferably before "
+#~ "partitioning starts."
+#~ msgstr ""
+#~ "Quand vous utilisez un disque USB pour ajouter des microprogrammes "
+#~ "manquants lors de l'installation, certains contrôleurs RAID causeront "
+#~ "l'installation de GRUB sur le disque USB. Cela provoquera une erreur GRUB "
+#~ "lors du redémarrage après l'installation. Pour contourner ce problème, "
+#~ "enlever le disque USB une fois que le microprogramme est installé, et de "
+#~ "préférence avant que le partitionnement ne débute."
+
+#~ msgid ""
+#~ "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#~ "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#~ "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+#~ msgstr ""
+#~ "Plus d'informations sont disponibles dans le <ulink url=\"http://bugs."
+#~ "skolelinux.org/show_bug.cgi?id=1395\">bogue Debian Edu nº 1395</ulink> et "
+#~ "le bogue Debian nº <ulink url=\"http://bugs.debian.org/516280\">516280</"
+#~ "ulink>."
+
+#~ msgid "pxe-tjener.png"
+#~ msgstr "pxe-tjener.png"
+
+#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#~ msgid "02-select_a_language.png"
+#~ msgstr "02-select_a_language.png"
+
+#~ msgid "03-select_your_location.png"
+#~ msgstr "03-select_your_location.png"
+
+#~ msgid "04-Configure_the_keyboard.png"
+#~ msgstr "04-Configure_the_keyboard.png"
+
+#~ msgid "05-Detect_and_mount_CD-ROM.png"
+#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#~ msgid "06-Load_installer_components_from_CD.png"
+#~ msgstr "06-Load_installer_components_from_CD.png"
+
+#~ msgid "07-Detect_network_hardware.png"
+#~ msgstr "07-Detect_network_hardware.png"
+
+#~ msgid "08-Choose_Debian_Edu_profile.png"
+#~ msgstr "08-Choose_Debian_Edu_profile.png"
+
+#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+
+#~ msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#~ msgid "12-Set_up_users_and_passwords.png"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#~ msgid "12a-Set_up_users_and_passwords.png"
+#~ msgstr "12a-Set_up_users_and_passwords.png"
+
+#~ msgid "12b-Set_up_users_and_passwords.png"
+#~ msgstr "12b-Set_up_users_and_passwords.png"
+
+#~ msgid "12c-Set_up_users_and_passwords.png"
+#~ msgstr "12c-Set_up_users_and_passwords.png"
+
+#~ msgid "13-Install the base system.png"
+#~ msgstr "13-Install the base system.png"
+
+#~ msgid "14-Select_and_install_software.png"
+#~ msgstr "14-Select_and_install_software.png"
+
+#~ msgid "17-Select_and_install_software.png"
+#~ msgstr "17-Select_and_install_software.png"
+
+#~ msgid "18-Build LTSP chroot.png"
+#~ msgstr "18-Build LTSP chroot.png"
+
+#~ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#~ msgid "20-Finish_the_Installation.png"
+#~ msgstr "20-Finish_the_Installation.png"
+
+#~ msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#~ msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#~ msgid "23-Tjener-KDM_Login.png"
+#~ msgstr "23-Tjener-KDM_Login.png"
+
+#~ msgid "24-Tjener-KDE_Start.png"
+#~ msgstr "24-Tjener-KDE_Start.png"
+
+#~ msgid "26-Tjener-KDE_Desktop_Browser.png"
+#~ msgstr "26-Tjener-KDE_Desktop_Browser.png"
+
+#~ msgid "27-Tjener-KDE_Desktop.png"
+#~ msgstr "27-Tjener-KDE_Desktop.png"
+
+#~ msgid "29-Diskless-WS-KDM_Login.png"
+#~ msgstr "29-Diskless-WS-KDM_Login.png"
+
+#~ msgid "30-ThinClient-LDM_Login.png"
+#~ msgstr "30-ThinClient-LDM_Login.png"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#~ msgid "Debian Edu desktop"
+#~ msgstr "bureau Debian Edu"
+
+#~ msgid "GOsa² overview page after login as the first user"
+#~ msgstr ""
+#~ "Page d'aperçu de GOsa² après connexion en tant que premier utilisateur"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
+#~ "to install the main server, all user passwords exept that one for the "
+#~ "first user will expire in only 2 days.  To fix this, please execute the "
+#~ "following script in a terminal.  This script is included in r1."
+#~ msgstr ""
+#~ "<emphasis role=\"stong\">Remarque importante :</emphasis> Si Wheezy r0 a "
+#~ "été utilisée pour installer le serveur principal, tous les mots de passe, "
+#~ "sauf celui du premier utilisateur expireront après 2 jours. Pour corriger "
+#~ "cela, veuillez exécuter le script suivant dans un terminal. Ce script est "
+#~ "inclus dans la version r1."
+
+#~ msgid ""
+#~ "#!/bin/bash\n"
+#~ "  #\n"
+#~ "  # /usr/share/debian-edu-config/tools/password-fix-wheezy-r0\n"
+#~ "  #\n"
+#~ "  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
+#~ "  # in Debian Edu Wheezy up to r0; for new users the password will\n"
+#~ "  # never expire. For existing users this will be the case after they've\n"
+#~ "  # changed their password. Give old users the chance to change the\n"
+#~ "  # password, exclude not affected accounts: templates and first user.\n"
+#~ "  #\n"
+#~ "  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|"
+#~ "newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
+#~ "    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
+#~ "  done\n"
+#~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
+#~ msgstr ""
+#~ "#!/bin/bash\n"
+#~ "  #\n"
+#~ "  # /usr/share/debian-edu-config/tools/password-fix-wheezy-r0\n"
+#~ "  #\n"
+#~ "  # Corriger l'expiration des mots de passe après deux\n"
+#~ "  # jours (#664596), introduite par erreur dans Debian Edu Wheezy\n"
+#~ "  # jusqu'à la version r0.\n"
+#~ "  # Pour les nouveaux utilisateurs, le mot de passe n'expirera jamais.\n"
+#~ "  # Pour les utilisateurs existants ce sera le cas après que leur\n"
+#~ "  # mot de passe aura été changé\n"
+#~ "  # Donner la possibilité aux anciens utilisateurs de changer\n"
+#~ "  # leur mot de passe, en excluant les comptes non concernés   # (modèles "
+#~ "et premier utilisateur).\n"
+#~ "  #\n"
+#~ "  for i in $(getent passwd | grep home0 | egrep -v 'newteacher|"
+#~ "newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
+#~ "    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
+#~ "  done\n"
+#~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
+
+#~ msgid "Filterbox"
+#~ msgstr "Boîte de filtre"
+
+#~ msgid "Editing user data"
+#~ msgstr "Modifier les données d'utilisateur"
+
+#~ msgid "Set user password"
+#~ msgstr "Définir le mot de passe utilisateur"
+
+#~ msgid "create group"
+#~ msgstr "Créer un groupe"
+
+#~ msgid "GOsa² systems listing"
+#~ msgstr "Liste des systèmes dans GOsa²"
+
+#~ msgid "Host details"
+#~ msgstr "Renseignements sur le système"
+
+#~ msgid "Modify host"
+#~ msgstr "Modification du système"
+
+#~ msgid "Add netgroup"
+#~ msgstr "Ajout de groupe réseau"
+
+#~ msgid "slbackup-php Maintenance"
+#~ msgstr "Maintenance de slbackup-php"
+
+#~ msgid ""
+#~ "The Debian Edu Wheezy Manual has generally been cleaned up and improved. "
+#~ "A proof-read with corrections was done by a native English linguist."
+#~ msgstr ""
+#~ "Le manuel de Debian Edu Wheezy a été retravaillé et amélioré. Une "
+#~ "relecture et des corrections ont été faites par un linguiste dont "
+#~ "l'anglais est la langue maternelle."
+
+#~ msgid ""
+#~ "gosa (2.6.11-3+wheezy1~edu+1) from the upcoming 6.0.5 Debian point "
+#~ "release, with:"
+#~ msgstr ""
+#~ "gosa (2.6.11-3+wheezy1~edu+1) de la version 6.0.5 à venir de Debian, "
+#~ "avec :"
+
 #~ msgid ""
 #~ "Create a user with membership in the \"admins\" group (if not already "
 #~ "existing)"
@@ -11477,11 +11580,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-wheezy/debian-edu-wheezy-manual.it.po
similarity index 94%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 128e55f..02ed234 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -1,13 +1,13 @@
-# translation of debian-edu-lenny-manual.po to italian
+# translation of debian-edu-squeeze-manual.po to italian
 # release-manual for debian edu
 # Copyright (C) 2007 Holger Levsen and others
-# Source URL: http://wiki.debian.org/DebianEdu/Documentation/Etch/
+# Source URL: http://wiki.debian.org/DebianEdu/Documentation/Lenny/
 #
 # Claudio Carboncini <claudio.carboncini at gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: debian-edu-lenny-manual\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"Project-Id-Version: debian-edu-squeeze-manual\n"
+"POT-Creation-Date: 2013-02-14 14:40-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,32 +23,32 @@ 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 Wheezy 7.0.0+r0 Manual"
+msgstr "Manuale di Debian Edu / Skolelinux Wheezy 7.0.0+r0"
 
 #. 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 7.0.0+r0 Codename \"Wheezy\""
+msgstr "Manuale per Debian Edu 7.0.0+r0 Codename Wheezy"
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr "./images/welcome_to_tjener.png"
-
-#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu login"
-msgstr "Debian Edu login"
+#. type: Content of: <article><section><para>
+msgid ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
+msgstr ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
 
 #. 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 Wheezy 7.0.0+r0 release."
+msgstr "Questa è la guida  per Debian Edu Wheezy 7.0.0+r0 release."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> is a wiki and updated frequently."
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
 "La versione su <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> è un wiki che viene modificato frequentemente."
+"Wheezy\"/> è un wiki che viene modificato frequentemente."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -179,8 +179,8 @@ msgid "Network"
 msgstr "La rete"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Debian_Edu_Network_Squeeze.png"
-msgstr "./images/Debian_Edu_Network_Squeeze.png"
+msgid "./images/Debian_Edu_Network_Wheezy.png"
+msgstr "./images/Debian_Edu_Network_Wheezy.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
@@ -1318,13 +1318,13 @@ msgstr "Dove trovare maggiori informazioni"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-"Debian Squeeze</ulink> before you start installing a system for production "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 "Si raccomanda di leggere o almeno dare uno sguardo alle <ulink url=\"http://"
-"www.debian.org/releases/squeeze/releasenotes\">release notes per Debian "
-"Squeeze </ulink> prima di cominciare a installare un sistema funzionante. "
+"www.debian.org/releases/wheezy/releasenotes\">release notes per Debian "
+"Wheezy </ulink> prima di cominciare a installare un sistema funzionante. "
 "Prova Debian Edu/Skolelinux, dovrebbe funzionare."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
@@ -1351,20 +1351,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Even more information about the Debian Squeeze release is available in its "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Even more information about the Debian Wheezy release is available in its "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"Altre informazioni su Debian Squeeze sono disponibili nel suo <ulink url="
-"\"http://www.debian.org/releases/squeeze/installmanual\">installation "
-"manual</ulink>."
+"Altre informazioni su Debian Wheezy sono disponibili nel suo <ulink url="
+"\"http://www.debian.org/releases/wheezy/installmanual\">installation manual</"
+"ulink>."
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
-"Download del supporto di installazione per Debian Edu 6.0.6+r1 Codename "
-"\"Squeeze\""
+"Download del supporto di installazione per Debian Edu 7.0.0+r0 Codename "
+"Wheezy"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "DVD for i386, amd64"
@@ -1380,29 +1380,37 @@ msgstr ""
 "sia per l'installazione di macchine amd64 e i386. Per fare il download via "
 "FTP, HTTP o rsync:"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+msgstr ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1418,27 +1426,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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1450,27 +1458,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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -1520,13 +1528,9 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Selezionare il tipo d'installazione"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
-msgstr "Installer del menu di avvio"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:01-Installer_boot_menu.png]"
+msgstr "[attachment:01-Installer_boot_menu.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1576,13 +1580,9 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> dà alcuni suggerimenti "
 "sull'utilizzo dell'installer"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
-msgstr "./images/Installer_advanced_options_a.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
-msgstr "Opzioni avanzate dell'installer schermo 1"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_a.png]"
+msgstr "[attachment:Installer_advanced_options_a.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1637,13 +1637,9 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> ha bisogno di "
 "un file di preconfigurazione."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Opzioni avanzate di installazione schermo 2"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_b.png]"
+msgstr "[attachment:Installer_advanced_options_b.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1697,13 +1693,9 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> ha "
 "bisogno di un file di preconfigurazione."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
-msgstr "./images/Installer_help.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer help screen"
-msgstr "Schermo di aiuto dell'installer"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_help.png]"
+msgstr "[attachment:Installer_help.png]"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1816,14 +1808,14 @@ msgstr "Il processo d'installazione"
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">system requirements</ulink> and make sure you have at "
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
-"Ricorda i <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">requisiti di sistema</ulink> e assicurarsi di avere "
-"almeno due schede di rete (NICs) se si pianifica di installare un server "
-"thin client."
+"Ricorda i <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/"
+"Requirements\">requisiti di sistema</ulink> e assicurarsi di avere almeno "
+"due schede di rete (NICs) se si pianifica di installare un server thin "
+"client."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a language (for the installation and the installed system)"
@@ -2055,13 +2047,13 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2086,8 +2078,8 @@ msgstr ""
 "prendere dalla rete cambia in base al profilo scelto:"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
-msgstr "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
+msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "Main server: 8 out of 115 MiB downloaded."
@@ -2118,34 +2110,6 @@ msgid "Minimal: 12 of 83 MiB downloaded."
 msgstr "Minimal: 12 of 83 MiB da scaricare."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on some RAID controllers"
-msgstr "Una nota su alcuni controller RAID"
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"When using a USB drive to add missing firmware during install, with some "
-"RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-"installation results in a GRUB error. A workaround for this problem is to "
-"remove the USB drive after the firmware is loaded, and preferably before "
-"partitioning starts."
-msgstr ""
-"Quando si usa un chiavetta USB per aggiungere firmware mancanti durante "
-"l'installazione, con alcuni RAID-controllers GRUB si installa sulla penna "
-"USB. Così al reboot dopo l'installazione GRUB dà un errore. Un modo per "
-"aggirare questo problema è di  rimuovere la penna USB dopo aver caricato il "
-"firmware e preferibilmente prima di  iniziare il partizionamento."
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-msgstr ""
-"Maggiori informazioni sono disponibili in <ulink url=\"http://bugs."
-"skolelinux.org/show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> e Debian "
-"bug <ulink url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-
-#. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
 msgstr "Nota sull'installazione dei thin-client-server"
 
@@ -2259,13 +2223,9 @@ msgstr ""
 "Così appare il menu PXE solo con il profilo <emphasis role=\"strong\">Main-"
 "Server</emphasis>:"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/pxe-tjener.png"
-msgstr "./images/pxe-tjener.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "pxe-tjener.png"
-msgstr "pxe-tjener.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:pxe-tjener.png]"
+msgstr "[attachment:pxe-tjener.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2276,13 +2236,9 @@ msgstr ""
 "Così appare il menu PXE con i profili <emphasis role=\"strong\">Main-Server "
 "</emphasis> e <emphasis role=\"strong\">Thin-Client-Server</emphasis>:"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2324,8 +2280,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 ""
@@ -2353,10 +2309,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 "Altre informazioni si possono trovare nel <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2453,241 +2409,125 @@ msgstr ""
 "server tjener, a PXE boot on the workstation network and on the thinclient "
 "network:"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/02-select_a_language.png"
-msgstr "./images/02-select_a_language.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "02-select_a_language.png"
-msgstr "02-select_a_language.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/03-select_your_location.png"
-msgstr "./images/03-select_your_location.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "03-select_your_location.png"
-msgstr "03-select_your_location.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/04-Configure_the_keyboard.png"
-msgstr "./images/04-Configure_the_keyboard.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "04-Configure_the_keyboard.png"
-msgstr "04-Configure_the_keyboard.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "05-Detect_and_mount_CD-ROM.png"
-msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "06-Load_installer_components_from_CD.png"
-msgstr "06-Load_installer_components_from_CD.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/07-Detect_network_hardware.png"
-msgstr "./images/07-Detect_network_hardware.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "07-Detect_network_hardware.png"
-msgstr "07-Detect_network_hardware.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "08-Choose_Debian_Edu_profile.png"
-msgstr "08-Choose_Debian_Edu_profile.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "11-Participate_in_the_package_usage_survey.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12a-Set_up_users_and_passwords.png"
-msgstr "12a-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12b-Set_up_users_and_passwords.png"
-msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12b-Set_up_users_and_passwords.png"
-msgstr "12b-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12c-Set_up_users_and_passwords.png"
-msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12c-Set_up_users_and_passwords.png"
-msgstr "12c-Set_up_users_and_passwords.png"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/13-Install+the+base+system.png"
-msgstr "./images/13-Install+the+base+system.png"
+#. type: Content of: <article><section><section><para>
+msgid "FIXME: these screenshots need to be redone once we have wheezy artwork"
+msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "13-Install the base system.png"
-msgstr "13-Install the base system.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:02-select_a_language.png]"
+msgstr "[attachment:02-select_a_language.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/14-Select_and_install_software.png"
-msgstr "./images/14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:03-select_your_location.png]"
+msgstr "[attachment:03-select_your_location.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "14-Select_and_install_software.png"
-msgstr "14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:04-Configure_the_keyboard.png]"
+msgstr "[attachment:04-Configure_the_keyboard.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/17-Select_and_install_software.png"
-msgstr "./images/17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:05-Detect_and_mount_CD-ROM.png]"
+msgstr "[attachment:05-Detect_and_mount_CD-ROM.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "17-Select_and_install_software.png"
-msgstr "17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:06-Load_installer_components_from_CD.png]"
+msgstr "[attachment:06-Load_installer_components_from_CD.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/18-Build+LTSP+chroot.png"
-msgstr "./images/18-Build+LTSP+chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:07-Detect_network_hardware.png]"
+msgstr "[attachment:07-Detect_network_hardware.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "18-Build LTSP chroot.png"
-msgstr "18-Build LTSP chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
+msgstr "[attachment:08-Choose_Debian_Edu_profile.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
+msgstr "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
+msgstr "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/20-Finish_the_Installation.png"
-msgstr "./images/20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
+msgstr "[attachment:11-Participate_in_the_package_usage_survey.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "20-Finish_the_Installation.png"
-msgstr "20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12-Set_up_users_and_passwords.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12a-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12a-Set_up_users_and_passwords.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "21-Finish_the_Installation-Installation_complete.png"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12b-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12b-Set_up_users_and_passwords.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12c-Set_up_users_and_passwords.png]"
+msgstr "[attachment:12c-Set_up_users_and_passwords.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "22-Tjener_GRUB_boot_menu.png"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:13-Install the base system.png]"
+msgstr "[attachment:13-Install the base system.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:14-Select_and_install_software.png]"
+msgstr "[attachment:14-Select_and_install_software.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:17-Select_and_install_software.png]"
+msgstr "[attachment:17-Select_and_install_software.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/24-Tjener-KDE_Start.png"
-msgstr "./images/24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:18-Build LTSP chroot.png]"
+msgstr "[attachment:18-Build LTSP chroot.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "24-Tjener-KDE_Start.png"
-msgstr "24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
+msgstr "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:20-Finish_the_Installation.png]"
+msgstr "[attachment:20-Finish_the_Installation.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "26-Tjener-KDE_Desktop_Browser.png"
-msgstr "26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
+msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr "./images/27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "27-Tjener-KDE_Desktop.png"
-msgstr "27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/29-Diskless-WS-KDM_Login.png"
-msgstr "./images/29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:24-Tjener-KDE_Start.png]"
+msgstr "[attachment:24-Tjener-KDE_Start.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "29-Diskless-WS-KDM_Login.png"
-msgstr "29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+msgstr "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/30-ThinClient-LDM_Login.png"
-msgstr "./images/30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:27-Tjener-KDE_Desktop.png]"
+msgstr "[attachment:27-Tjener-KDE_Desktop.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "30-ThinClient-LDM_Login.png"
-msgstr "30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "./images/31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:30-ThinClient-LDM_Login.png]"
+msgstr "[attachment:30-ThinClient-LDM_Login.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
+msgstr "[attachment:31-ThinClient-KDE_Desktop.png]"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2749,13 +2589,9 @@ msgstr ""
 "La sezione  <link linkend=\"NetworkClients\">HowTo</link> descrive altri "
 "accorgimenti e trucchi e alcune risposte alle domande frequenti."
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/getting-started-desktop.png"
-msgstr "./images/getting-started-desktop.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu desktop"
-msgstr "Debian Edu desktop"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:getting-started-desktop.png]"
+msgstr "[attachment:getting-started-desktop.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2829,11 +2665,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"If you are using a new Debian Edu Squeeze machine, the site certificate will "
+"If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
-"In caso si usi una macchina nuova per Debian Edu Squeeze, il certificato "
-"sarà riconosciuto dal browser."
+"In caso si usi una macchina nuova per Debian Edu Wheezy, il certificato sarà "
+"riconosciuto dal browser."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2857,13 +2693,9 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "Accesso a GOsa² e Pagina iniziale"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa2_overview.png"
-msgstr "./images/gosa2_overview.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² overview page after login as the first user"
-msgstr "Pagina di GOsa² dopo il login come primo utente"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:gosa2_overview.png]"
+msgstr "[attachment:gosa2_overview.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3070,63 +2902,13 @@ msgstr ""
 "degli utenti. Ora si dovrebbe essere in grado di accedere con quel nome "
 "utente su qualsiasi macchina Skolelinux all'interno della rete."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Please note:</emphasis> If Squeeze/r0 was used to "
-"install the main server, all user passwords exept that one for the first "
-"user will expire in only 2 days.  To fix this, please execute the following "
-"script in a terminal.  This script is included in r1."
-msgstr ""
-"<emphasis role=\"strong\">Attenzione:</emphasis> Se Squeeze/r0 è stato "
-"utilizzato per installare il server principale, tutte le password degli "
-"utenti tranne quella del primo utente scadranno in soli 2 giorni.  Per "
-"risolvere questo problema, si prega di eseguire il seguente script in un "
-"terminale.  Questo script è incluso in r1. "
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-msgstr ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
 msgstr "Cercare, modificare e cancellare utenti"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/filterbox.png"
-msgstr "./images/filterbox.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Filterbox"
-msgstr "Il box Filter"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:filterbox.png]"
+msgstr "[attachment:filterbox.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3167,13 +2949,9 @@ msgstr ""
 "cambiare la password dell'utente o modificare la lista dei gruppi ai quali è "
 "collegato."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/edit_user.png"
-msgstr "./images/edit_user.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Editing user data"
-msgstr "Modificare i dati utente"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:edit_user.png]"
+msgstr "[attachment:edit_user.png]"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3223,13 +3001,9 @@ msgstr ""
 "nella pagina che si presenta è possibile impostare una nuova password da voi "
 "scelta"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/change_password_administratively.png"
-msgstr "./images/change_password_administratively.png"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Set user password"
-msgstr "Configurare la password dell'utente"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:change_password_administratively.png]"
+msgstr "[attachment:change_password_administratively.png]"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3342,17 +3116,13 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestione dei gruppi con GOsa²"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/create_group.png"
-msgstr "./images/create_group.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "create group"
-msgstr "creare il gruppo"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:create_group.png]"
+msgstr "[attachment:create_group.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/list_groups.png"
-msgstr "./images/list_groups.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:list_groups.png]"
+msgstr "[attachment:list_groups.png]"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3407,14 +3177,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 ""
@@ -3507,56 +3277,40 @@ msgstr ""
 #, no-wrap
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "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"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █]]"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_list.png"
-msgstr "./images/gosa_systems_list.png"
+"enter password: █"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² systems listing"
-msgstr "GOsa² systems listing"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_host_details.png"
-msgstr "./images/gosa_systems_host_details.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Host details"
-msgstr "Dettagli dell'host"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_edit_host.png"
-msgstr "./images/gosa_systems_edit_host.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_list.png]"
+msgstr "[attachment:gosa_systems_list.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Modify host"
-msgstr "Modificare l'host"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_host_details.png]"
+msgstr "[attachment:gosa_systems_host_details.png]"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_add_netgroup.png"
-msgstr "./images/gosa_systems_add_netgroup.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_edit_host.png]"
+msgstr "[attachment:gosa_systems_edit_host.png]"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Add netgroup"
-msgstr "Aggiungere gruppi di rete (netgroup)"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgstr "[attachment:gosa_systems_add_netgroup.png]"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4009,11 +3763,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 ""
@@ -4043,13 +3797,9 @@ msgstr ""
 "Se si desidera eliminare vecchi backup, scegliere \"Maintenance\" nel "
 "menudella pagina di backup e selezionare lo snapshot da conservare:"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/slbackup-php_maintenance.png"
-msgstr "./images/slbackup-php_maintenance.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "slbackup-php Maintenance"
-msgstr "Manutenzione di slbackup-php"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:slbackup-php_maintenance.png]"
+msgstr "[attachment:slbackup-php_maintenance.png]"
 
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
@@ -4153,8 +3903,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 ""
@@ -4452,7 +4202,7 @@ msgid ""
 "installmanual\">installation manual</ulink>."
 msgstr ""
 "Occorre leggere le informazioni su Debian Stable nel suo <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">manuale di installazione</"
+"www.debian.org/releases/wheezy/installmanual\">manuale di installazione</"
 "ulink>."
 
 #. type: Content of: <article><section><section><para>
@@ -4472,16 +4222,17 @@ msgstr ""
 "supporto per Oldstable</ulink>, anche Debian Edu farà altrettanto."
 
 #. type: Content of: <article><section><title>
-msgid "Upgrades from Debian Edu Lenny"
-msgstr "Aggiornamento da Debian Edu lenny"
+msgid "Upgrades from Debian Edu Squeeze"
+msgstr "Aggiornamento da Debian Edu squeeze"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Lenny in a test "
+"Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
-"Essere preparati: essere sicuri di avere provato l'aggiornamento da Lenny in "
-"un ambiente di test o avere il backup per essere sicuri di tornare indietro."
+"Essere preparati: essere sicuri di avere provato l'aggiornamento da Squeeze "
+"in un ambiente di test o avere il backup per essere sicuri di tornare "
+"indietro."
 
 #. type: Content of: <article><section><section><title>
 msgid "The basic upgrade operation"
@@ -4490,10 +4241,10 @@ msgstr "Le operazioni di aggiornamento di base"
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"lenny\" with \"squeeze\"."
+"occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 "Modificare il file <computeroutput>/etc/apt/sources.list</computeroutput> e "
-"sostituire tutte le occorrenze di \"lenny\" con \"squeeze\"."
+"sostituire tutte le occorrenze di \"squeeze\" con \"wheezy\"."
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get update</computeroutput>"
@@ -4513,6 +4264,12 @@ msgstr "Il servizio LDAP ha bisogno di essere riconfigurato"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+msgstr ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
 "accounts, passwords, network settings, services and machines are treated is "
 "quite different now. So LDAP has to be rebuild from scratch. There's a "
@@ -4535,10 +4292,10 @@ msgstr "Ricreare un chroot LTSP"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will automatically support both thin-clients and diskless workstations."
+"will still support both thin-clients and diskless workstations."
 msgstr ""
 "Sui server LTSP il chroot di LTSP dovrebbe essere ricreato. Il nuovo chroot "
-"supporterà automaticamente sia i thin-clients che le diskless workstations."
+"supporterà di nuovo automaticamente sia i thin-clients che le diskless workstations."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4565,27 +4322,27 @@ msgstr "Naturalmente si può aggiornare chroot come al solito."
 
 #. type: Content of: <article><section><title>
 msgid ""
-"Upgrades from older Debian Edu / Skolelinux installations (before Lenny)"
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr ""
 "Aggiornamenti da installazioni Debian Edu / Skolelinux precedenti (prima di "
-"Lenny)"
+"Squeeze)"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"To upgrade from any older release, you will need to upgrade to the Lenny-"
+"To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian Edu Lenny</"
-"ulink> about how to upgrade to Lenny from the previous release, Etch, and "
-"the Etch manual covers the one before that!"
-msgstr ""
-"Per fare l'aggiornamento da qualsiasi versione precedente occorre fare "
-"l'aggiornamento a Debian Edu Lenny, prima di poter eseguire le istruzioni "
-"date in precedenza. Come aggiornare a Lenny è descritto nel <ulink url="
-"\"http://wiki.debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian "
-"Edu Lenny</ulink>. Il manuale per Lenny contiene le istruzioni per "
-"aggiornare dalla precedente release Etch. E quella contiene le istruzioni "
-"per quella precedente!"
+"debian.org/DebianEdu/Documentation/Squeeze#\">Manual for Debian Edu Squeeze</"
+"ulink> about how to upgrade to Squeeze from the previous release, Lenny, and "
+"the Lenny manual covers the one before that! (Etch was it's name.)"
+msgstr ""
+"Per aggiornare da qualsiasi versione precedente occorre "
+"aggiornare a Debian Edu Squeeze, prima di poter eseguire le istruzioni "
+"date in precedenza. Si può aggiornare a Squeeze dopo aver letto il"
+"<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze#\">manuale per "
+"Debian Edu Squeeze</ulink> che contiene le istruzioni "
+"per aggiornare dalla precedente release Lenny, mentre il manuale di "
+"Lenny spiega come aggiornare dalla release ancora prima (il cui nome è Etch)."
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -4704,14 +4461,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 +4484,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 +4494,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 +4505,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 +4618,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 +4655,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 +4680,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 ""
@@ -5043,11 +4800,11 @@ msgstr "Usare backports.debian.org è semplice:"
 #. type: CDATA
 #, 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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"apt-get update"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5068,12 +4825,12 @@ msgstr "Aggiornamento da CD o DVD"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to upgrade from one version to another (for example from Squeeze "
-"6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical "
+"If you want to upgrade from one version to another (for example from Wheezy "
+"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
 "media, follow these steps:"
 msgstr ""
-"Se si vuole aggiornare da una versione a un'altra (per esempio da Squeeze "
-"6.0.6 a 6.0.7) ma non si ha collegamento internet, ma solo un media fisico, "
+"Se si vuole aggiornare da una versione a un'altra (per esempio da Wheezy "
+"7.0.0 a 7.0.1) ma non si ha collegamento internet, ma solo un media fisico, "
 "occorre seguire questi passi:"
 
 #. type: Content of: <article><section><section><para>
@@ -5086,10 +4843,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 +4880,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 +4957,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 +4978,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 +5050,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 +5065,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 +5117,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 +5147,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 +5269,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 +5292,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 +5442,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 +5477,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 +5533,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"
@@ -5797,9 +5554,9 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# install the debian-keyring securely:\n"
 "apt-get install debian-keyring\n"
@@ -5808,9 +5565,9 @@ msgstr ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -5917,7 +5674,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 +5688,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 +5773,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 +5838,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 +5884,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 +5897,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 +5919,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 +5941,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 +6011,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 +6145,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 +6168,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 +6208,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 +6323,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 +6354,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 +6369,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 +6481,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 +6509,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 +6544,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 +6614,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 +6624,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 +6646,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 +6663,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 +6672,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)"
@@ -6945,10 +6702,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr ""
 "Per collegare i client Windows al dominio sono necessari i  passi  descritti "
-"in <link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"in <link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6990,11 +6747,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 +7241,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"
@@ -7598,12 +7355,12 @@ msgstr "Samba in Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-"
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
 "style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
 msgstr ""
-"Con Debian Edu Squeeze Samba (v3) è stato completamente configurato per "
+"Con Debian Edu Wheezy Samba (v3) è stato completamente configurato per "
 "l'utilizzo come controller di dominio NT4 per client Windows XP, Windows "
 "Vista e Windows 7. Dopo che una macchina si è collegata al dominio, questa "
 "macchina può essere completamente gestita con GOsa²."
@@ -8135,7 +7892,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 +7901,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 +7921,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 +7934,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 +7967,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 +7978,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 +7993,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 ""
@@ -8522,13 +8279,13 @@ msgstr ""
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> and you can contribute easily. Note: a user account is needed "
-"to edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 "Il sorgente del testo è un wiki e può essere modificato con il browser web, "
 "occorre collegarsi a <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Squeeze/\"/> e si può contribuire facilmente. Nota: Per prima "
+"Documentation/Wheezy/\"/> e si può contribuire facilmente. Nota: Per prima "
 "cosa è necessario un acconto per modificare le pagine con <ulink url="
 "\"http://wiki.debian.org/UserPreferences\">crea un nuovo utente wiki</ulink>."
 
@@ -8663,1878 +8420,1994 @@ msgstr ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/>."
 
 #. type: Content of: <article><section><title>
-msgid "New features in Debian Edu Squeeze"
-msgstr "Nuove caratteristiche in Debian Edu Squeeze"
+msgid "New features in Debian Edu Wheezy"
+msgstr "Nuove caratteristiche in Debian Edu Wheezy"
+
+#. type: Content of: <article><section><para>
+msgid ""
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
+msgstr ""
+"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 ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
-"Nuove caratteristiche in Debian Edu 6.0.6+r1 Codename \"Squeeze\"  "
-"*UN*released as of 2013-0?-??"
+"Nuove caratteristiche in Debian Edu 7.0.0+r0 Codename \"Wheezy\" released "
+"??-??-2012"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "sitesummary was updated from 0.1.3 to 0.1.8"
-msgstr "sitesummary è stato aggiornato da 0.1.3 a 0.1.8"
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Cambiamenti evidenti per gli utenti"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Make Nagios configuration more robust and efficient"
-msgstr "la configurazione di Nagios è è più robusta ed efficiente"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
+"installation, in the login screen and as desktop wallpaper."
+msgstr ""
+"Aggiornati artwork e il nuovo logo di Debian Edu / Skolelinux logo, visibile "
+"durante la installazione, nella schermata di login e come sfondo del desktop."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Comply with 3.X kernel"
-msgstr "Adattato al kernel 3.X"
+#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
 
-#. 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"
+#. type: Content of: <article><section><section><section><title>
+msgid "Installation changes"
+msgstr "Cambiamenti nell'installazione"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Minor updates from the wiki"
-msgstr "Aggiornamenti minori dal wiki  "
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
+msgstr ""
+"Per le nuove versioni di debian-installer da Debian Wheezy, vedere per "
+"maggiori dettagli <ulink url=\"http://www.debian.org/releases/wheezy/"
+"installmanual\">installation manual</ulink>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Danish translation now complete"
-msgstr "Traduzione danese ora completa"
+#. type: Content of: <article><section><section><section><title>
+msgid "Software updates"
+msgstr "Aggiornamenti software"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Wheezy:"
+msgstr "Tutto ciò che è nuovo in Debian Wheezy"
 
-#. 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 ""
-"Corretta la policy utente di Kerberos che non scade dopo 2 giorni. Chiuso: "
-"#664596"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 3.2.x"
+msgstr "Linux kernel 3.2.x"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Handle '#' characters in the root or first users password. Closes: #664976"
-msgstr ""
-"I caratteri '#' nella password della root o del primo utente password sono "
-"gestibili. Chiuso: #664976"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+msgstr "Ambienti di desktop KDE \"Plasma\" 4.8.4 e GNOME 3.4"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-sync:"
-msgstr "Correzioni per gosa-sync:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 10 ESR"
+msgstr "Browser web Iceweasel 10 ESR"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't fail if password contains \""
-msgstr "Non fallisce se la password contiene \""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LibreOffice 3.5.4"
+msgstr "LibreOffice 3.5.4"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't disclose new password string in syslog"
-msgstr "Non rivela la striga della nuova password in syslog"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 12.01"
+msgstr "Software educativo GCompris 12.01"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-create:"
-msgstr "Correzioni per gosa-create:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 12.04"
+msgstr "Editor musicale Rosegarden 12.04"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Invalidate libnss cache before applying changes"
-msgstr "Invalida la cache di libnss prima di applicare i canbiamenti"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.8.2"
+msgstr "Editor per le immagini Gimp 2.8.2"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Multiple failures during mass user import into GOsa²"
-msgstr "Molti errori durante l'inserimento massivo di utenti in GOsa²"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.1"
+msgstr "Universo virtuale Celestia 1.6.1"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.11.3"
+msgstr "Virtual stargazer Stellarium 0.11.3"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"gosa-netgroups plugin: don't erase entries of attribute type "
-"\"memberNisNetgroup\". Closes: #687256"
+"Debian Wheezy includes over 10,000 new packages available for installation, "
+"including the Chromium browser"
 msgstr ""
-"plugin gosa-netgroups: non cancella le voci del tipo di attributo "
-"\"memberNisNetgroup\". Chiuso: #687256"
+"Debian Wheezy include più di 10,000 nuovi pacchetti disponibili per "
+"l'installazione, compreso il browser Chromium"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "First user now uses the same Kerberos policy as all other users"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
-"Il primo utente ora usa la stessa politica di Kerberos come tutti gli altri "
-"utenti"
+"Altre informazioni su Debian Wheezy 6.0 sono disponibili nelle <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"e nell'<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Add Danish web page"
-msgstr "Aggiunta la pagina web danese"
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
+msgstr "Modifiche infrastrutturali"
 
-#. 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"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "FIXME: to be documented, if any"
+msgstr "FIXME: to be documented, if any"
 
-#. 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><section><title>
+msgid "Documentation and translation updates"
+msgstr "Aggiornamenti della documentazione e delle traduzioni"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in FIXME languages."
 msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Aggionate le traduzioni per i template usati dall'installer. Questi template "
+"sono disponibili in FIXME lingue."
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
+"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
-"Nuove caratteristiche in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
-"11-03-2012"
+"Il Manuale Debian Edu Wheezy è completamente tradotto in tedesco, francese, "
+"italiano e danese. Versioni parzialmente tradotte esistono in norvegese "
+"Bokmal e spagnolo."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Cambiamenti evidenti per gli utenti"
+msgid "Regressions"
+msgstr "Regressioni"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr "Altre modifiche relative a LDAP"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Altre modifiche"
+
+#. type: Content of: <article><section><title>
+msgid "Copyright and authors"
+msgstr "Copyright e autori"
+
+#. type: Content of: <article><section><para>
 msgid ""
-"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
-"installation, in the login screen and as desktop wallpaper."
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
+"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
+"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
+"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
+"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
+"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
+"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
+"GPL2 or any later version. Enjoy!"
 msgstr ""
-"Aggiornati artwork e il nuovo logo di Debian Edu / Skolelinux logo, visibile "
-"durante la installazione, nella schermata di login e come sfondo del desktop."
+"Questo documento è scritto e sotto copyright da Holger Levsen (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001,2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008) Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012),  Wolfgang Schweer (2012) e Bernhard Hammes (2012) e è rilasciato "
+"sotto licenza GPL2 o versioni successive. Buon divertimento!"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <link linkend=\"GettingStarted\">Getting started chapter</link> of the "
-"manual for more information on GOsa²."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the GPL2 or later version."
 msgstr ""
-"Sostituire LWAT con GOsa² come interfaccia di amministrazione di LDAP. "
-"Vedere sotto e la sezione <link linkend=\"GettingStarted\">Getting started "
-"chapter</link> del manuale per maggiori informazioni su GOsa²."
+"Se si aggiungono contenuti a questo documento, <emphasis role=\"strong"
+"\">fallo solo se sei l'autore. Occorre rilascialarlo alle stesse condizioni "
+"</emphasis>! Poi inserisci il tuo nome qui e rilascialo sotto licenza GPL2 o "
+"successiva."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "See below for a list of updated software."
-msgstr "Vedere sotto per un elenco del software aggiornato."
+#. type: Content of: <article><section><title>
+msgid "Translation copyright and authors"
+msgstr "Copyright di traduzione e autori"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Show welcome page to users when they first log in. This default start page "
-"for Iceweasel is fetched from LDAP at installation and boot time for "
-"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
-"Standalone installations."
+"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Mostra la pagina di benvenuto quando questi effettuano il primo accesso. La "
-"pagina iniziale predefinita di Iceweasel è ora impostata da LDAP durante "
-"l'installazione e all'avvio dei profili di rete. Per le installazioni "
-"Standalone è configurata per <ulink url=\"http://www.skolelinux.org/\"/>."
+"La traduzione spagnola è protetta da copyright di José L. Redrejo Rodríguez "
+"(2007), Rafael Rivas (2009, 2010, 2011, 2012), e Norman Garcia (2010,2012) "
+"rilasciata sotto licenza GPL2 o successiva."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
-"installation method."
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
+"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
+"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
 msgstr ""
-"Nuova opzione per l'ambiente desktop LXDE, in aggiunta a KDE (default) e "
-"Gnome. Come l'opzione per Gnome, l'opzione di LXDE è supportata solamente "
-"dal metodo di installazione da CD."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Speed up LTSP client boot."
-msgstr "Velocizzare l'avvio del client LTSP."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Provide a KDE menu entry for changing the password in GOsa²."
-msgstr "Si fornisce una voce al menu KDE per cambiare la password in GOsa²."
+"La traduzione norvegese Bokmål è protetta da copyright di Petter "
+"Reinholdtsen (2007), Håvard Korsvoll (2007, 2008) e, Tore Skogly (2008) e "
+"Ole-Anders Andreassen (2010) rilasciata sotto licenza GPL2 o successiva."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"For more information on how to change passwords (including expired passwords "
-"at the KDM/GDM login prompt), please see the <link linkend=\"Users\">HowTos "
-"for users</link> chapter of the manual."
+"The German translation is copyrighted by Holger Levsen (2007), Patrick "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
+"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
+"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
+"and is released under the GPL2 or any later version."
 msgstr ""
-"Per maggiori informazioni su come cambiare le password (comprese anche le "
-"password scadute al login prompt di KDM/GDM), vedere la sezione del manuale "
-"<link linkend=\"Users\">HowTos for users</link>."
+"La traduzione tedesca è protetta da copyright di Holger Levsen (2007), "
+"Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
+"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger "
+"Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
+"Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) e "
+"Wolfgang Schweer (2012, 2013), rilasciata sotto licenza GPL2 o successiva."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
-"shown to new users."
+"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
-"Aggiungere il collegamento a <ulink url=\"http://linuxsignpost.org/\"/> "
-"sulla pagina iniziale che si presenta ai nuovi utenti."
+"La traduzione italiana è protetta da copyright di Claudio Carboncini (2007, "
+"2008, 2009, 2010, 2011, 2012, 2013) rilasciata sotto licenza GPL2 o "
+"successiva."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"All LTSP servers are also <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP servers</link> by default."
+"The French translation is copyrighted by Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
+"2010, 2012) and is released under the GPL2 or any later version."
 msgstr ""
-"Tutti i server LTSP sono anche  <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP server</link> di default."
+"La traduzione francese è protetta da copyright di Christophe Masson (2008), "
+"Olivier Vitrat (2010)  Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau "
+"(2012), David Prévot (2012), Thomas Vincent (2012) e il French l10n team "
+"(2009, 2010, 2012), rilasciata sotto licenza GPL2 o successiva."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Improve handing of removable media on thin clients. Show desktop "
-"notification longer when inserting new media and provide an option to start "
-"dolphin when such media is inserted."
+"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+"(2009) and is released under the GPL2 or any later version."
 msgstr ""
-"Migliorare la gestione dei mesia rimovibili sui thin clients. La notifica "
-"sul desktop quando si inserisce un nuovo media è mostrata più a lungo e "
-"fornisce un'opzione per far partire dolphin qiando un media è inserito."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Installation changes"
-msgstr "Cambiamenti nell'installazione"
+"La traduzione in Cinese tradizionale è protetta da copyright da Andrew Lee "
+"(李健秋) (2009) e rilasciata sotto licenza GPL2 o successiva."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
-"for more details."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Per le nuove versioni di debian-installer da Debian Squeeze, vedere per "
-"maggiori dettagli <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
+"La traduzione in Danese  è protetta da copyright da Joe Hansen (2012, 2013) "
+"e rilasciata sotto licenza GPL2 o successiva."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
-"is set up during installation of the Main Server. This user is up as GOsa² "
-"administrator and is also granted sudo access. The Debian Edu menu "
-"reordering has been enabled as well, by adding the user also to the "
-"<computeroutput>teachers</computeroutput> group."
-msgstr ""
-"Da quando non si concede più a root di effettuare l'accesso usando gdm/kdm, "
-"un utente in LDAP è impostato durante l'installazione del Server Principale. "
-"Questo utente è l'amministratore di GOsa² ed ha anche l'accesso sudo.  Il "
-"riordino del menu di Debian Edu viene attivato, aggiungendo l'utente anche "
-"al gruppo <computeroutput>teachers</computeroutput>."
+#. type: Content of: <article><section><title>
+msgid "Translations of this document"
+msgstr "Traduzioni di questo documento"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"Versions of this document fully translated into German, Italian, French and "
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">take a look here</ulink> for your own language."
 msgstr ""
-"L'immagine <computeroutput>.iso</computeroutput> può essere direttamente "
-"copiata su penna USB usando <computeroutput>dd</computeroutput> o anche "
-"<computeroutput>cat</computeroutput>."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New roaming workstation profile for laptops."
-msgstr "Nuovo profilo roaming workstation per i portatili."
+"Esistono  traduzioni complete di questo documento in Tedesco, Italiano, "
+"Francese e Danese. Esistono traduzioni incomplete in Norvegese Bokmål e "
+"Spagnolo . Date uno sguardo per la vostra <ulink url=\"http://maintainer."
+"skolelinux.org/debian-edu-doc/\">lingua</ulink> qui."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Device access for all users is handled by <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-"needed to get access to devices."
-msgstr ""
-"L'accesso al dispositivo per tutti gli utenti è ora gestito da <ulink url="
-"\"http://wiki.debian.org/PolicyKit#\">PolicyKit</ulink> e non è necessario "
-"essere membri di gruppi extra per accedere ai dispositivi."
+#. type: Content of: <article><section><section><title>
+msgid "HowTo translate this document"
+msgstr "Come tradurre questo documento"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A warning will be issued when installing on too small disks for the selected "
-"profile."
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-"
+"manual-translations</computeroutput>. The 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."
 msgstr ""
-"Verrà  dato un avvertimento quando si cerca di installare su dischi troppo "
-"piccoli per il profilo selezionato."
+"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-wheezy-manual-translations</computeroutput>. 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/ "
-"but no seperate /usr anymore."
+"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."
 msgstr ""
-"Semplificato il partizionamento per l'installazione Standalone, si ha una "
-"partizione separata solo per /home/ e non più per /usr. "
+"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 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 "
+"<ulink url=\"http://bugs.debian.org\">su come si sottopongoni i bug</ulink> "
+"qui."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More tests in the test suite, and correct some of the tests that failed "
-"earlier."
+"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):"
 msgstr ""
-"Maggiori test nella suite di prova, e correzione per alcuni test che hanno "
-"fallito."
+"Puoi esaminare la sorgente di <computeroutput>debian-edu-doc</"
+"computeroutput> da anonimo con il comando seguente (occorre avere il "
+"pacchetto <computeroutput>git</computeroutput> istallato):"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Make sure to report an error and abort the installation when trying to use "
-"the netinst images without a working Internet connection, instead of "
-"silently installing a broken system."
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
-"Assicurarsi di segnalare un errore e annullare l'installazione quando si "
-"cerca di utilizzare l'immagine netinst senza una connessione a Internet, "
-"invece di continuare a installare un sistema danneggiato. "
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Software updates"
-msgstr "Aggiornamenti software"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Squeeze:"
-msgstr "Tutto ciò che è nuovo in Debian Squeeze"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"compatibility with the FHS v2.3 and software developed for version 3.2 of "
-"the LSB."
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
+"<computeroutput>lokalize</computeroutput>."
 msgstr ""
-"compatibilità con FHS v2.3 e per il software sviluppato per la versione 3.2 "
-"di LSB."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Linux kernel 2.6.32"
-msgstr "Linux kernel 2.6.32"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
-msgstr "Ambienti di desktop KDE \"Plasma\" 4.4 e GNOME 2.30"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 3.5"
-msgstr "Browser web Iceweasel 3.5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "OpenOffice.org 3.2.1"
-msgstr "OpenOffice.org 3.2.1"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 9.3"
-msgstr "Software educativo GCompris 9.3"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Music creator Rosegarden 10.04.2"
-msgstr "Editor musicale Rosegarden 10.04.2"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Image editor Gimp 2.6.10"
-msgstr "Editor per le immagini Gimp 2.6.10"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual universe Celestia 1.6.0"
-msgstr "Universo virtuale Celestia 1.6.0"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual stargazer Stellarium 0.10.4"
-msgstr "Virtual stargazer Stellarium 0.10.4"
+"Modificare poi  <computeroutput>documentation/debian-edu-wheezy/debian-edu-"
+"squeeze-manual.$CC.po</computeroutput> (dove occorre rimpiazzare $CC con il "
+"codice del vostro linguaggio). Ci sono molto strumenti disponibili per la "
+"traduzione, suggeriamo di usare <computeroutput>lokalize</computeroutput>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation, "
-"including the browser Chromium"
+"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 ""
-"Debian Squeeze include più di 10,000 nuovi pacchetti disponibili per "
-"l'installazione, compreso il browser Chromium"
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
-"Altre informazioni su Debian Squeeze 6.0 sono disponibili nelle <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> e nell'<ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
+"Per aggiornare la copia locale del repository usa il seguente comando "
+"all'interno della directory <computeroutput>debian-edu-doc</computeroutput>:"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
-msgstr "Modifiche infrastrutturali"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
-"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
 msgstr ""
-"La rete 10.0.0.0/8  è usata al posto di 10.0.2.0/23 e il gateway di default "
-"è 10.0.0.1/8, non 10.0.2.1/8 come si è usato in passato."
+"Leggere /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations per trovare informazioni su come creare un nuovo file PO per la "
+"lingua se ancora non esiste una e come aggiornare le traduzioni."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The dynamic DHCP range was extended on the backbone network to around 4k IP "
-"addresses, and around 200 IP addresses for the thin client network."
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
 msgstr ""
-"L'intervallo dinamico di DHCP è stato esteso nella rete principale di circa "
-"4k di indirizzi IP e di circa 200 indirizzi IP per la rete dei thin client. "
+"Occorre tenere presente che questo manuale è ancora in fase di sviluppo, "
+"quindi non bisogna tradurre ogni stringa che contiene \"FIXME\"."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
-"computeroutput>"
+"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 ""
-"la rete DHCP  per 10.0.0.0/8 è stata rinominata da <computeroutput>barebone</"
-"computeroutput> a <computeroutput>intern</computeroutput>"
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"There are no pre-defined host entries for client systems in DNS anymore "
-"(staticXX, ..., dhcpYY...)"
+"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 ""
-"Non ci sono  voci di host predefiniti per i client nel DNS in più "
-"(staticXX, ..., dhcpYY...)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "MIT Kerberos5 used for user authentication, enabled for:"
-msgstr "MIT Kerberos5 è usato per l'autenticazione degli utenti, attivato per:"
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "PAM"
-msgstr "PAM"
+#. type: Content of: <article><section><section><para>
+msgid "Please report any problems."
+msgstr "Riporta qualsiasi tipo di problema."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "IMAP"
-msgstr "IMAP"
+#. type: Content of: <article><section><title>
+msgid "Appendix A - The GNU General Public License"
+msgstr "Appendix A - The GNU Public License"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "SMTP"
-msgstr "SMTP"
+#. 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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the <computeroutput>workstation</"
-"computeroutput> netgroup to be able to mount the home directories"
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
-"NFSv4, ma senza aggiungere privacy/integrity/authentication di kerberos. Le "
-"macchine devono essere aggiunte a <computeroutput>workstation</"
-"computeroutput> netgroup per essere in grado di montare le home directory"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
-msgstr "Supporto completo per il dominio Samba NT4 per Windows XP/Vista/7 "
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A complete PXE boot environment is setup when installing from the DVD, so "
-"that further installations can be done using PXE network installs only. A "
-"new script pxe-addfirmware is provided to support more hardware models "
-"needing firmware."
-msgstr ""
-"Un completo ambiente di boot PXE è configurato quando si installa da DVD, in "
-"modo tale che ulteriori installazioni possono essere fatte solamente "
-"attraverso la rete con PXE. Un nuovo script pxe-addfirmware viene fornito "
-"per supportare maggiori modelli di hardware che hanno bisogno di firmware."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Remove all hard coded settings on workstations, and configure workstations "
-"and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
-"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
-msgstr ""
-"Rimuovere tutti gli hard coded settati sulle workstation e configurare "
-"workstation and roaming workstation utilizzando le impostazioni rilevate "
-"dall'ambiente usando DNS, DHCP e LDAP.  Vedere questo <ulink url=\"http://"
-"people.skolelinux.org/pere/blog/No_hardcoded_config_on_Debian_Edu_clients."
-"html\">blog post per maggiori informazioni sui cambiamenti</ulink>."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Documentation and translation updates"
-msgstr "Aggiornamenti della documentazione e delle traduzioni"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
-"Aggionate le traduzioni per i template usati dall'installer. Questi template "
-"sono disponibili in 28 lingue."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
-"proof-read with corrections was done by a native English linguist."
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
-"Il manuale Debian Edu Squeeze è stato ripulito e migliorato. La versione "
-"inglese è stata verificata e corretta da un linguista di lingua madre."
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
-"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
-"Spanish."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 msgstr ""
-"Il Manuale Debian Edu Squeeze è completamente tradotto in tedesco, francese, "
-"italiano e danese (nuovo). Versioni parzialmente tradotte esistono in "
-"norvegese Bokmal e spagnolo."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to many language tasks, especially French and Danish."
-msgstr ""
-"Miglioramenti per molti tasks di lingua, specialmente Francese e Danese."
+#. type: Content of: <article><section><section><title>
+msgid "GNU GENERAL PUBLIC LICENSE"
+msgstr "GNU GENERAL PUBLIC LICENSE"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to the welcome web page shown at first logins."
-msgstr ""
-"Miglioramenti alla  pagina web di benvenuto visualizzata al primo login."
+#. type: Content of: <article><section><section><para>
+msgid "Version 2, June 1991"
+msgstr "Version 2, June 1991"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add new Japanese, Portuguese and Catalan translations of the welcome web "
-"page."
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 msgstr ""
-"Aggiunta una nuova traduzione in giapponese, portoghese e catalano nella "
-"pagina web di benvenuto."
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr "Regressioni"
+#. type: Content of: <article><section><section><title>
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
-"installing a KDE environemnt."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">Le installazioni del CD e del DVD isono diverse</ulink> - il DVD installa "
-"solamente l'ambiente KDE."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
-"netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
-"Eliminato il supporto per l'architettura <computeroutput>powerpc</"
-"computeroutput>  dal CD di installazione netinst. E' ancora possibile "
-"eseguire Debian Edu su <computeroutput>powerpc</computeroutput> anche se "
-"l'installazionè è meno automatica."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop gtick in the default installation, because it doesn't work on thin "
-"clients (BTS #566335)."
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
-"Cancellato gtick nella installazione di default, perché non funziona sui "
-"thin client (BTS #566335)."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "New administration tool: GOsa²"
-msgstr "Nuovo strumento di amministrazione: GOsa²"
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
-"with:"
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 msgstr ""
-"gosa (2.6.11-3+squeeze1~edu+1) dal prossimo 6.0.5 Debian point release, con:"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fix DHCP host removal. Closes: #650258"
-msgstr "Corretto DHCP host removal. Closes: #650258"
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Backport user generator unicode character transliteration. Closes: #657086"
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
-"Backport user generator unicode character transliteration. Closes: #657086"
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Customized GOsa² configuration to better suit the Debian Edu network "
-"architecture."
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 msgstr ""
-"Personalizzata la configurazione di GOsa² per meglio adattarla "
-"all'architettura di rete di Debian Edu."
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"GOsa² updates DNS and NFS exports immediately when a system is updated in "
-"LDAP, making diskless workstations work right after they are added to the "
-"required netgroup."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 msgstr ""
-"GOsa² aggiorna DNS e le esportazioni di NFS immediatamente quando un sistema "
-"viene aggiornato in LDAP e le diskless workstation funzionano bene dopo che "
-"sono state aggiunte al netgroup richiesto."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
-"objects using information gathered by sitesummary, to make it easier to add "
-"new computers to the network."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 msgstr ""
-"E' disponibile lo script sitesummary2ldapdhcp per aggiornare o popolare "
-"GOsa² utilizzando le informazioni raccolte da sitesummary, per rendere più "
-"facile aggiungere nuovi computer alla rete."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "More software changes"
-msgstr "Altri cambiamenti software"
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
-"Aggiunto il video editor Kdenlive 0.7.7 lo strumento interattivo geometrico "
-"Geogebra 3.2.42"
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change default package manager from adept to synaptic, to avoid getting two "
-"graphical package managers installed by default."
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 msgstr ""
-"Cambiare il gestore dei pacchetti predefinito da adept a synaptic, per "
-"evitare di avere due gestori di pacchetti grafici installati di default."
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
-"KDE."
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
-"Installare openoffice.org-kde di default per garantire che OOo utilizzi file "
-"di dialogo KDE in KDE."
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
-"Cambiare la configurazione dei player video per installare i diversi player "
-"in KDE (dragonplayer), Gnome (totem) e LXDE (totem)."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
-"default KDE installation."
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
-"Aggiungere gli strumenti KDE come freespacenotifier, kinfocenter, update-"
-"notifier-kde alla installazione di default di KDE."
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace network-manager-kde with plasma-widget-networkmanagement in the "
-"standalone KDE profile"
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
-"Sostituire network-manager-kde con plasma-widget-networkmanagement nel "
-"profilo standalone di KDE"
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 msgstr ""
-"Installare usb-modeswitch sui portatili per gestire in dual mode i "
-"dispositivi USB."
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add cifs-utils to the default installation to ensure SMB mounting can work "
-"in any profile."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
-"Aggiungere cifs-utils alla installazione di default per assicurarsi che i "
-"montaggi SMB possano lavorare con qualsiasi profilo."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
-"and valgrind from the default installation and the DVD to make room for "
-"higher priority packages."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 msgstr ""
-"Cancellati octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, "
-"luma, e valgrind dall'installazione di default e dal DVD per fare spazio a "
-"pacchetti con priorità maggiore."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
-"authoritive source of host names."
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 msgstr ""
-"Cancellato libnss-mdns dai profili stationary, per assicurarsi che il DNS "
-"siafonte autorevole per i nomi degli host."
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
-"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
-"installed instead.)"
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
-"<computeroutput>freerdp-x11</computeroutput> è installato di default  come "
-"client RDP e VNC. (Precedentemente era invece <computeroutput>rdesktop</"
-"computeroutput>.)"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
-msgstr "Altre modifiche relative a LDAP"
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make the LDAP server handle more clients after increasing the server's file "
-"descriptor limit from 1024 to 32768."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
-"Il server LDAP gestisce più client dopo aver aumentato il limite del file "
-"descrittore del server da 1024 a 32768."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
-"flush all CUPS queues every night. Both can be disabled in LDAP."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
-"Aggiungere codice per riavviare le code di stampa CUPS fermate nel server "
-"principale ogni ora e ripulire tutte le code di stampa ogni notte. Entrambi "
-"si possono disabilitare in LDAP."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Provide network blocking / exam mode by default, controlled by LDAP. In "
-"addition to network blocking, changes to the Squid proxy configuration is "
-"needed."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
-"Per impostazione predefinita si ha network blocking / exam, controllato da "
-"LDAP. In aggiunta al blocco della rete, è necessario cambiare la "
-"configurazione del proxy Squid."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Enable automatic extending of full file systems on the Main Server by "
-"default. This can be disabled in LDAP."
-msgstr "L'estensione è di default. Questo può essere disabilitato in LDAP. "
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change SSL certificate name used by the LDAP server and adjust clients to "
-"use the new name to be able to enable certificate checking on clients."
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 msgstr ""
-"Cambiare il nome del certificato SSL utilizzato dal server LDAP e far sì che "
-"i clienti utilizzino il nuovo nome per poter attivare il controllo del "
-"certificato sui client."
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
-"setup used for DNS."
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 msgstr ""
-"Passaggio a PowerDNS per usare la modalità strict di LDAP  e semplificare la "
-"configurazione di LDAP per il DNS."
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify autofs LDAP rules to make sure they work with extra home directory "
-"partitions exported from the main-server without any changes."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
-"Semplificare le regole dell'autofs di LDAP per assicurarsi che funzionino "
-"con partizioni di directory diverse dalla home esportate dal server "
-"principale senza cambiamenti."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make backup system more robust in handling LDAP database dump and restart."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 msgstr ""
-"Fare un backup più robusto del sistema quando si gestisce la struttura del "
-"database LDAP e riavviare."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Altre modifiche"
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Root logins are denied for both KDM and GDM - see above and <link linkend="
-"\"GettingStarted\">Getting started</link> for details."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
-"La login di root non è permessa in KDM e GDM - vedere sopra e in <link "
-"linkend=\"GettingStarted\">Getting started</link> per i dettagli."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Clients set up to shut down at night will stay up for at least an hour if "
-"they are turned on manually between 16:00 and 07:00."
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
-"I client configurati per spegnersi durante la notte ora ritarderanno lo "
-"spegnimento per almeno un'ora se sono stati accesi manualmente tra le 16:00 "
-"e le 07:00."
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Additionally use local NTP clock on the main-server to ensure clients and "
-"server sync clocks also when disconnected from the Internet."
-msgstr ""
-"Inoltre usare l'orologio locale NTP sul server principale per assicurare che "
-"client e server abbiano gli orologi sincronizzati anche quando disconnessi "
-"da Internet."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+msgstr "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
-"Gli accessi ai repository Debian è sempre fatto via proxy sul server "
-"principale. Per saperne di più sui dettagli dell'implementazione<ulink url="
-"\"http://lists.debian.org/20100704221022.GC30542@login1.uio.no\">usare DHCP "
-"e WPAD</ulink>."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "The home0 partition is mounted nosuid, to increase security."
-msgstr "La partizione home0 è montata nosuid per aumentare la sicurezza"
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
-"from 144 to 24 MiB."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
-"Cambia la configurazione di KDE/Akonadi per ridurre il disco di ogni "
-"utenteda 144 a 24 MiB."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
-msgstr ""
-"Nuovo strumento notify-local-users per mandare una notifica sul desktop a "
-"tutti gli uutenti connessi su una macchina.  Utile per i server thin client."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
 #. type: Content of: <article><section><title>
-msgid "Copyright and authors"
-msgstr "Copyright e autori"
+msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
+msgstr "Appendix B - non c'è ancora Debian Edu Live CD/DVD per Wheezy"
 
 #. type: Content of: <article><section><para>
-msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
-"GPL2 or any later version. Enjoy!"
-msgstr ""
-"Questo documento è scritto e sotto copyright da Holger Levsen (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001,2002, 2003, 2004, "
-"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
-"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
-"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008) Nigel Barker (2007), "
-"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
-"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
-"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
-"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
-"(2012),  Wolfgang Schweer (2012) e Bernhard Hammes (2012) e è rilasciato "
-"sotto licenza GPL2 o versioni successive. Buon divertimento!"
+msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
+msgstr "Debian Edu Live CD/DVDs per Wheezy non è disponibile al momento."
 
-#. type: Content of: <article><section><para>
-msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
-msgstr ""
-"Se si aggiungono contenuti a questo documento, <emphasis role=\"strong"
-"\">fallo solo se sei l'autore. Occorre rilascialarlo alle stesse condizioni "
-"</emphasis>! Poi inserisci il tuo nome qui e rilascialo sotto licenza GPL2 o "
-"successiva."
+#. type: Content of: <article><section><section><title>
+msgid "Features of the Standalone image"
+msgstr "Caratteristiche dell'immagine Standalone"
 
-#. type: Content of: <article><section><title>
-msgid "Translation copyright and authors"
-msgstr "Copyright di traduzione e autori"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Almost all packages from the Standalone profile"
+msgstr "Tutti i pacchetti del profilo Standalone"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
-msgstr ""
-"La traduzione spagnola è protetta da copyright di José L. Redrejo Rodríguez "
-"(2007), Rafael Rivas (2009, 2010, 2011, 2012), e Norman Garcia (2010,2012) "
-"rilasciata sotto licenza GPL2 o successiva."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "All packages from the laptop task"
+msgstr "Tutti i pacchetti per il laptop"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
-msgstr ""
-"La traduzione norvegese Bokmål è protetta da copyright di Petter "
-"Reinholdtsen (2007), Håvard Korsvoll (2007, 2008) e, Tore Skogly (2008) e "
-"Ole-Anders Andreassen (2010) rilasciata sotto licenza GPL2 o successiva."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The KDE desktop profile for students/pupils."
+msgstr "Il profilo desktop KDE per studenti/allievi."
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
-"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
-"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
-"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
-msgstr ""
-"La traduzione tedesca è protetta da copyright di Holger Levsen (2007), "
-"Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
-"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger "
-"Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-"Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) e "
-"Wolfgang Schweer (2012, 2013), rilasciata sotto licenza GPL2 o successiva."
+#. type: Content of: <article><section><section><title>
+msgid "Activating translations and regional support"
+msgstr "Attivare traduzioni e il supporto regionale"
 
-#. type: Content of: <article><section><para>
+#. type: Content of: <article><section><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."
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
-"La traduzione italiana è protetta da copyright di Claudio Carboncini (2007, "
-"2008, 2009, 2010, 2011, 2012, 2013) rilasciata sotto licenza GPL2 o "
-"successiva."
+"Per attivare una traduzione specifica, al boot usare "
+"l'opzione<computeroutput>locale=ll_CC.UTF-8</computeroutput>, dove ll_CC."
+"UTF-8 è il nome locale desiderato.  Per rendere disponibile una tastiera "
+"specifica  occorre inserire l'opzione <computeroutput>keyb=KB</"
+"computeroutput> dove KB il layout desiderato di tastiera.  Maggiori "
+"informazioni su questa caratteristica <ulink url=\"http://wiki.debian.org/"
+"DebianLive/l10n\">è disponibile nella documentazione del live</ulink>.  "
+"Segue l'elenco dei codici locali più usati:"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
-msgstr ""
-"La traduzione francese è protetta da copyright di Christophe Masson (2008), "
-"Olivier Vitrat (2010)  Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau "
-"(2012), David Prévot (2012), Thomas Vincent (2012) e il French l10n team "
-"(2009, 2010, 2012), rilasciata sotto licenza GPL2 o successiva."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
+msgstr "<emphasis role=\"strong\">Linguaggio (Regione)</emphasis>:"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
-msgstr ""
-"La traduzione in Cinese tradizionale è protetta da copyright da Andrew Lee "
-"(李健秋) (2009) e rilasciata sotto licenza GPL2 o successiva."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Locale value</emphasis>"
+msgstr "<emphasis role=\"strong\">Valore locale</emphasis>:"
 
-#. 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."
-msgstr ""
-"La traduzione in Danese  è protetta da copyright da Joe Hansen (2012, 2013) "
-"e rilasciata sotto licenza GPL2 o successiva."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
+msgstr "<emphasis role=\"strong\">Layout di tastiera</emphasis>:"
 
-#. type: Content of: <article><section><title>
-msgid "Translations of this document"
-msgstr "Traduzioni di questo documento"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Bokmål"
+msgstr "Norvegese Bokmål"
 
-#. type: Content of: <article><section><para>
-msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
-msgstr ""
-"Esistono  traduzioni complete di questo documento in Tedesco, Italiano, "
-"Francese e Danese. Esistono traduzioni incomplete in Norvegese Bokmål e "
-"Spagnolo . Date uno sguardo per la vostra <ulink url=\"http://maintainer."
-"skolelinux.org/debian-edu-doc/\">lingua</ulink> qui."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nb_NO.UTF-8"
+msgstr "nb_NO.UTF-8"
 
-#. type: Content of: <article><section><section><title>
-msgid "HowTo translate this document"
-msgstr "Come tradurre questo documento"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no"
+msgstr "no"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"As in many free software projects, translations of this document are kept in "
-"PO files. More information about the process can be found in "
-"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
-"contains this file too. Take a look there and at the <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-"specific conventions</ulink> if you want to help translating this document."
-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>."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Nynorsk"
+msgstr "Norvegese Nynorsk"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
-"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
-"\">instructions on how to submit bugs</ulink> here."
-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."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nn_NO.UTF-8"
+msgstr "nn_NO.UTF-8"
 
-#. 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):"
-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):"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "German"
+msgstr "Tedesco"
 
-#. 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>"
-msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de_DE.UTF-8"
+msgstr "de_DE.UTF-8"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language "
-"code). There are many tools for translating available; we suggest using "
-"<computeroutput>lokalize</computeroutput>."
-msgstr ""
-"Modificare poi  <computeroutput>documentation/debian-edu-squeeze/debian-edu-"
-"lenny-manual.$CC.po</computeroutput> (dove occorre rimpiazzare $CC con il "
-"codice del vostro linguaggio). Ci sono molto strumenti disponibili per la "
-"traduzione, suggeriamo di usare <computeroutput>lokalize</computeroutput>."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de"
+msgstr "de"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "French (France)"
+msgstr "Francese (Francia)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr_FR.UTF-8"
+msgstr "fr_FR.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr"
+msgstr "fr"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Greek (Greece)"
+msgstr "Greco (Grecia)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el_GR.UTF-8"
+msgstr "el_GR.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el"
+msgstr "el"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Japanese"
+msgstr "Japanese"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "ja_JP.UTF-8"
+msgstr "ja_JP.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "jp"
+msgstr "jp"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Northern Sami (Norway)"
+msgstr "Northern Sami (Norvegia)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "se_NO"
+msgstr "se_NO"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no(smi)"
+msgstr "no(smi)"
 
 #. 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."
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
-"In seguito occorre inviare il file direttamente al Subversion (se si ha i "
-"permessi per fare questo) o mandare il file attraverso bugreport."
+"L'elenco completo è disponibile in <computeroutput>/usr/share/i18n/SUPPORTED "
+"</computeroutput>, ma solo UTF-8 locales sono supportati nell'immagine live. "
+"Ancora non tutti i linguaggi specifici hanno traduzioni. Il layout della "
+"tastiera si trova in /usr/share/keymaps/i386/."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+#. type: Content of: <article><section><section><title>
+msgid "Stuff to know"
+msgstr "Accorgimenti da conoscere"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The password for the user is \"user\"; root has no passwd set."
 msgstr ""
-"Per aggiornare la copia locale del repository usa il seguente comando "
-"all'interno della directory <computeroutput>debian-edu-doc</computeroutput>:"
+"La password per l'utente è \"user\", root non ha una password selezionata."
+
+#. type: Content of: <article><section><section><title>
+msgid "Known issues with the image"
+msgstr "Problemi noti con l'immagine"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "There are no wheezy images yet"
+msgstr "Non ci sono ancora immagini per wheezy"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations to find information how to create a new PO file for your "
-"language if there isn't one yet, and how to update translations."
-msgstr ""
-"Leggere /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations per trovare informazioni su come creare un nuovo file PO per la "
-"lingua se ancora non esiste una e come aggiornare le traduzioni."
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/sad.png"
+msgstr "./images/sad.png"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+msgid ":("
+msgstr ":("
+
+#. type: Content of: <article><section><section><title>
+msgid "Download"
+msgstr "Download"
 
-#.  <remark>
-#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Please keep in mind that this manual is still under development, so don't "
-"translate any string which contains \" FIXME\"."
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
-"Occorre tenere presente che questo manuale è ancora in fase di sviluppo, "
-"quindi non bisogna tradurre ogni stringa che contiene \"FIXME\"."
+"L'immagine è 1.2 GiB e al momento NON è disponibile usando <ulink url="
+"\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> o rsync da "
+"<computeroutput>ftp.skolelinux.org</computeroutput> sotto <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><title>
+msgid "Appendix C - Features in older releases"
+msgstr "Appendice C - Caratteristiche delle release più vecchie"
+
+#. type: Content of: <article><section><section><title>
 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\"/>."
+"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released 2013-0?-??"
 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\"/>."
+"Nuove caratteristiche in Debian Edu 6.0.6+r1 Codename \"Squeeze\"  "
+"*UN*released as of 2013-0?-??"
 
 #. 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."
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 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."
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 
-#. type: Content of: <article><section><section><para>
-msgid "Please report any problems."
-msgstr "Riporta qualsiasi tipo di problema."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "sitesummary was updated from 0.1.3 to 0.1.8"
+msgstr "sitesummary è stato aggiornato da 0.1.3 a 0.1.8"
 
-#. type: Content of: <article><section><title>
-msgid "Appendix A - The GNU General Public License"
-msgstr "Appendix A - The GNU Public License"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make Nagios configuration more robust and efficient"
+msgstr "la configurazione di Nagios è è più robusta ed efficiente"
 
-#. 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. ]]"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Comply with 3.X kernel"
+msgstr "Adattato al kernel 3.X"
 
-#. type: Content of: <article><section><section><para>
+#. 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"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Minor updates from the wiki"
+msgstr "Aggiornamenti minori dal wiki  "
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
+"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
+"#664596"
 msgstr ""
-"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."
+"Corretta la policy utente di Kerberos che non scade dopo 2 giorni. Chiuso: "
+"#664596"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+"Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+"I caratteri '#' nella password della root o del primo utente password sono "
+"gestibili. Chiuso: #664976"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-sync:"
+msgstr "Correzioni per gosa-sync:"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't fail if password contains \""
+msgstr "Non fallisce se la password contiene \""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't disclose new password string in syslog"
+msgstr "Non rivela la striga della nuova password in syslog"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-create:"
+msgstr "Correzioni per gosa-create:"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Invalidate libnss cache before applying changes"
+msgstr "Invalida la cache di libnss prima di applicare i canbiamenti"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Multiple failures during mass user import into GOsa²"
+msgstr "Molti errori durante l'inserimento massivo di utenti in GOsa²"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"gosa-netgroups plugin: don't erase entries of attribute type "
+"\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"plugin gosa-netgroups: non cancella le voci del tipo di attributo "
+"\"memberNisNetgroup\". Chiuso: #687256"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "First user now uses the same Kerberos policy as all other users"
 msgstr ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"Il primo utente ora usa la stessa politica di Kerberos come tutti gli altri "
+"utenti"
 
-#. type: Content of: <article><section><section><title>
-msgid "GNU GENERAL PUBLIC LICENSE"
-msgstr "GNU GENERAL PUBLIC LICENSE"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Add Danish web page"
+msgstr "Aggiunta la pagina web danese"
 
-#. type: Content of: <article><section><section><para>
-msgid "Version 2, June 1991"
-msgstr "Version 2, June 1991"
+#. 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"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
-msgstr ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Improve preseeding support and documentation"
+msgstr "Migliorato il supporto per la preconfigurazione e documentazione"
 
 #. type: Content of: <article><section><section><title>
-msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-
-#. type: Content of: <article><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"Nuove caratteristiche in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
+"11-03-2012"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
+"the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"Sostituire LWAT con GOsa² come interfaccia di amministrazione di LDAP. "
+"Vedere sotto e la sezione <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/GettingStarted#\">Getting started chapter</ulink> del "
+"manuale per maggiori informazioni su GOsa²."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
-msgstr ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "See below for a list of updated software."
+msgstr "Vedere sotto per un elenco del software aggiornato."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"Show welcome page to users when they first log in. This default start page "
+"for Iceweasel is fetched from LDAP at installation and boot time for "
+"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
+"Standalone installations."
 msgstr ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"Mostra la pagina di benvenuto quando questi effettuano il primo accesso. La "
+"pagina iniziale predefinita di Iceweasel è ora impostata da LDAP durante "
+"l'installazione e all'avvio dei profili di rete. Per le installazioni "
+"Standalone è configurata per <ulink url=\"http://www.skolelinux.org/\"/>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+"Gnome option, the LXDE desktop option is only supported by the CD "
+"installation method."
 msgstr ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"Nuova opzione per l'ambiente desktop LXDE, in aggiunta a KDE (default) e "
+"Gnome. Come l'opzione per Gnome, l'opzione di LXDE è supportata solamente "
+"dal metodo di installazione da CD."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Speed up LTSP client boot."
+msgstr "Velocizzare l'avvio del client LTSP."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Provide a KDE menu entry for changing the password in GOsa²."
+msgstr "Si fornisce una voce al menu KDE per cambiare la password in GOsa²."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</ulink> "
+"chapter of the manual."
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"Per maggiori informazioni su come cambiare le password (comprese anche le "
+"password scadute al login prompt di KDM/GDM), vedere la sezione del manuale "
+"<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/"
+"Users#\">HowTos for users</ulink>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
+"shown to new users."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"Aggiungere il collegamento a <ulink url=\"http://linuxsignpost.org/\"/> "
+"sulla pagina iniziale che si presenta ai nuovi utenti."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Tutti i server LTSP sono anche <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"server</ulink> di default."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"Improve handing of removable media on thin clients. Show desktop "
+"notification longer when inserting new media and provide an option to start "
+"dolphin when such media is inserted."
 msgstr ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"Migliorare la gestione dei mesia rimovibili sui thin clients. La notifica "
+"sul desktop quando si inserisce un nuovo media è mostrata più a lungo e "
+"fornisce un'opzione per far partire dolphin qiando un media è inserito."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"Per le nuove versioni di debian-installer da Debian Wheezy, vedere per "
+"maggiori dettagli <ulink url=\"http://www.debian.org/releases/wheezy/"
+"installmanual\">installation manual</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
+"is set up during installation of the Main Server. This user is up as GOsa² "
+"administrator and is also granted sudo access. The Debian Edu menu "
+"reordering has been enabled as well, by adding the user also to the "
+"<computeroutput>teachers</computeroutput> group."
 msgstr ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"Da quando non si concede più a root di effettuare l'accesso usando gdm/kdm, "
+"un utente in LDAP è impostato durante l'installazione del Server Principale. "
+"Questo utente è l'amministratore di GOsa² ed ha anche l'accesso sudo.  Il "
+"riordino del menu di Debian Edu viene attivato, aggiungendo l'utente anche "
+"al gruppo <computeroutput>teachers</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
+"<computeroutput>cat</computeroutput>.."
 msgstr ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"L'immagine <computeroutput>.iso</computeroutput> può essere direttamente "
+"copiata su penna USB usando <computeroutput>dd</computeroutput> o anche "
+"<computeroutput>cat</computeroutput>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New roaming workstation profile for laptops."
+msgstr "Nuovo profilo roaming workstation per i portatili."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Device access for all users is handled by <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"L'accesso al dispositivo per tutti gli utenti è ora gestito da <ulink url="
+"\"http://wiki.debian.org/PolicyKit#\">PolicyKit</ulink> e non è necessario "
+"essere membri di gruppi extra per accedere ai dispositivi."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Verrà  dato un avvertimento quando si cerca di installare su dischi troppo "
+"piccoli per il profilo selezionato."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Semplificato il partizionamento per l'installazione Standalone, si ha una "
+"partizione separata solo per /home/ e non più per /usr. "
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"More tests in the test suite, and correct some of the tests that failed "
+"earlier."
 msgstr ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"Maggiori test nella suite di prova, e correzione per alcuni test che hanno "
+"fallito."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"Make sure to report an error and abort the installation when trying to use "
+"the netinst images without a working Internet connection, instead of "
+"silently installing a broken system."
 msgstr ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"Assicurarsi di segnalare un errore e annullare l'installazione quando si "
+"cerca di utilizzare l'immagine netinst senza una connessione a Internet, "
+"invece di continuare a installare un sistema danneggiato. "
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Squeeze:"
+msgstr "Tutto ciò che è nuovo in Debian Squeeze"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"compatibility with the FHS v2.3 and software developed for version 3.2 of "
+"the LSB."
 msgstr ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"compatibilità con FHS v2.3 e per il software sviluppato per la versione 3.2 "
+"di LSB."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 2.6.32"
+msgstr "Linux kernel 2.6.32"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+msgstr "Ambienti di desktop KDE \"Plasma\" 4.4 e GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 3.5"
+msgstr "Browser web Iceweasel 3.5"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "OpenOffice.org 3.2.1"
+msgstr "OpenOffice.org 3.2.1"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 9.3"
+msgstr "Software educativo GCompris 9.3"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 10.04.2"
+msgstr "Editor musicale Rosegarden 10.04.2"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
-msgstr ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.6.10"
+msgstr "Editor per le immagini Gimp 2.6.10"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.0"
+msgstr "Universo virtuale Celestia 1.6.0"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.10.4"
+msgstr "Virtual stargazer Stellarium 0.10.4"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"Debian Squeeze include più di 10,000 nuovi pacchetti disponibili per "
+"l'installazione, compreso il browser Chromium"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"Altre informazioni su Debian Squeeze 6.0 sono disponibili nelle <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> e nell'<ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
+"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"La rete 10.0.0.0/8  è usata al posto di 10.0.2.0/23 e il gateway di default "
+"è 10.0.0.1/8, non 10.0.2.1/8 come si è usato in passato."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"The dynamic DHCP range was extended on the backbone network to around 4k IP "
+"addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"L'intervallo dinamico di DHCP è stato esteso nella rete principale di circa "
+"4k di indirizzi IP e di circa 200 indirizzi IP per la rete dei thin client. "
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"The DHCP network for 10.0.0.0/8 has been renamed from "
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"la rete DHCP  per 10.0.0.0/8 è stata rinominata da <computeroutput>barebone</"
+"computeroutput> a <computeroutput>intern</computeroutput>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"There are no pre-defined host entries for client systems in DNS anymore "
+"(staticXX, ..., dhcpYY...)"
 msgstr ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"Non ci sono  voci di host predefiniti per i client nel DNS in più "
+"(staticXX, ..., dhcpYY...)"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "MIT Kerberos5 used for user authentication, enabled for:"
+msgstr "MIT Kerberos5 è usato per l'autenticazione degli utenti, attivato per:"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "PAM"
+msgstr "PAM"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "IMAP"
+msgstr "IMAP"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "SMTP"
+msgstr "SMTP"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"NFSv4, ma senza aggiungere privacy/integrity/authentication di kerberos. Le "
+"macchine devono essere aggiunte a <computeroutput>workstation</"
+"computeroutput> netgroup per essere in grado di montare le home directory"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+msgstr "Supporto completo per il dominio Samba NT4 per Windows XP/Vista/7 "
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"A complete PXE boot environment is setup when installing from the DVD, so "
+"that further installations can be done using PXE network installs only. A "
+"new script pxe-addfirmware is provided to support more hardware models "
+"needing firmware."
 msgstr ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"Un completo ambiente di boot PXE è configurato quando si installa da DVD, in "
+"modo tale che ulteriori installazioni possono essere fatte solamente "
+"attraverso la rete con PXE. Un nuovo script pxe-addfirmware viene fornito "
+"per supportare maggiori modelli di hardware che hanno bisogno di firmware."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+"Remove all hard coded settings on workstations, and configure workstations "
+"and roaming workstations using settings detected from the environment using "
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
-
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
-msgstr "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+"Rimuovere tutti gli hard coded settati sulle workstation e configurare "
+"workstation and roaming workstation utilizzando le impostazioni rilevate "
+"dall'ambiente usando DNS, DHCP e LDAP.  Vedere questo <ulink url=\"http://"
+"people.skolelinux.org/pere/blog/No_hardcoded_config_on_Debian_Edu_clients."
+"html\">blog post per maggiori informazioni sui cambiamenti</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
 msgstr ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"Aggionate le traduzioni per i template usati dall'installer. Questi template "
+"sono disponibili in 28 lingue."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
+"proof-read with corrections was done by a native English linguist."
 msgstr ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"Il manuale Debian Edu Squeeze è stato ripulito e migliorato. La versione "
+"inglese è stata verificata e corretta da un linguista di lingua madre."
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
-msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
+msgstr ""
+"Il Manuale Debian Edu Squeeze è completamente tradotto in tedesco, francese "
+"e italiano. Versioni parzialmente tradotte esistono in  danese (nuovo), "
+"norvegese Bokmal e spagnolo."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet"
-msgstr "Appendix B - non c'è ancora Debian Edu Live CD/DVD per Squeeze"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to many language tasks, especially French and Danish."
+msgstr ""
+"Miglioramenti per molti tasks di lingua, specialmente Francese e Danese."
 
-#. type: Content of: <article><section><para>
-msgid "Debian Edu Live CD/DVDs for Squeeze are not available at the moment."
-msgstr "Debian Edu Live CD/DVDs per Squeeze non è disponibile al momento."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to the welcome web page shown at first logins."
+msgstr ""
+"Miglioramenti alla  pagina web di benvenuto visualizzata al primo login."
 
-#. type: Content of: <article><section><section><title>
-msgid "Features of the Standalone image"
-msgstr "Caratteristiche dell'immagine Standalone"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add new Japanese, Portuguese and Catalan translations of the welcome web "
+"page."
+msgstr ""
+"Aggiunta una nuova traduzione in giapponese, portoghese e catalano nella "
+"pagina web di benvenuto."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Almost all packages from the Standalone profile"
-msgstr "Tutti i pacchetti del profilo Standalone"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
+msgstr ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">Le installazioni del CD e del DVD isono diverse</ulink> - il DVD installa "
+"solamente l'ambiente KDE."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "All packages from the laptop task"
-msgstr "Tutti i pacchetti per il laptop"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
+"netinst installation CDs. It is still possible to run Debian Edu on "
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+msgstr ""
+"Eliminato il supporto per l'architettura <computeroutput>powerpc</"
+"computeroutput>  dal CD di installazione netinst. E' ancora possibile "
+"eseguire Debian Edu su <computeroutput>powerpc</computeroutput> anche se "
+"l'installazionè è meno automatica."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The KDE desktop profile for students/pupils."
-msgstr "Il profilo desktop KDE per studenti/allievi."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop gtick in the default installation, because it doesn't work on thin "
+"clients (BTS #566335)."
+msgstr ""
+"Cancellato gtick nella installazione di default, perché non funziona sui "
+"thin client (BTS #566335)."
 
-#. type: Content of: <article><section><section><title>
-msgid "Activating translations and regional support"
-msgstr "Attivare traduzioni e il supporto regionale"
+#. type: Content of: <article><section><section><section><title>
+msgid "New administration tool: GOsa²"
+msgstr "Nuovo strumento di amministrazione: GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want.  To activate a given keyboard layout, use the "
-"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
-"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live CD build script "
-"documentation</ulink>.  Here is a list of commonly used locale codes:"
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
-"Per attivare una traduzione specifica, al boot usare "
-"l'opzione<computeroutput>locale=ll_CC.UTF-8</computeroutput>, dove ll_CC."
-"UTF-8 è il nome locale desiderato.  Per rendere disponibile una tastiera "
-"specifica  occorre inserire l'opzione <computeroutput>keyb=KB</"
-"computeroutput> dove KB il layout desiderato di tastiera.  Maggiori "
-"informazioni su questa caratteristica <ulink url=\"http://wiki.debian.org/"
-"DebianLive/l10n\">è disponibile nella documentazione del live</ulink>.  "
-"Segue l'elenco dei codici locali più usati:"
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
-msgstr "<emphasis role=\"strong\">Linguaggio (Regione)</emphasis>:"
+"gosa (2.6.11-3+squeeze1~edu+1) dal prossimo 6.0.5 Debian point release, con:"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Locale value</emphasis>"
-msgstr "<emphasis role=\"strong\">Valore locale</emphasis>:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix DHCP host removal. Closes: #650258"
+msgstr "Corretto DHCP host removal. Closes: #650258"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
-msgstr "<emphasis role=\"strong\">Layout di tastiera</emphasis>:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Backport user generator unicode character transliteration. Closes: #657086"
+msgstr ""
+"Backport user generator unicode character transliteration. Closes: #657086"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Bokmål"
-msgstr "Norvegese Bokmål"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Customized GOsa² configuration to better suit the Debian Edu network "
+"architecture."
+msgstr ""
+"Personalizzata la configurazione di GOsa² per meglio adattarla "
+"all'architettura di rete di Debian Edu."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nb_NO.UTF-8"
-msgstr "nb_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"GOsa² updates DNS and NFS exports immediately when a system is updated in "
+"LDAP, making diskless workstations work right after they are added to the "
+"required netgroup."
+msgstr ""
+"GOsa² aggiorna DNS e le esportazioni di NFS immediatamente quando un sistema "
+"viene aggiornato in LDAP e le diskless workstation funzionano bene dopo che "
+"sono state aggiunte al netgroup richiesto."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no"
-msgstr "no"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
+"objects using information gathered by sitesummary, to make it easier to add "
+"new computers to the network."
+msgstr ""
+"E' disponibile lo script sitesummary2ldapdhcp per aggiornare o popolare "
+"GOsa² utilizzando le informazioni raccolte da sitesummary, per rendere più "
+"facile aggiungere nuovi computer alla rete."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Nynorsk"
-msgstr "Norvegese Nynorsk"
+#. type: Content of: <article><section><section><section><title>
+msgid "More software changes"
+msgstr "Altri cambiamenti software"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nn_NO.UTF-8"
-msgstr "nn_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+msgstr ""
+"Aggiunto il video editor Kdenlive 0.7.7 lo strumento interattivo geometrico "
+"Geogebra 3.2.42"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "German"
-msgstr "Tedesco"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change default package manager from adept to synaptic, to avoid getting two "
+"graphical package managers installed by default."
+msgstr ""
+"Cambiare il gestore dei pacchetti predefinito da adept a synaptic, per "
+"evitare di avere due gestori di pacchetti grafici installati di default."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de_DE.UTF-8"
-msgstr "de_DE.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
+"KDE."
+msgstr ""
+"Installare openoffice.org-kde di default per garantire che OOo utilizzi file "
+"di dialogo KDE in KDE."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de"
-msgstr "de"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change video player setup to install different players in KDE "
+"(dragonplayer), Gnome (totem) and LXDE (totem)."
+msgstr ""
+"Cambiare la configurazione dei player video per installare i diversi player "
+"in KDE (dragonplayer), Gnome (totem) e LXDE (totem)."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "French (France)"
-msgstr "Francese (Francia)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
+"default KDE installation."
+msgstr ""
+"Aggiungere gli strumenti KDE come freespacenotifier, kinfocenter, update-"
+"notifier-kde alla installazione di default di KDE."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr_FR.UTF-8"
-msgstr "fr_FR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace network-manager-kde with plasma-widget-networkmanagement in the "
+"standalone KDE profile"
+msgstr ""
+"Sostituire network-manager-kde con plasma-widget-networkmanagement nel "
+"profilo standalone di KDE"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr"
-msgstr "fr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+msgstr ""
+"Installare usb-modeswitch sui portatili per gestire in dual mode i "
+"dispositivi USB."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Greek (Greece)"
-msgstr "Greco (Grecia)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add cifs-utils to the default installation to ensure SMB mounting can work "
+"in any profile."
+msgstr ""
+"Aggiungere cifs-utils alla installazione di default per assicurarsi che i "
+"montaggi SMB possano lavorare con qualsiasi profilo."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el_GR.UTF-8"
-msgstr "el_GR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
+"and valgrind from the default installation and the DVD to make room for "
+"higher priority packages."
+msgstr ""
+"Cancellati octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, "
+"luma, e valgrind dall'installazione di default e dal DVD per fare spazio a "
+"pacchetti con priorità maggiore."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el"
-msgstr "el"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
+"authoritive source of host names."
+msgstr ""
+"Cancellato libnss-mdns dai profili stationary, per assicurarsi che il DNS "
+"siafonte autorevole per i nomi degli host."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Japanese"
-msgstr "Japanese"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
+"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
+"installed instead.)"
+msgstr ""
+"<computeroutput>freerdp-x11</computeroutput> è installato di default  come "
+"client RDP e VNC. (Precedentemente era invece <computeroutput>rdesktop</"
+"computeroutput>.)"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "ja_JP.UTF-8"
-msgstr "ja_JP.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make the LDAP server handle more clients after increasing the server's file "
+"descriptor limit from 1024 to 32768."
+msgstr ""
+"Il server LDAP gestisce più client dopo aver aumentato il limite del file "
+"descrittore del server da 1024 a 32768."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "jp"
-msgstr "jp"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
+msgstr ""
+"Aggiungere codice per riavviare le code di stampa CUPS fermate nel server "
+"principale ogni ora e ripulire tutte le code di stampa ogni notte. Entrambi "
+"si possono disabilitare in LDAP."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Northern Sami (Norway)"
-msgstr "Northern Sami (Norvegia)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide network blocking / exam mode by default, controlled by LDAP. In "
+"addition to network blocking, changes to the Squid proxy configuration is "
+"needed."
+msgstr ""
+"Per impostazione predefinita si ha network blocking / exam, controllato da "
+"LDAP. In aggiunta al blocco della rete, è necessario cambiare la "
+"configurazione del proxy Squid."
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "se_NO"
-msgstr "se_NO"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable automatic extending of full file systems on the Main Server by "
+"default. This can be disabled in LDAP."
+msgstr "L'estensione è di default. Questo può essere disabilitato in LDAP. "
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no(smi)"
-msgstr "no(smi)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change SSL certificate name used by the LDAP server and adjust clients to "
+"use the new name to be able to enable certificate checking on clients."
+msgstr ""
+"Cambiare il nome del certificato SSL utilizzato dal server LDAP e far sì che "
+"i clienti utilizzino il nuovo nome per poter attivare il controllo del "
+"certificato sui client."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
-"the live images. Not all locales have translations installed, though.  The "
-"keyboard layout names can be found in /usr/share/keymaps/i386/."
+"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
+"setup used for DNS."
 msgstr ""
-"L'elenco completo è disponibile in <computeroutput>/usr/share/i18n/SUPPORTED "
-"</computeroutput>, ma solo UTF-8 locales sono supportati nell'immagine live. "
-"Ancora non tutti i linguaggi specifici hanno traduzioni. Il layout della "
-"tastiera si trova in /usr/share/keymaps/i386/."
+"Passaggio a PowerDNS per usare la modalità strict di LDAP  e semplificare la "
+"configurazione di LDAP per il DNS."
 
-#. type: Content of: <article><section><section><title>
-msgid "Stuff to know"
-msgstr "Accorgimenti da conoscere"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Simplify autofs LDAP rules to make sure they work with extra home directory "
+"partitions exported from the main-server without any changes."
+msgstr ""
+"Semplificare le regole dell'autofs di LDAP per assicurarsi che funzionino "
+"con partizioni di directory diverse dalla home esportate dal server "
+"principale senza cambiamenti."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The password for the user is \"user\"; root has no passwd set."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
-"La password per l'utente è \"user\", root non ha una password selezionata."
+"Fare un backup più robusto del sistema quando si gestisce la struttura del "
+"database LDAP e riavviare."
 
-#. type: Content of: <article><section><section><title>
-msgid "Known issues with the image"
-msgstr "Problemi noti con l'immagine"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
+msgstr ""
+"La login di root non è permessa in KDM e GDM - vedere sopra e in <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> per i dettagli."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "There are no squeeze images yet"
-msgstr "Non ci sono ancora immagini per squeeze"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Clients set up to shut down at night will stay up for at least an hour if "
+"they are turned on manually between 16:00 and 07:00."
+msgstr ""
+"I client configurati per spegnersi durante la notte ora ritarderanno lo "
+"spegnimento per almeno un'ora se sono stati accesi manualmente tra le 16:00 "
+"e le 07:00."
 
-#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/sad.png"
-msgstr "./images/sad.png"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Additionally use local NTP clock on the main-server to ensure clients and "
+"server sync clocks also when disconnected from the Internet."
+msgstr ""
+"Inoltre usare l'orologio locale NTP sul server principale per assicurare che "
+"client e server abbiano gli orologi sincronizzati anche quando disconnessi "
+"da Internet."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-msgid ":("
-msgstr ":("
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Access to Debian repositories is always done via a proxy on the main server "
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+msgstr ""
+"Gli accessi ai repository Debian è sempre fatto via proxy sul server "
+"principale. Per saperne di più sui dettagli dell'implementazione<ulink url="
+"\"http://lists.debian.org/20100704221022.GC30542@login1.uio.no\">usare DHCP "
+"e WPAD</ulink>."
 
-#. type: Content of: <article><section><section><title>
-msgid "Download"
-msgstr "Download"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "The home0 partition is mounted nosuid, to increase security."
+msgstr "La partizione home0 è montata nosuid per aumentare la sicurezza"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
+"from 144 to 24 MiB."
 msgstr ""
-"L'immagine è 1.2 GiB e al momento NON è disponibile usando <ulink url="
-"\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> o rsync da "
-"<computeroutput>ftp.skolelinux.org</computeroutput> sotto <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Cambia la configurazione di KDE/Akonadi per ridurre il disco di ogni "
+"utenteda 144 a 24 MiB."
 
-#. type: Content of: <article><section><title>
-msgid "Appendix C - Features in older releases"
-msgstr "Appendice C - Caratteristiche delle release più vecchie"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New tool notify-local-users to send desktop notification to all logged in "
+"users on a machine.  Useful for thin client servers."
+msgstr ""
+"Nuovo strumento notify-local-users per mandare una notifica sul desktop a "
+"tutti gli uutenti connessi su una macchina.  Utile per i server thin client."
 
 #. type: Content of: <article><section><section><title>
 msgid "New in Debian Edu 5.0.6+edu1 Codename \"Lenny\" released 2010-10-05"
@@ -11052,6 +10925,237 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "[attachment:welcome_to_tjener.png]"
+#~ msgstr "[attachment:welcome_to_tjener.png]"
+
+#~ msgid "Debian Edu login"
+#~ msgstr "Debian Edu login"
+
+#~ msgid "Installer boot menu"
+#~ msgstr "Installer del menu di avvio"
+
+#~ msgid "Installer advanced options screen 1"
+#~ msgstr "Opzioni avanzate dell'installer schermo 1"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Opzioni avanzate di installazione schermo 2"
+
+#~ msgid "Installer help screen"
+#~ msgstr "Schermo di aiuto dell'installer"
+
+#~ msgid "A note on some RAID controllers"
+#~ msgstr "Una nota su alcuni controller RAID"
+
+#~ msgid ""
+#~ "When using a USB drive to add missing firmware during install, with some "
+#~ "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
+#~ "installation results in a GRUB error. A workaround for this problem is to "
+#~ "remove the USB drive after the firmware is loaded, and preferably before "
+#~ "partitioning starts."
+#~ msgstr ""
+#~ "Quando si usa un chiavetta USB per aggiungere firmware mancanti durante "
+#~ "l'installazione, con alcuni RAID-controllers GRUB si installa sulla penna "
+#~ "USB. Così al reboot dopo l'installazione GRUB dà un errore. Un modo per "
+#~ "aggirare questo problema è di  rimuovere la penna USB dopo aver caricato "
+#~ "il firmware e preferibilmente prima di  iniziare il partizionamento."
+
+#~ msgid ""
+#~ "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#~ "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#~ "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+#~ msgstr ""
+#~ "Maggiori informazioni sono disponibili in <ulink url=\"http://bugs."
+#~ "skolelinux.org/show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> e "
+#~ "Debian bug <ulink url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+
+#~ msgid "pxe-tjener.png"
+#~ msgstr "pxe-tjener.png"
+
+#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#~ msgid "02-select_a_language.png"
+#~ msgstr "02-select_a_language.png"
+
+#~ msgid "03-select_your_location.png"
+#~ msgstr "03-select_your_location.png"
+
+#~ msgid "04-Configure_the_keyboard.png"
+#~ msgstr "04-Configure_the_keyboard.png"
+
+#~ msgid "05-Detect_and_mount_CD-ROM.png"
+#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#~ msgid "06-Load_installer_components_from_CD.png"
+#~ msgstr "06-Load_installer_components_from_CD.png"
+
+#~ msgid "07-Detect_network_hardware.png"
+#~ msgstr "07-Detect_network_hardware.png"
+
+#~ msgid "08-Choose_Debian_Edu_profile.png"
+#~ msgstr "08-Choose_Debian_Edu_profile.png"
+
+#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+
+#~ msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#~ msgid "12-Set_up_users_and_passwords.png"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#~ msgid "12a-Set_up_users_and_passwords.png"
+#~ msgstr "12a-Set_up_users_and_passwords.png"
+
+#~ msgid "12b-Set_up_users_and_passwords.png"
+#~ msgstr "12b-Set_up_users_and_passwords.png"
+
+#~ msgid "12c-Set_up_users_and_passwords.png"
+#~ msgstr "12c-Set_up_users_and_passwords.png"
+
+#~ msgid "13-Install the base system.png"
+#~ msgstr "13-Install the base system.png"
+
+#~ msgid "14-Select_and_install_software.png"
+#~ msgstr "14-Select_and_install_software.png"
+
+#~ msgid "17-Select_and_install_software.png"
+#~ msgstr "17-Select_and_install_software.png"
+
+#~ msgid "18-Build LTSP chroot.png"
+#~ msgstr "18-Build LTSP chroot.png"
+
+#~ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#~ msgid "20-Finish_the_Installation.png"
+#~ msgstr "20-Finish_the_Installation.png"
+
+#~ msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#~ msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#~ msgid "23-Tjener-KDM_Login.png"
+#~ msgstr "23-Tjener-KDM_Login.png"
+
+#~ msgid "24-Tjener-KDE_Start.png"
+#~ msgstr "24-Tjener-KDE_Start.png"
+
+#~ msgid "26-Tjener-KDE_Desktop_Browser.png"
+#~ msgstr "26-Tjener-KDE_Desktop_Browser.png"
+
+#~ msgid "27-Tjener-KDE_Desktop.png"
+#~ msgstr "27-Tjener-KDE_Desktop.png"
+
+#~ msgid "29-Diskless-WS-KDM_Login.png"
+#~ msgstr "29-Diskless-WS-KDM_Login.png"
+
+#~ msgid "30-ThinClient-LDM_Login.png"
+#~ msgstr "30-ThinClient-LDM_Login.png"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#~ msgid "Debian Edu desktop"
+#~ msgstr "Debian Edu desktop"
+
+#~ msgid "GOsa² overview page after login as the first user"
+#~ msgstr "Pagina di GOsa² dopo il login come primo utente"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
+#~ "to install the main server, all user passwords exept that one for the "
+#~ "first user will expire in only 2 days.  To fix this, please execute the "
+#~ "following script in a terminal.  This script is included in r1."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Attenzione:</emphasis> Se Wheezy/r0 è stato "
+#~ "utilizzato per installare il server principale, tutte le password degli "
+#~ "utenti tranne quella del primo utente scadranno in soli 2 giorni.  Per "
+#~ "risolvere questo problema, si prega di eseguire il seguente script in un "
+#~ "terminale.  Questo script è incluso in r1. "
+
+#~ msgid ""
+#~ "#!/bin/bash\n"
+#~ "  #\n"
+#~ "  # /usr/share/debian-edu-config/tools/password-fix-wheezy-r0\n"
+#~ "  #\n"
+#~ "  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
+#~ "  # in Debian Edu Wheezy up to r0; for new users the password will\n"
+#~ "  # never expire. For existing users this will be the case after they've\n"
+#~ "  # changed their password. Give old users the chance to change the\n"
+#~ "  # password, exclude not affected accounts: templates and first user.\n"
+#~ "  #\n"
+#~ "  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|"
+#~ "newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
+#~ "    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
+#~ "  done\n"
+#~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
+#~ msgstr ""
+#~ "#!/bin/bash\n"
+#~ "  #\n"
+#~ "  # /usr/share/debian-edu-config/tools/password-fix-wheezy-r0\n"
+#~ "  #\n"
+#~ "  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
+#~ "  # in Debian Edu Wheezy up to r0; for new users the password will\n"
+#~ "  # never expire. For existing users this will be the case after they've\n"
+#~ "  # changed their password. Give old users the chance to change the\n"
+#~ "  # password, exclude not affected accounts: templates and first user.\n"
+#~ "  #\n"
+#~ "  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|"
+#~ "newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
+#~ "    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
+#~ "  done\n"
+#~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
+
+#~ msgid "Filterbox"
+#~ msgstr "Il box Filter"
+
+#~ msgid "Editing user data"
+#~ msgstr "Modificare i dati utente"
+
+#~ msgid "Set user password"
+#~ msgstr "Configurare la password dell'utente"
+
+#~ msgid "create group"
+#~ msgstr "creare il gruppo"
+
+#~ msgid "GOsa² systems listing"
+#~ msgstr "GOsa² systems listing"
+
+#~ msgid "Host details"
+#~ msgstr "Dettagli dell'host"
+
+#~ msgid "Modify host"
+#~ msgstr "Modificare l'host"
+
+#~ msgid "Add netgroup"
+#~ msgstr "Aggiungere gruppi di rete (netgroup)"
+
+#~ msgid "slbackup-php Maintenance"
+#~ msgstr "Manutenzione di slbackup-php"
+
+#~ msgid ""
+#~ "The Debian Edu Wheezy Manual has generally been cleaned up and improved. "
+#~ "A proof-read with corrections was done by a native English linguist."
+#~ msgstr ""
+#~ "Il manuale Debian Edu Wheezy è stato ripulito e migliorato. La versione "
+#~ "inglese è stata verificata e corretta da un linguista di lingua madre."
+
+#~ msgid ""
+#~ "gosa (2.6.11-3+wheezy1~edu+1) from the upcoming 6.0.5 Debian point "
+#~ "release, with:"
+#~ msgstr ""
+#~ "gosa (2.6.11-3+wheezy1~edu+1) dal prossimo 6.0.5 Debian point release, "
+#~ "con:"
+
 #~ msgid ""
 #~ "Create a user with membership in the \"admins\" group (if not already "
 #~ "existing)"
@@ -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"
@@ -13498,9 +13601,6 @@ msgstr ""
 #~ "password column is missing, an easy to remember, pronounceable password "
 #~ "will be created."
 
-#~ msgid "FIXME: to be continued..."
-#~ msgstr "FIXME: to be continued..."
-
 #~ msgid ""
 #~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/squeeze-beta/"
 #~ "debian-edu-6.0.2+edub1-DVD.iso</computeroutput>"
@@ -13672,11 +13772,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 +13930,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 +14018,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 +14230,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 +14254,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 +14264,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 +14276,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 +14292,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 +14499,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 +14513,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 +14606,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 +14631,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 +14643,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 +14660,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 +14673,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 +14780,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 +14820,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 +14847,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 +14877,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 +14952,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 +14974,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 +14983,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 +15001,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 +15010,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 +15036,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 +15060,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 +15085,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 +15121,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 +15172,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 +15207,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 +15230,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 +15239,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 +15251,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 +15355,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 +15445,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 +15461,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 +15663,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 +15693,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 +15830,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 +15851,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 +15870,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 +15890,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 +15904,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 +15913,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 +15947,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 +15979,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 +16087,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 +16210,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 +16281,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 +16326,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 +16339,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-wheezy/debian-edu-wheezy-manual.nb.po
similarity index 94%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 3421b62..93b10e5 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-14 14:40-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,32 +24,30 @@ 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 Wheezy 7.0.0+r0 Manual"
+msgstr "Debian Edu / Skolelinux Wheezy 7.0.0+r0 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 7.0.0+r0 Codename \"Wheezy\""
+msgstr "Utgivelsesmanual for Debian Edu 7.0.0+r0 kodenavn Wheezy"
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr "./images/welcome_to_tjener.png"
-
-#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu login"
-msgstr "Skolelinux innlogging"
+#. type: Content of: <article><section><para>
+msgid ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
+msgstr ""
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
-msgstr "Dette er utgivelsesmanualen for Debian Edu Squeeze versjon 6.0.6+r1."
+msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgstr "Dette er utgivelsesmanualen for Debian Edu Wheezy versjon 7.0.0+r0."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> is a wiki and updated frequently."
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
 "Versjonen på <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/>er en wikiside og oppdateres ofte."
+"Wheezy\"/>er en wikiside og oppdateres ofte."
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -177,10 +175,10 @@ msgstr "Nettverk"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "./images/Debian_Edu_Network_Squeeze.png"
+msgid "./images/Debian_Edu_Network_Wheezy.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
-"png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+"arch.]png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
@@ -639,8 +637,8 @@ msgstr ""
 "brukerdatabasen, ved å gi hver enkel klasse sin egen e-postliste. Klienter "
 "er satt opp til å levere e-post til tjeneren (ved bruk av 'smarthost') og "
 "brukere kan <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Lenny/HowTo/Users#Usingemail\"> få tilgang til sin personlige e-post</ulink> "
-"gjennom enten POP3 eller IMAP."
+"Squeeze/HowTo/Users#Usingemail\"> få tilgang til sin personlige e-post</"
+"ulink> gjennom enten POP3 eller IMAP."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -1246,7 +1244,7 @@ msgid ""
 "\"Architecture\">network architecture</link> chapter."
 msgstr ""
 "Egenskapene til de ulike profilene forklares i kapitlet <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Documentation/Lenny/Architecture#"
+"wiki.debian.org/DebianEdu/Documentation/Squeeze/Architecture#"
 "\">nettverksarkitektur</ulink>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1595,13 +1593,13 @@ msgstr "Hvor finner man mer informasjon"
 #, fuzzy
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-"Debian Squeeze</ulink> before you start installing a system for production "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 "Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\"http://"
-"www.debian.org/releases/lenny/releasenotes\">utgivelsesnotatene for Debian "
-"Lenny</ulink> før du starter å installere et system for bruk i produksjon. "
+"www.debian.org/releases/squeeze/releasenotes\">utgivelsesnotatene for Debian "
+"Squeeze</ulink> før du starter å installere et system for bruk i produksjon. "
 "Hvis du bare vil prøve Debian Edu/Skolelinux, så trenger du ikke det. Det "
 "skal bare fungere <inlinemediaobject><imageobject><imagedata width=\"15\" "
 "fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/"
@@ -1631,19 +1629,18 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"Even more information about the Debian Squeeze release is available in its "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Even more information about the Debian Wheezy release is available in its "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
 "Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
-"lenny/installmanual\"> manualen til Debian Installer</ulink>."
+"squeeze/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 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
-"Last ned et installasjonsmedium for Debian Edu 5.0.4+edu0 Kodenavn \"Lenny\""
+"Last ned et installasjonsmedium for Debian Edu 7.0.0+r0 Kodenavn Wheezy"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
@@ -1665,11 +1662,17 @@ msgstr ""
 "brukt for innstallasjoner av amd64 og i386 maskiner.  For å laste det ned, "
 "bruk en av disse metodene:"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, 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-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1677,8 +1680,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-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1686,8 +1689,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-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1709,8 +1712,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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1718,8 +1721,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-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgstr ""
 "<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1727,8 +1730,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-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1748,8 +1751,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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1757,8 +1760,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-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgstr ""
 "<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1766,8 +1769,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-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1836,12 +1839,8 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Velg type installasjon"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:01-Installer_boot_menu.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1912,18 +1911,12 @@ msgstr ""
 "<computeroutput>64-bit installasjon</computeroutput> kjører en 64-bit "
 "installasjon i tekstmodus. "
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-msgid "./images/Installer_advanced_options_a.png"
+msgid "[attachment:Installer_advanced_options_a.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener.png"
-"\"/></imageobject>"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Installation options explained"
-msgid "Installer advanced options screen 1"
-msgstr "Installasjonsvalg i detalj"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
@@ -1983,18 +1976,12 @@ msgid ""
 "preseed file."
 msgstr "<emphasis role='strong'>Lokalkode</emphasis>"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-msgid "./images/Installer_advanced_options_b.png"
+msgid "[attachment:Installer_advanced_options_b.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener.png"
-"\"/></imageobject>"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Installation options explained"
-msgid "Installer advanced options screen 2"
-msgstr "Installasjonsvalg i detalj"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
@@ -2050,16 +2037,12 @@ msgid ""
 "needs a preseed file."
 msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-msgid "./images/Installer_help.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-10-basesystem.png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer help screen"
+msgid "[attachment:Installer_help.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2186,7 +2169,7 @@ msgstr "Innstallasjonsprosessen"
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">system requirements</ulink> and make sure you have at "
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
@@ -2296,7 +2279,7 @@ msgstr ""
 "som LTSP-tjener. Klienter uten harddisk starter opp og kjører programvare "
 "fra denne tjeneren. Denne maskinen trenger to nettverkskort, mye minne, og "
 "ideelt sett mer enn en prosessor eller prosessorkjerne. Se kapittel om "
-"<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/"
+"<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/"
 "NetworkClients#\">networked clients</ulink> for mer informasjon om klienter. "
 "Å velge tynnklientprofilen aktiverer også arbeidsstasjon profilen, (selv om "
 "den ikke er valgt), og en tynnklienttjener kan alltid brukes som en "
@@ -2454,14 +2437,13 @@ msgstr ""
 #. type: CDATA
 #, fuzzy, no-wrap
 msgid ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
 "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 ""
@@ -2490,7 +2472,7 @@ msgstr ""
 "profil til profil:"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
+msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2524,41 +2506,6 @@ msgid "Minimal: 12 of 83 MiB downloaded."
 msgstr "Barebone: 12 av 83 MiB lastet ned."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on some RAID controllers"
-msgstr "En kommentar om RAID-kontrollere"
-
-#. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When using a USB drive to add missing firmware during install, with some "
-#| "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-#| "installation results in a GRUB-error. A workaround for this problem is to "
-#| "remove the USB drive after the firmware is loaded, and preferably before "
-#| "partitioning starts."
-msgid ""
-"When using a USB drive to add missing firmware during install, with some "
-"RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-"installation results in a GRUB error. A workaround for this problem is to "
-"remove the USB drive after the firmware is loaded, and preferably before "
-"partitioning starts."
-msgstr ""
-"Når man må bruke USB-pen for å legge inn manglende drivere under "
-"installasjonen, så kan noen RAID-kontrollere feile og installere GRUB på USB-"
-"pennen. For å unngå dette, så kan man nappe ut USB-pennen etter at driver er "
-"laster, og helst i god tid før partisjonering av disker starter.  "
-
-#. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-msgid ""
-"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-msgstr ""
-"Mer informasjon om dettefinnes i <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> og i Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280\">516280</ulink>."
-
-#. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
 msgstr "En kommentar om installasjon av tynnklienttjenere"
 
@@ -2683,12 +2630,8 @@ msgstr ""
 "Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
 "\">hovedtjeber</emphasis> tilgjengelig: "
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/pxe-tjener.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "pxe-tjener.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:pxe-tjener.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2706,16 +2649,12 @@ msgstr ""
 "emphasis> og <emphasis role=\"strong\">tynnklienttjener</emphasis> "
 "profilene :"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener.png"
-"\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -2767,8 +2706,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
@@ -2809,10 +2748,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 "Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
-"lenny/installmanual\"> manualen til Debian Installer</ulink>."
+"squeeze/installmanual\"> manualen til Debian Installer</ulink>."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2926,320 +2865,181 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/02-select_a_language.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "02-select_a_language.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/03-select_your_location.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "03-select_your_location.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-msgid "./images/04-Configure_the_keyboard.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
-"png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "04-Configure_the_keyboard.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener.png"
-"\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "05-Detect_and_mount_CD-ROM.png"
+#. type: Content of: <article><section><section><para>
+msgid "FIXME: these screenshots need to be redone once we have wheezy artwork"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-msgid "./images/06-Load_installer_components_from_CD.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:02-select_a_language.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener.png"
-"\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "06-Load_installer_components_from_CD.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:03-select_your_location.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/07-Detect_network_hardware.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
-"png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "07-Detect_network_hardware.png"
+msgid "[attachment:04-Configure_the_keyboard.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+"arch.]png\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-06-profile.png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "08-Choose_Debian_Edu_profile.png"
+msgid "[attachment:05-Detect_and_mount_CD-ROM.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgid "[attachment:06-Load_installer_components_from_CD.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgid "[attachment:07-Detect_network_hardware.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+"arch.]png\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-"
-"edituser_lenny.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "11-Participate_in_the_package_usage_survey.png"
+msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-"
-"edituser_lenny.png\"/></imageobject>"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "Set passwords"
-msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr "Sett passord"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Set passwords"
-msgid "12-Set_up_users_and_passwords.png"
-msgstr "Sett passord"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "Set passwords"
-msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr "Sett passord"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Set passwords"
-msgid "12a-Set_up_users_and_passwords.png"
-msgstr "Sett passord"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "Set passwords"
-msgid "./images/12b-Set_up_users_and_passwords.png"
+msgid "[attachment:12-Set_up_users_and_passwords.png]"
 msgstr "Sett passord"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "Set passwords"
-msgid "12b-Set_up_users_and_passwords.png"
+msgid "[attachment:12a-Set_up_users_and_passwords.png]"
 msgstr "Sett passord"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "Set passwords"
-msgid "./images/12c-Set_up_users_and_passwords.png"
+msgid "[attachment:12b-Set_up_users_and_passwords.png]"
 msgstr "Sett passord"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "Set passwords"
-msgid "12c-Set_up_users_and_passwords.png"
+msgid "[attachment:12c-Set_up_users_and_passwords.png]"
 msgstr "Sett passord"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/13-Install+the+base+system.png"
+msgid "[attachment:13-Install the base system.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "13-Install the base system.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/14-Select_and_install_software.png"
+msgid "[attachment:14-Select_and_install_software.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/getting-"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
 "started.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "14-Select_and_install_software.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/17-Select_and_install_software.png"
+msgid "[attachment:17-Select_and_install_software.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/getting-"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
 "started.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "17-Select_and_install_software.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/18-Build+LTSP+chroot.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "18-Build LTSP chroot.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
-"png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:18-Build LTSP chroot.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
-"png\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/20-Finish_the_Installation.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/getting-"
-"started.png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "20-Finish_the_Installation.png"
+msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+"arch.]png\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgid "[attachment:20-Finish_the_Installation.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/getting-"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
 "started.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "21-Finish_the_Installation-Installation_complete.png"
+msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/getting-"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
 "started.png\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "22-Tjener_GRUB_boot_menu.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:23-Tjener-KDM_Login.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:24-Tjener-KDE_Start.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener.png"
-"\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "26-Tjener-KDE_Desktop_Browser.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "27-Tjener-KDE_Desktop.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/29-Diskless-WS-KDM_Login.png"
+msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:27-Tjener-KDE_Desktop.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:30-ThinClient-LDM_Login.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener.png"
-"\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
+msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -3301,20 +3101,14 @@ msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
 "and some frequently asked questions."
 msgstr ""
-"Dette <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
+"Dette <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
 "HowTo#\">HowTo</ulink> kapittelet dekker flere tips, triks og endel ofte "
 "spurte spørsmål."
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/getting-started-desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:getting-started-desktop.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Requirements for a network setup"
-msgid "Debian Edu desktop"
-msgstr "Krav for nettverksoppsett"
-
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid ""
@@ -3390,10 +3184,10 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"If you are using a new Debian Edu Squeeze machine, the site certificate will "
+"If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
-"Hvis du bruker en ny maskine med Skoeleinux/Debian Edu Lenny, så skal "
+"Hvis du bruker en ny maskine med Skoeleinux/Debian Edu Squeeze, så skal "
 "reglene for ssl serifikatet allerede være på plass, og du vil ikke få noe "
 "spørsmål om dette.  "
 
@@ -3405,7 +3199,7 @@ msgid ""
 "accept it and ignore that."
 msgstr ""
 "Hvis du <emphasis role=\"strong\">ikke</emphasis> bruker en ny maskin med "
-"Skolelinux/DebianEdu Lenny, så vil du få en feilmelding om ssl sertifikat. "
+"Skolelinux/DebianEdu Squeeze, så vil du få en feilmelding om ssl sertifikat. "
 "Be nettleseren din om å akseptere dette. "
 
 #. type: Content of: <article><section><section><para>
@@ -3418,12 +3212,8 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa2_overview.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² overview page after login as the first user"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:gosa2_overview.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3575,45 +3365,14 @@ msgid ""
 "within your network."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Please note:</emphasis> If Squeeze/r0 was used to "
-"install the main server, all user passwords exept that one for the first "
-"user will expire in only 2 days.  To fix this, please execute the following "
-"script in a terminal.  This script is included in r1."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
 #| msgid "Search and delete users"
 msgid "Search, modify and delete users"
 msgstr "Søk etter og slett brukere"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/filterbox.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Filterbox"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:filterbox.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3649,16 +3408,10 @@ msgstr ""
 "bruker, endre passordet til brukeren og endre listen over grupper som "
 "brukeren tilhører."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/edit_user.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:edit_user.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Adding users"
-msgid "Editing user data"
-msgstr "Legge til brukere"
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
 msgstr "Sett passord"
@@ -3705,18 +3458,12 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><para>
 #, fuzzy
-msgid "./images/change_password_administratively.png"
+msgid "[attachment:change_password_administratively.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/worldmap.png\"/"
-"></imageobject>"
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Set passwords"
-msgid "Set user password"
-msgstr "Sett passord"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:worldmap.png"
+"\"/]></imageobject>"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -3823,16 +3570,12 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Brukeradministrasjon med lwat"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/create_group.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "create group"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:create_group.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/list_groups.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:list_groups.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3879,14 +3622,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
@@ -3921,8 +3664,8 @@ msgstr ""
 "hjelp av lwat har et verstnavn, en IP-adresse, en MAC-adresse og et "
 "domenenavn som vanligvis er «intern». For en mer grundig beskrivelse av "
 "arkitekturen i Debian Edu, se <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Lenny/Architecture#\">architecture</ulink> kapittelet i denne "
-"manualen."
+"Documentation/Squeeze/Architecture#\">architecture</ulink> kapittelet i "
+"denne manualen."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3971,53 +3714,37 @@ msgstr ""
 #, no-wrap
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "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>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/gosa_systems_list.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-10-basesystem.png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² systems listing"
+msgid "[attachment:gosa_systems_list.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_host_details.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_host_details.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Host details"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_edit_host.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_edit_host.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Modify host"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-msgid "./images/gosa_systems_add_netgroup.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-10-basesystem.png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Add netgroup"
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+msgid "[attachment:gosa_systems_add_netgroup.png]"
 msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4269,7 +3996,7 @@ msgstr ""
 "ldaptreet, og sette dette merket for at det skal være mulig å melde "
 "windowsmaskinen inn i domenet. For mer informasjon om  legge windowsmaskiner "
 "inn i et Skolelinuxnettverk, se <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Documentation/Lenny/HowTo/"
+"DebianEdu/Documentation/Squeeze/HowTo/"
 "NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration"
 "\">HowTo/NetworkClients</ulink> kapitlet i denne manualen."
 
@@ -4569,11 +4296,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
@@ -4611,18 +4338,12 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-msgid "./images/slbackup-php_maintenance.png"
+msgid "[attachment:slbackup-php_maintenance.png]"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-10-basesystem.png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Maintainance"
-msgid "slbackup-php Maintenance"
-msgstr "Vedlikehold"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
@@ -4737,8 +4458,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
@@ -5013,7 +4734,7 @@ msgid ""
 "installmanual\">installation manual</ulink>."
 msgstr ""
 "Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
-"lenny/installmanual\"> manualen til Debian Installer</ulink>."
+"squeeze/installmanual\"> manualen til Debian Installer</ulink>."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -5033,18 +4754,18 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-msgid "Upgrades from Debian Edu Lenny"
+msgid "Upgrades from Debian Edu Squeeze"
 msgstr "Oppgraderinger fra Debian Edu sarge"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Lenny in a test "
+"Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
 "</inlinemediaobject> Vær oppmerksom: sørg for at du har testet "
-"oppgraderingen fra Etch i et testmiljø, eller at du har backup tilgjengelig, "
-"for å kunne gå tilbake ved eventuelle problemer."
+"oppgraderingen fra Lenny i et testmiljø, eller at du har backup "
+"tilgjengelig, for å kunne gå tilbake ved eventuelle problemer."
 
 #. type: Content of: <article><section><section><title>
 msgid "The basic upgrade operation"
@@ -5054,7 +4775,7 @@ msgstr "Standard upgraderings metode"
 #, fuzzy
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"lenny\" with \"squeeze\"."
+"occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 "Nå kan du endre <computeroutput>/etc/apt/sources.list</computeroutput> slik "
 "at de inneholder disse linjene"
@@ -5062,17 +4783,17 @@ msgstr ""
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 #, fuzzy
 msgid "run <computeroutput>apt-get update</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 #, fuzzy
 msgid "run <computeroutput>apt-get upgrade</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 #, fuzzy
 msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
@@ -5082,6 +4803,11 @@ msgstr "LDAP-tjenesten trenger å bli reparert"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
 "accounts, passwords, network settings, services and machines are treated is "
 "quite different now. So LDAP has to be rebuild from scratch. There's a "
@@ -5095,9 +4821,13 @@ msgid "Recreating an LTSP chroot"
 msgstr "Gjenoppretter LTSP chroot"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
+#| "will automatically support both thin-clients and diskless workstations."
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will automatically support both thin-clients and diskless workstations."
+"will still support both thin-clients and diskless workstations."
 msgstr ""
 "LTSP chroot vil bli gjenopprettet på LTSP-server(ene). Den nye chroot vil "
 "automatisk støtte både tynn-klienter og diskløse klienter/arbeidsstasjoner. "
@@ -5128,24 +4858,24 @@ msgstr ""
 #. type: Content of: <article><section><title>
 #, fuzzy
 msgid ""
-"Upgrades from older Debian Edu / Skolelinux installations (before Lenny)"
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr "Oppgraderinger fra eldre Debian Edu / Skolelinux-installasjoner"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"To upgrade from any older release, you will need to upgrade to the Lenny-"
+"To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian Edu Lenny</"
-"ulink> about how to upgrade to Lenny from the previous release, Etch, and "
-"the Etch manual covers the one before that!"
+"debian.org/DebianEdu/Documentation/Squeeze#\">Manual for Debian Edu Squeeze</"
+"ulink> about how to upgrade to Squeeze from the previous release, Lenny, and "
+"the Lenny manual covers the one before that! (Etch was it's name.)"
 msgstr ""
 "For å oppgradere fra en eldre utgivelse, må du først oppgradere til den etch "
 "baserte Debian Edu utgivelsen først. Deretter kan  du følge instruksjonene "
 "ovenfor. Hvordan du oppgraderer til etch er beskrevet i <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Documentation/Etch#\">Manualen for Debian Edu Etch "
-"</ulink>."
+"wiki.debian.org/DebianEdu/Documentation/Lenny#\">Manualen for Debian Edu "
+"Lenny </ulink>."
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -5282,7 +5012,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 +5030,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 +5039,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 +5049,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"
@@ -5336,7 +5060,7 @@ msgstr "Endre størrelse på partisjoner"
 #, fuzzy
 #| msgid ""
 #| "Most partitions in Debian Edu are logical LVM volumes.  Only the /boot/ "
-#| "partition is not. With the Debian/Etch release of Debian Edu, it is "
+#| "partition is not. With the Debian/Lenny release of Debian Edu, it is "
 #| "possible to extend partitions while they are mounted.  This is a feature "
 #| "of the Linux kernel since version 2.6.10.  Shrinking partitions still "
 #| "need to happen while the partition is unmounted."
@@ -5348,10 +5072,10 @@ msgid ""
 "unmounted."
 msgstr ""
 "De fleste partisjoner i Debian Edu er logiske dataområder (LVM). Det er kun /"
-"boot/-partisjonen som ikke er det. Med Debian/Etch utgivelsen av Skolelinux/ "
-"Debian Edu, er det mulig å utvide partisjoner mens de er monterte. Dette er "
-"en egenskap i linuxkjernen siden versjon 2.6.10. Krymping av partisjoner må "
-"fortsatt skje mens partisjonen er avmontert."
+"boot/-partisjonen som ikke er det. Med Debian/Lenny utgivelsen av "
+"Skolelinux/ Debian Edu, er det mulig å utvide partisjoner mens de er "
+"monterte. Dette er en egenskap i linuxkjernen siden versjon 2.6.10. Krymping "
+"av partisjoner må fortsatt skje mens partisjonen er avmontert."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -5459,10 +5183,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 +5213,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 +5233,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>
@@ -5620,9 +5344,9 @@ msgstr "Bruk av backports.org"
 #. type: CDATA
 #, 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]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"apt-get update"
+msgstr "deb http://ftp.debian.org/debian/ squeeze main contrib non-free"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5638,8 +5362,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to upgrade from one version to another (for example from Squeeze "
-"6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical "
+"If you want to upgrade from one version to another (for example from Wheezy "
+"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
 "media, follow these steps:"
 msgstr ""
 
@@ -5652,7 +5376,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 +5405,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 +5491,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 +5512,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 +5532,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 +5609,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 +5624,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 +5634,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 +5691,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 +5715,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 +5870,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 +5893,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
@@ -6296,7 +6020,7 @@ msgstr "Modifisere innloggingskjermen kdm"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "In Debian/Etch, the way to customize the kdm login screen was changed. "
+#| "In Debian/Lenny, the way to customize the kdm login screen was changed. "
 #| "Now, it is done by adding a file in <computeroutput>/etc/default/kdm.d/</"
 #| "computeroutput> specifying variables to override the default."
 msgid ""
@@ -6304,7 +6028,7 @@ msgid ""
 "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
 "override the default."
 msgstr ""
-"I Debian/Etch, så ble måten å tilpasse innloggingskjermen kde forandret. Nå "
+"I Debian/Lenny, så ble måten å tilpasse innloggingskjermen kde forandret. Nå "
 "blir det gjort ved å legge en fil til <computeroutput>/etc/default/kdm.d/</"
 "computeroutput> som oppgir variabler som overstyrer standardvariablene."
 
@@ -6320,10 +6044,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 +6077,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 +6135,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"
@@ -6434,9 +6158,9 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 "# innstaller debian nøkkelringen sikkert:\n"
 "aptitude install debian-keyring\n"
@@ -6445,9 +6169,9 @@ msgstr ""
 "# sjekk sikkert om nøkkelen er korrekt og legg den til nøkkelingen apt benytter hvis den er det:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for speil!\n"
-"echo \"deb http://deb-multimedia.org lenny main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org squeeze 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 +6270,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 +6371,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 +6435,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 +6485,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 +6502,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 +6525,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 +6545,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 +6609,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 +6729,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 +6750,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 +6794,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 +6918,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 +6954,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 +6970,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 +7101,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 +7128,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 +7170,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 +7244,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 +7255,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 +7284,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 +7304,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 +7315,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
@@ -7646,7 +7357,7 @@ msgstr ""
 #| "required:"
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr "For å melde windowsklienter inn i domenet må noen (få) steg utføres:"
 
 #. type: Content of: <article><section><section><section><para>
@@ -7703,12 +7414,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 +8087,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
@@ -8500,7 +8210,7 @@ msgstr "Installasjon av DebianEdu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-"
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
 "style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
@@ -8936,7 +8646,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 +8671,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 +8680,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 +8715,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 +8726,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 +8741,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>
@@ -9325,16 +9035,16 @@ msgstr ""
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> and you can contribute easily. Note: a user account is needed "
-"to edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 "Kilden for teksten er en wiki og kan redigeres med en enkel nettleser. Det "
 "er bare å gå til <ulink url='http://wiki.skolelinux.no/DebianEdu/"
-"Documentation/Etch/'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/"
-"</ulink> og der kan du enkelt bidra. Merknad: En brukerkonto trengs for å "
-"redigere sidene, så du må opprette en <ulink url='http://wiki.skolelinux.no/"
-"UserPreferences'>wikibruker</ulink> først."
+"Documentation/Lenny/'>http://wiki.skolelinux.no/DebianEdu/Documentation/"
+"Lenny/</ulink> og der kan du enkelt bidra. Merknad: En brukerkonto trengs "
+"for å redigere sidene, så du må opprette en <ulink url='http://wiki."
+"skolelinux.no/UserPreferences'>wikibruker</ulink> først."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -9488,1774 +9198,1882 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-msgid "New features in Debian Edu Squeeze"
+msgid "New features in Debian Edu Wheezy"
 msgstr ""
 "Dette er den (<emphasis>fortsatt ufullstendige</emphasis>) "
-"utgivelsesmanualen for Debian Edu Lenny 5.0.4+edu1 utgivelsen"
+"utgivelsesmanualen for Debian Edu Squeeze 5.0.4+edu1 utgivelsen"
 
-#. type: Content of: <article><section><section><title>
-#, fuzzy
+#. type: Content of: <article><section><para>
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
-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 "sitesummary was updated from 0.1.3 to 0.1.8"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Make Nagios configuration more robust and efficient"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Comply with 3.X kernel"
+"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><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+msgid ""
+"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
+"Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Squeeze - utgitt  08.02.2010"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Minor updates from the wiki"
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Danish translation now complete"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
+"installation, in the login screen and as desktop wallpaper."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: hopefully. h01ger is one it to ask gismo."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
-"#664596"
-msgstr ""
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Installation"
+msgid "Installation changes"
+msgstr "Installasjon"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
-"Handle '#' characters in the root or first users password. Closes: #664976"
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
+"Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
+"squeeze/installmanual\"> manualen til Debian Installer</ulink>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-sync:"
+#. type: Content of: <article><section><section><section><title>
+msgid "Software updates"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't fail if password contains \""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Wheezy:"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't disclose new password string in syslog"
-msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Linux kernel version 2.6.18"
+msgid "Linux kernel 3.2.x"
+msgstr "Linux kjerneversjon 2.6.18"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-create:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Invalidate libnss cache before applying changes"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 10 ESR"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Multiple failures during mass user import into GOsa²"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LibreOffice 3.5.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"gosa-netgroups plugin: don't erase entries of attribute type "
-"\"memberNisNetgroup\". Closes: #687256"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 12.01"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "First user now uses the same Kerberos policy as all other users"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 12.04"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Add Danish web page"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.8.2"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.1"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Improve preseeding support and documentation"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.11.3"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Debian Wheezy includes over 10,000 new packages available for installation, "
+"including the Chromium browser"
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
-"Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Lenny - utgitt  08.02.2010"
+"Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
+"squeeze/installmanual\"> manualen til Debian Installer</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
-"installation, in the login screen and as desktop wallpaper."
-msgstr ""
+#, fuzzy
+#| msgid "Installation"
+msgid "Infrastructural changes"
+msgstr "Installasjon"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <link linkend=\"GettingStarted\">Getting started chapter</link> of the "
-"manual for more information on GOsa²."
+msgid "FIXME: to be documented, if any"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "See below for a list of updated software."
-msgstr ""
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Documentation writers and translators"
+msgid "Documentation and translation updates"
+msgstr "Dokumentasjonskrivere og oversettere"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Show welcome page to users when they first log in. This default start page "
-"for Iceweasel is fetched from LDAP at installation and boot time for "
-"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
-"Standalone installations."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in FIXME languages."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
-"installation method."
+"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
+"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Sound with LTSP clients"
-msgid "Speed up LTSP client boot."
-msgstr "Lyd med LTSP-klienter"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Provide a KDE menu entry for changing the password in GOsa²."
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"For more information on how to change passwords (including expired passwords "
-"at the KDM/GDM login prompt), please see the <link linkend=\"Users\">HowTos "
-"for users</link> chapter of the manual."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
-"shown to new users."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
+msgid "Copyright and authors"
+msgstr "Opphavsrett og forfattere"
+
+#. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"All LTSP servers are also <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP servers</link> by default."
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
+"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
+"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
+"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
+"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
+"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
+"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
+"GPL2 or any later version. Enjoy!"
 msgstr ""
-"Veiledninger for <link linkend=\"NetworkClients\">nettverksklienter</link>"
+"Dette dokumentet er skrevet av Holger Levsen, Petter Reinholdtsen, Daniel "
+"Heß, Patrick Winnertz, Knut Yrvin, Ralf Gesellensetter, Ronny Aasen, Morten "
+"Werner Forsbring and José L. Redrejo Rodríguezis med opphavsrett 2007, "
+"utgitt under GPL2 eller senere versjon."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"Improve handing of removable media on thin clients. Show desktop "
-"notification longer when inserting new media and provide an option to start "
-"dolphin when such media is inserted."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the GPL2 or later version."
 msgstr ""
+"Hvis du legger til innhold, <emphasis role='strong'>så bare gjør det hvis du "
+"er forfatteren av innholdet og planlegger å gi det ut under samme "
+"betingelser</emphasis>! Så legger du navnet ditt til her og gir det ut under "
+"GPL2 eller senere versjoner."
 
-#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Installation"
-msgid "Installation changes"
-msgstr "Installasjon"
+#. type: Content of: <article><section><title>
+msgid "Translation copyright and authors"
+msgstr "Opphavsrett for oversettere"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
-"for more details."
+"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
+"released under the GPL2 or any later version."
 msgstr ""
-"Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
-"lenny/installmanual\"> manualen til Debian Installer</ulink>."
+"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
+"opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
-"is set up during installation of the Main Server. This user is up as GOsa² "
-"administrator and is also granted sudo access. The Debian Edu menu "
-"reordering has been enabled as well, by adding the user also to the "
-"<computeroutput>teachers</computeroutput> group."
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
+"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
+"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
 msgstr ""
+"Den norske bokmålsoversettelsen er gjort av Petter Reinholdtsen og Håvard "
+"Korsvoll med opphavsrett 2007 og utgitt under GPL2 eller senere versjoner."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "For lenny Debian Edu has switched to <computeroutput>powerdns</"
-#| "computeroutput> as nameserver. It's however possible to stay with "
-#| "<computeroutput>bind9</computeroutput>."
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"The German translation is copyrighted by Holger Levsen (2007), Patrick "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
+"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
+"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
+"and is released under the GPL2 or any later version."
 msgstr ""
-"I Lenny Debian Edu har vi byttet til <computeroutput>powerdns</"
-"computeroutput> som navneserver. Det er imidlertid mulig å forsette å bruke "
-"<computeroutput>bind9</computeroutput>."
+"Den tyske oversettelsen er gjort av Holger Levsen, Patrick Winnertz, Ralf "
+"Gesellensetter, Roland F. Teichert og Jürgen Leibner med opphavsrett 2007 og "
+"utgitt under GPL2 eller senere versjoner."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 #, fuzzy
-msgid "New roaming workstation profile for laptops."
-msgstr "arbeidsstasjon"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Device access for all users is handled by <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-"needed to get access to devices."
+"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
+"Den italienske oversettelsen er gjort av Claudio Carboncini med opphavsrett "
+"2007 og er utgitt under GPL2 eller senere versjoner."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"A warning will be issued when installing on too small disks for the selected "
-"profile."
+"The French translation is copyrighted by Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
+"2010, 2012) and is released under the GPL2 or any later version."
 msgstr ""
+"Den italienske oversettelsen er gjort av Claudio Carboncini med opphavsrett "
+"2007 og er utgitt under GPL2 eller senere versjoner."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/ "
-"but no seperate /usr anymore."
+"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+"(2009) 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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"More tests in the test suite, and correct some of the tests that failed "
-"earlier."
+"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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
+msgid "Translations of this document"
+msgstr "Oversettelser av dette dokumentet"
+
+#. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
-"Make sure to report an error and abort the installation when trying to use "
-"the netinst images without a working Internet connection, instead of "
-"silently installing a broken system."
+"Versions of this document fully translated into German, Italian, French and "
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">take a look here</ulink> for your own language."
 msgstr ""
+"Ferdigoversatte versjoner av dette dokumentet er ikke tilgjengelig ennå. "
+"Ufullstendige oversettelser for Norsk Bokmål, Spansk og Tysk eksisterer."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Software updates"
-msgstr ""
+#. type: Content of: <article><section><section><title>
+msgid "HowTo translate this document"
+msgstr "Hvordan oversette dette dokumentet"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Squeeze:"
+#. type: Content of: <article><section><section><para>
+#, 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-wheezy-"
+"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."
 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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
+#, fuzzy
 msgid ""
-"compatibility with the FHS v2.3 and software developed for version 3.2 of "
-"the LSB."
+"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."
 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>]."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "Linux kernel version 2.6.18"
-msgid "Linux kernel 2.6.32"
-msgstr "Linux kjerneversjon 2.6.18"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+#| msgid ""
+#| "You can checkout 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):"
+msgid ""
+"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):"
 msgstr ""
+"Du kan hente ut kilden for <computeroutput>debian-edu-doc</computeroutput> "
+"anonymt med denne kommandoen (du må ha pakken <computeroutput>git</"
+"computeroutput> installert for at dette skal fungere):"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 3.5"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "OpenOffice.org 1.1."
-msgid "OpenOffice.org 3.2.1"
-msgstr "OpenOffice.org 1.1."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 9.3"
+msgid ""
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
+"<computeroutput>lokalize</computeroutput>."
 msgstr ""
+"Så redigerer du <computeroutput>documentation/release-manual/release-manual."
+"$CC.po</computeroutput> (der du bytter ut $CC med landskoden din). Det er "
+"mange verktøy tilgjengelig for å oversette, vi foreslår at du bruker "
+"<computeroutput>kbabel</computeroutput>."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Music creator Rosegarden 10.04.2"
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+msgid ""
+"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."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Image editor Gimp 2.6.10"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
+"For å oppdatere din lokale kopi av arkivet, kan du bruke denne kommandoen "
+"inne i mappen <computeroutput>debian-edu-doc</computeroutput>:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual universe Celestia 1.6.0"
-msgstr ""
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual stargazer Stellarium 0.10.4"
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+msgid ""
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
 msgstr ""
+"Les /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
+"translations for å finne informasjon om hvordan lage en ny -po fil for ditt "
+"språk, hvis det ikke finnes allerede, og hvordan oppdatere oversettelser."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation, "
-"including the browser Chromium"
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 #, 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/Git\"/>."
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
+"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 ""
-"Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
-"lenny/installmanual\"> manualen til Debian Installer</ulink>."
+"Elementær informasjon om Alioth (verten for vårt SVN-pakkelager) og SVN er "
+"tilgjengelig på <ulink url=\"http://wiki.debian.org/Alioth/Git\"/>."
 
-#. type: Content of: <article><section><section><section><title>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "Installation"
-msgid "Infrastructural changes"
-msgstr "Installasjon"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
-"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
+"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 "
+"finnes noen ennå, og hvordan oppdatere oversettelser."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"The dynamic DHCP range was extended on the backbone network to around 4k IP "
-"addresses, and around 200 IP addresses for the thin client network."
-msgstr ""
+#. type: Content of: <article><section><section><para>
+msgid "Please report any problems."
+msgstr "Meld fra om eventuelle problemer."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><title>
+#, fuzzy
+#| msgid "Appendix A - The GNU Public License"
+msgid "Appendix A - The GNU General Public License"
+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."
+
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Change <computeroutput>$allowPwSet = false ;</computeroutput> to "
-#| "<computeroutput>$allowPwSet = true ;</computeroutput>"
 msgid ""
-"The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
-"computeroutput>"
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
-"Endre <computeroutput>$allowPwSet = false ;</computeroutput> til "
-"<computeroutput>$allowPwSet = true ;</computeroutput>"
+"Opphavsrett © 2007 Holger Levsen < <ulink url='mailto:holger at layer-acht."
+"org'>holger at layer-acht.org</ulink> > og andre, se <link linkend=\"CopyRight"
+"\">opphavsrettskapittelet</link> for den fulle lista av personer med "
+"opphavsrett."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"There are no pre-defined host entries for client systems in DNS anymore "
-"(staticXX, ..., dhcpYY...)"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "MIT Kerberos5 used for user authentication, enabled for:"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "PAM"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 msgstr ""
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "IMAP"
-msgstr ""
+#. type: Content of: <article><section><section><title>
+msgid "GNU GENERAL PUBLIC LICENSE"
+msgstr "GNU GENERAL PUBLIC LICENSE"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "SMTP"
-msgstr ""
+#. type: Content of: <article><section><section><para>
+msgid "Version 2, June 1991"
+msgstr "Version 2, June 1991"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the <computeroutput>workstation</"
-"computeroutput> netgroup to be able to mount the home directories"
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 msgstr ""
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
-msgstr ""
+#. type: Content of: <article><section><section><title>
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A complete PXE boot environment is setup when installing from the DVD, so "
-"that further installations can be done using PXE network installs only. A "
-"new script pxe-addfirmware is provided to support more hardware models "
-"needing firmware."
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Remove all hard coded settings on workstations, and configure workstations "
-"and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
-"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 
-#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Documentation writers and translators"
-msgid "Documentation and translation updates"
-msgstr "Dokumentasjonskrivere og oversettere"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
-"proof-read with corrections was done by a native English linguist."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 msgstr ""
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"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>
-msgid "Improvements to many language tasks, especially French and Danish."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to the welcome web page shown at first logins."
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add new Japanese, Portuguese and Catalan translations of the welcome web "
-"page."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 msgstr ""
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
-"installing a KDE environemnt."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 msgstr ""
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
-"netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 msgstr ""
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop gtick in the default installation, because it doesn't work on thin "
-"clients (BTS #566335)."
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 
-#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "User Administration (lwat)"
-msgid "New administration tool: GOsa²"
-msgstr "Brukeradministrasjon (lwat)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
-"with:"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fix DHCP host removal. Closes: #650258"
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 msgstr ""
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Backport user generator unicode character transliteration. Closes: #657086"
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Customized GOsa² configuration to better suit the Debian Edu network "
-"architecture."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"GOsa² updates DNS and NFS exports immediately when a system is updated in "
-"LDAP, making diskless workstations work right after they are added to the "
-"required netgroup."
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
-"objects using information gathered by sitesummary, to make it easier to add "
-"new computers to the network."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "More software changes"
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 msgstr ""
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change default package manager from adept to synaptic, to avoid getting two "
-"graphical package managers installed by default."
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
-"KDE."
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 msgstr ""
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 msgstr ""
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
-"default KDE installation."
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Replace network-manager-kde with plasma-widget-networkmanagement in the "
-"standalone KDE profile"
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add cifs-utils to the default installation to ensure SMB mounting can work "
-"in any profile."
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
-"and valgrind from the default installation and the DVD to make room for "
-"higher priority packages."
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 msgstr ""
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
-"authoritive source of host names."
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 msgstr ""
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "(The <computeroutput>debian-edu-doc</computeroutput> source package "
-#| "contains this image as a <computeroutput>dia</computeroutput> file.)"
+#. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
-"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
-"installed instead.)"
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
-"(Kildepakken <computeroutput>debian-edu-doc</computeroutput> inneholder "
-"dette bildet som en <computeroutput>dia</computeroutput>-fil.)"
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 msgstr ""
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make the LDAP server handle more clients after increasing the server's file "
-"descriptor limit from 1024 to 32768."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
-"flush all CUPS queues every night. Both can be disabled in LDAP."
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Provide network blocking / exam mode by default, controlled by LDAP. In "
-"addition to network blocking, changes to the Squid proxy configuration is "
-"needed."
-msgstr ""
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+msgstr "<emphasis role='strong'>NO WARRANTY</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Enable automatic extending of full file systems on the Main Server by "
-"default. This can be disabled in LDAP."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change SSL certificate name used by the LDAP server and adjust clients to "
-"use the new name to be able to enable certificate checking on clients."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
-"setup used for DNS."
-msgstr ""
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+msgstr "<emphasis role='strong'>NO WARRANTY</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Simplify autofs LDAP rules to make sure they work with extra home directory "
-"partitions exported from the main-server without any changes."
-msgstr ""
+#. type: Content of: <article><section><title>
+#, fuzzy
+#| msgid "Appendix B - about Debian Edu Live CD/DVDs"
+msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
+msgstr "Vedlegg B - om Debian Edu Live CD/DVDer"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Make backup system more robust in handling LDAP database dump and restart."
+#. type: Content of: <article><section><para>
+#, fuzzy
+msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
 msgstr ""
+"</inlinemediaobject> Debian Edu Live CD/DVDer for Squeeze er ikke "
+"tilgjengelig ennå."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr ""
+#. type: Content of: <article><section><section><title>
+msgid "Features of the Standalone image"
+msgstr "Egenskaper ved frittstående-disken"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Almost all packages from the Standalone profile"
+msgstr "Nesten alle pakker fra frittståendeprofilen"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "All packages from the laptop task"
+msgstr "Alle pakker fra pakkesamlingen for bærbare"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The KDE desktop profile for students/pupils."
+msgstr "KDE skrivebordsprofilen for studenter/elever."
+
+#. type: Content of: <article><section><section><title>
+msgid "Activating translations and regional support"
+msgstr "Aktiverer oversettelser og regional støtte"
+
+#. type: Content of: <article><section><section><para>
 #, fuzzy
+#| msgid ""
+#| "To activate a specific translation, boot using "
+#| "<computeroutput>locale=ll_CC.UTF-8</computeroutput> as a boot option, "
+#| "where ll_CC.UTF-8 is the locale name you want.  To aciviate a given "
+#| "keyboard layout, use the <computeroutput>keyb=KB</computeroutput> option "
+#| "where KB is the wanted keyboard layout.  More information on this feature "
+#| "<ulink url=\"http://wiki.debian.org/DebianLive/l10n\">is available from "
+#| "the live cd build script documentation</ulink>.  Here is a list of "
+#| "commonly used locale codes:"
 msgid ""
-"Root logins are denied for both KDM and GDM - see above and <link linkend="
-"\"GettingStarted\">Getting started</link> for details."
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
-"Gnome er lagt til som støttet skrivedbordmiljø, se i<ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny/Installation#\"> kapittel om "
-"installasjon.</ulink> for å lære å innstallere med GNOME istedet for KDE som "
-"skrivebordmiljø ."
+"For å aktivere spesifikke oversettelser, start opp med "
+"<computeroutput>locale=ll_CC.UTF-8</computeroutput> som oppstartsvalg. Der "
+"ll_CC.UTF-8 er lokalkoden du vil bruke. For å bruke det tastaturutlegget du "
+"vil, bruk oppstartsvalget <computeroutput>keyb=KB</computeroutput> der KB er "
+"det ønskte tastaturutlegget. Mer informasjon om denne egenskapen <ulink "
+"url='http://wiki.debian.org/DebianLive/l10n'>er tilgjengelig fra "
+"dokumentasjonen for byggeskriptet til live-CDen</ulink>. Her er en liste "
+"over vanlig brukte lokalkoder:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Clients set up to shut down at night will stay up for at least an hour if "
-"they are turned on manually between 16:00 and 07:00."
-msgstr ""
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
+msgstr "<emphasis role='strong'>Spåk (Region)</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Additionally use local NTP clock on the main-server to ensure clients and "
-"server sync clocks also when disconnected from the Internet."
-msgstr ""
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Locale value</emphasis>"
+msgstr "<emphasis role='strong'>Lokalkode</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
-msgstr ""
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
+msgstr "<emphasis role='strong'>Tastaturutlegg</emphasis>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "The home0 partition is mounted nosuid, to increase security."
-msgstr ""
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Bokmål"
+msgstr "Norsk bokmål"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
-"from 144 to 24 MiB."
-msgstr ""
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nb_NO.UTF-8"
+msgstr "nb_NO.UTF-8"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
-msgstr ""
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no"
+msgstr "no"
 
-#. type: Content of: <article><section><title>
-msgid "Copyright and authors"
-msgstr "Opphavsrett og forfattere"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Nynorsk"
+msgstr "Norsk nynorsk"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
-"GPL2 or any later version. Enjoy!"
-msgstr ""
-"Dette dokumentet er skrevet av Holger Levsen, Petter Reinholdtsen, Daniel "
-"Heß, Patrick Winnertz, Knut Yrvin, Ralf Gesellensetter, Ronny Aasen, Morten "
-"Werner Forsbring and José L. Redrejo Rodríguezis med opphavsrett 2007, "
-"utgitt under GPL2 eller senere versjon."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nn_NO.UTF-8"
+msgstr "nn_NO.UTF-8"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
-msgstr ""
-"Hvis du legger til innhold, <emphasis role='strong'>så bare gjør det hvis du "
-"er forfatteren av innholdet og planlegger å gi det ut under samme "
-"betingelser</emphasis>! Så legger du navnet ditt til her og gir det ut under "
-"GPL2 eller senere versjoner."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "German"
+msgstr "Tysk"
 
-#. type: Content of: <article><section><title>
-msgid "Translation copyright and authors"
-msgstr "Opphavsrett for oversettere"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de_DE.UTF-8"
+msgstr "de_DE.UTF-8"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
-msgstr ""
-"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
-"opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de"
+msgstr "de"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
-msgstr ""
-"Den norske bokmålsoversettelsen er gjort av Petter Reinholdtsen og Håvard "
-"Korsvoll med opphavsrett 2007 og utgitt under GPL2 eller senere versjoner."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "French (France)"
+msgstr "Fransk (Frankrike)"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
-"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
-"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
-"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
-msgstr ""
-"Den tyske oversettelsen er gjort av Holger Levsen, Patrick Winnertz, Ralf "
-"Gesellensetter, Roland F. Teichert og Jürgen Leibner med opphavsrett 2007 og "
-"utgitt under GPL2 eller senere versjoner."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr_FR.UTF-8"
+msgstr "fr_FR.UTF-8"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-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."
-msgstr ""
-"Den italienske oversettelsen er gjort av Claudio Carboncini med opphavsrett "
-"2007 og er utgitt under GPL2 eller senere versjoner."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr"
+msgstr "fr"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
-msgstr ""
-"Den italienske oversettelsen er gjort av Claudio Carboncini med opphavsrett "
-"2007 og er utgitt under GPL2 eller senere versjoner."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Greek (Greece)"
+msgstr "Gresk (Hellas)"
 
-#. type: Content of: <article><section><para>
-#, fuzzy
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el_GR.UTF-8"
+msgstr "el_GR.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el"
+msgstr "el"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Japanese"
+msgstr "Japansk"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "ja_JP.UTF-8"
+msgstr "ja_JP.UTF-8"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "jp"
+msgstr "jp"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Northern Sami (Norway)"
+msgstr "Nordsamisk (Norge)"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "se_NO"
+msgstr "se_NO"
+
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no(smi)"
+msgstr "no(smi)"
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
-"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
-"opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
+"En fullstendig liste over lokalkoder er tilgjengelig i <computeroutput>/usr/"
+"share/i18n/SUPPORTED</computeroutput>, men bare UTF-8 lokalkoder er støttet "
+"av liveCD/DVDer. Ikke alle lokaler har oversettelser installert, men navn på "
+"tastaturutlegget finner man i /usr/share/keymaps/i386/."
+
+#. type: Content of: <article><section><section><title>
+msgid "Stuff to know"
+msgstr "Ting man må vite"
 
-#. type: Content of: <article><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+#| msgid "the password for the user is \"user\", root has no passwd set."
+msgid "The password for the user is \"user\"; root has no passwd set."
+msgstr "passordet for user er «user», root har ingen passord."
+
+#. type: Content of: <article><section><section><title>
+msgid "Known issues with the image"
+msgstr "Kjente problemer med CD/DVDen"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "There are no wheezy images yet"
 msgstr ""
-"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
-"opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
 
-#. type: Content of: <article><section><title>
-msgid "Translations of this document"
-msgstr "Oversettelser av dette dokumentet"
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/sad.png"
+msgstr ""
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+msgid ":("
 msgstr ""
-"Ferdigoversatte versjoner av dette dokumentet er ikke tilgjengelig ennå. "
-"Ufullstendige oversettelser for Norsk Bokmål, Spansk og Tysk eksisterer."
 
 #. type: Content of: <article><section><section><title>
-msgid "HowTo translate this document"
-msgstr "Hvordan oversette dette dokumentet"
+msgid "Download"
+msgstr "Last ned"
 
 #. type: Content of: <article><section><section><para>
 #, 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."
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
-"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."
+"Diskbildet er 1,2 GiB og tilgjengelig ved bruk av <ulink url='ftp://ftp."
+"skolelinux.no/cd-etch-live/'>FTP</ulink>, <ulink url='http://ftp.skolelinux."
+"no/cd-etch-live/'>HTTP</ulink> eller rsync fra ftp.skolelinux.org ved cd-"
+"etch-live/"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><title>
+msgid "Appendix C - Features in older releases"
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
 #, 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."
+"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released 2013-0?-??"
 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>]."
+"Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Lenny - utgitt  08.02.2010"
 
 #. type: Content of: <article><section><section><para>
-#, 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):"
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 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):"
 
 #. 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>"
+msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language "
-"code). There are many tools for translating available; we suggest using "
-"<computeroutput>lokalize</computeroutput>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make Nagios configuration more robust and efficient"
 msgstr ""
-"Så redigerer du <computeroutput>documentation/release-manual/release-manual."
-"$CC.po</computeroutput> (der du bytter ut $CC med landskoden din). Det er "
-"mange verktøy tilgjengelig for å oversette, vi foreslår at du bruker "
-"<computeroutput>kbabel</computeroutput>."
 
-#. 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."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Comply with 3.X kernel"
 msgstr ""
-"Så kan du enten melde filen inn direkte til svn (hvis du har rettigheter til "
-"det) eller sender filen til e-postlisten."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Minor updates from the wiki"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Danish translation now complete"
 msgstr ""
-"For å oppdatere din lokale kopi av arkivet, kan du bruke denne kommandoen "
-"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 "debian-edu-config from 1.453 to 1.454"
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations to find information how to create a new PO file for your "
-"language if there isn't one yet, and how to update translations."
+"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
+"#664596"
 msgstr ""
-"Les /usr/share/doc/debian-edu-doc/README.debian-edu-lenny-manual-"
-"translations for å finne informasjon om hvordan lage en ny -po fil for ditt "
-"språk, hvis det ikke finnes allerede, og hvordan oppdatere oversettelser."
 
-#.  <remark>
-#. status ignore</remark> 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Please keep in mind that this manual is still under development, so don't "
-"translate any string which contains \" FIXME\"."
+"Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, 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\"/>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-sync:"
 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\"/>."
 
-#. 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."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't fail if password contains \""
 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."
 
-#. type: Content of: <article><section><section><para>
-msgid "Please report any problems."
-msgstr "Meld fra om eventuelle problemer."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't disclose new password string in syslog"
+msgstr ""
 
-#. type: Content of: <article><section><title>
-#, fuzzy
-#| msgid "Appendix A - The GNU Public License"
-msgid "Appendix A - The GNU General Public License"
-msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-create:"
+msgstr ""
 
-#. 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. ]]"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Invalidate libnss cache before applying changes"
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Multiple failures during mass user import into GOsa²"
 msgstr ""
-"Opphavsrett © 2007 Holger Levsen < <ulink url='mailto:holger at layer-acht."
-"org'>holger at layer-acht.org</ulink> > og andre, se <link linkend=\"CopyRight"
-"\">opphavsrettskapittelet</link> for den fulle lista av personer med "
-"opphavsrett."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+"gosa-netgroups plugin: don't erase entries of attribute type "
+"\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "First user now uses the same Kerberos policy as all other users"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Add Danish web page"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-install from 1.528 to 1.529"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Improve preseeding support and documentation"
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+#, fuzzy
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Lenny - utgitt  08.02.2010"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
+"the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#. type: Content of: <article><section><section><title>
-msgid "GNU GENERAL PUBLIC LICENSE"
-msgstr "GNU GENERAL PUBLIC LICENSE"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "See below for a list of updated software."
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "Version 2, June 1991"
-msgstr "Version 2, June 1991"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Show welcome page to users when they first log in. This default start page "
+"for Iceweasel is fetched from LDAP at installation and boot time for "
+"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
+"Standalone installations."
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+"Gnome option, the LXDE desktop option is only supported by the CD "
+"installation method."
 msgstr ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
 
-#. type: Content of: <article><section><section><title>
-msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Sound with LTSP clients"
+msgid "Speed up LTSP client boot."
+msgstr "Lyd med LTSP-klienter"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Provide a KDE menu entry for changing the password in GOsa²."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</ulink> "
+"chapter of the manual."
 msgstr ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+"Hvis du vil at Windows-maskinene dine skal være klar over hvilke grupper "
+"brukere er i, så må du lage gruppekart i LDAP-manuelt. Dette er forklart mer "
+"detaljert i kapittelet <link linkend=\"NetworkClients\">Veiledning/"
+"Nettverksklienter</link> i denne manualen."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
+"shown to new users."
 msgstr ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"Veiledninger for <link linkend=\"NetworkClients\">nettverksklienter</link>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"Improve handing of removable media on thin clients. Show desktop "
+"notification longer when inserting new media and provide an option to start "
+"dolphin when such media is inserted."
 msgstr ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
+"lenny/installmanual\"> manualen til Debian Installer</ulink>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
+"is set up during installation of the Main Server. This user is up as GOsa² "
+"administrator and is also granted sudo access. The Debian Edu menu "
+"reordering has been enabled as well, by adding the user also to the "
+"<computeroutput>teachers</computeroutput> group."
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For squeeze Debian Edu has switched to <computeroutput>powerdns</"
+#| "computeroutput> as nameserver. It's however possible to stay with "
+#| "<computeroutput>bind9</computeroutput>."
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
+"<computeroutput>cat</computeroutput>.."
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"I Squeeze Debian Edu har vi byttet til <computeroutput>powerdns</"
+"computeroutput> som navneserver. Det er imidlertid mulig å forsette å bruke "
+"<computeroutput>bind9</computeroutput>."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+msgid "New roaming workstation profile for laptops."
+msgstr "arbeidsstasjon"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"Device access for all users is handled by <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"More tests in the test suite, and correct some of the tests that failed "
+"earlier."
 msgstr ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"Make sure to report an error and abort the installation when trying to use "
+"the netinst images without a working Internet connection, instead of "
+"silently installing a broken system."
 msgstr ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Squeeze:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"compatibility with the FHS v2.3 and software developed for version 3.2 of "
+"the LSB."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Linux kernel version 2.6.18"
+msgid "Linux kernel 2.6.32"
+msgstr "Linux kjerneversjon 2.6.18"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 3.5"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "OpenOffice.org 1.1."
+msgid "OpenOffice.org 3.2.1"
+msgstr "OpenOffice.org 1.1."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 9.3"
 msgstr ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 10.04.2"
 msgstr ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.6.10"
 msgstr ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.0"
 msgstr ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.10.4"
 msgstr ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+"Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
+"lenny/installmanual\"> manualen til Debian Installer</ulink>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
+"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"The dynamic DHCP range was extended on the backbone network to around 4k IP "
+"addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Change <computeroutput>$allowPwSet = false ;</computeroutput> to "
+#| "<computeroutput>$allowPwSet = true ;</computeroutput>"
 msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"The DHCP network for 10.0.0.0/8 has been renamed from "
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"Endre <computeroutput>$allowPwSet = false ;</computeroutput> til "
+"<computeroutput>$allowPwSet = true ;</computeroutput>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"There are no pre-defined host entries for client systems in DNS anymore "
+"(staticXX, ..., dhcpYY...)"
 msgstr ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "MIT Kerberos5 used for user authentication, enabled for:"
 msgstr ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "PAM"
 msgstr ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "IMAP"
 msgstr ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "SMTP"
 msgstr ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
-msgstr "<emphasis role='strong'>NO WARRANTY</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"A complete PXE boot environment is setup when installing from the DVD, so "
+"that further installations can be done using PXE network installs only. A "
+"new script pxe-addfirmware is provided to support more hardware models "
+"needing firmware."
 msgstr ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"Remove all hard coded settings on workstations, and configure workstations "
+"and roaming workstations using settings detected from the environment using "
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
-msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
-msgstr "<emphasis role='strong'>NO WARRANTY</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
 
-#. type: Content of: <article><section><title>
-#, fuzzy
-#| msgid "Appendix B - about Debian Edu Live CD/DVDs"
-msgid "Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet"
-msgstr "Vedlegg B - om Debian Edu Live CD/DVDer"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
+"proof-read with corrections was done by a native English linguist."
+msgstr ""
 
-#. type: Content of: <article><section><para>
-#, fuzzy
-msgid "Debian Edu Live CD/DVDs for Squeeze are not available at the moment."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
-"</inlinemediaobject> Debian Edu Live CD/DVDer for Lenny er ikke tilgjengelig "
-"ennå."
 
-#. type: Content of: <article><section><section><title>
-msgid "Features of the Standalone image"
-msgstr "Egenskaper ved frittstående-disken"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to many language tasks, especially French and Danish."
+msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Almost all packages from the Standalone profile"
-msgstr "Nesten alle pakker fra frittståendeprofilen"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to the welcome web page shown at first logins."
+msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "All packages from the laptop task"
-msgstr "Alle pakker fra pakkesamlingen for bærbare"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add new Japanese, Portuguese and Catalan translations of the welcome web "
+"page."
+msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The KDE desktop profile for students/pupils."
-msgstr "KDE skrivebordsprofilen for studenter/elever."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
+msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Activating translations and regional support"
-msgstr "Aktiverer oversettelser og regional støtte"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
+"netinst installation CDs. It is still possible to run Debian Edu on "
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop gtick in the default installation, because it doesn't work on thin "
+"clients (BTS #566335)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid ""
-#| "To activate a specific translation, boot using "
-#| "<computeroutput>locale=ll_CC.UTF-8</computeroutput> as a boot option, "
-#| "where ll_CC.UTF-8 is the locale name you want.  To aciviate a given "
-#| "keyboard layout, use the <computeroutput>keyb=KB</computeroutput> option "
-#| "where KB is the wanted keyboard layout.  More information on this feature "
-#| "<ulink url=\"http://wiki.debian.org/DebianLive/l10n\">is available from "
-#| "the live cd build script documentation</ulink>.  Here is a list of "
-#| "commonly used locale codes:"
+#| msgid "User Administration (lwat)"
+msgid "New administration tool: GOsa²"
+msgstr "Brukeradministrasjon (lwat)"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want.  To activate a given keyboard layout, use the "
-"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
-"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live CD build script "
-"documentation</ulink>.  Here is a list of commonly used locale codes:"
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
-"For å aktivere spesifikke oversettelser, start opp med "
-"<computeroutput>locale=ll_CC.UTF-8</computeroutput> som oppstartsvalg. Der "
-"ll_CC.UTF-8 er lokalkoden du vil bruke. For å bruke det tastaturutlegget du "
-"vil, bruk oppstartsvalget <computeroutput>keyb=KB</computeroutput> der KB er "
-"det ønskte tastaturutlegget. Mer informasjon om denne egenskapen <ulink "
-"url='http://wiki.debian.org/DebianLive/l10n'>er tilgjengelig fra "
-"dokumentasjonen for byggeskriptet til live-CDen</ulink>. Her er en liste "
-"over vanlig brukte lokalkoder:"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
-msgstr "<emphasis role='strong'>Spåk (Region)</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix DHCP host removal. Closes: #650258"
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Locale value</emphasis>"
-msgstr "<emphasis role='strong'>Lokalkode</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Backport user generator unicode character transliteration. Closes: #657086"
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
-msgstr "<emphasis role='strong'>Tastaturutlegg</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Customized GOsa² configuration to better suit the Debian Edu network "
+"architecture."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Bokmål"
-msgstr "Norsk bokmål"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"GOsa² updates DNS and NFS exports immediately when a system is updated in "
+"LDAP, making diskless workstations work right after they are added to the "
+"required netgroup."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nb_NO.UTF-8"
-msgstr "nb_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
+"objects using information gathered by sitesummary, to make it easier to add "
+"new computers to the network."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no"
-msgstr "no"
+#. type: Content of: <article><section><section><section><title>
+msgid "More software changes"
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Nynorsk"
-msgstr "Norsk nynorsk"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nn_NO.UTF-8"
-msgstr "nn_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change default package manager from adept to synaptic, to avoid getting two "
+"graphical package managers installed by default."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "German"
-msgstr "Tysk"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
+"KDE."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de_DE.UTF-8"
-msgstr "de_DE.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change video player setup to install different players in KDE "
+"(dragonplayer), Gnome (totem) and LXDE (totem)."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de"
-msgstr "de"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
+"default KDE installation."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "French (France)"
-msgstr "Fransk (Frankrike)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace network-manager-kde with plasma-widget-networkmanagement in the "
+"standalone KDE profile"
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr_FR.UTF-8"
-msgstr "fr_FR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr"
-msgstr "fr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add cifs-utils to the default installation to ensure SMB mounting can work "
+"in any profile."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Greek (Greece)"
-msgstr "Gresk (Hellas)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
+"and valgrind from the default installation and the DVD to make room for "
+"higher priority packages."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el_GR.UTF-8"
-msgstr "el_GR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
+"authoritive source of host names."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el"
-msgstr "el"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "(The <computeroutput>debian-edu-doc</computeroutput> source package "
+#| "contains this image as a <computeroutput>dia</computeroutput> file.)"
+msgid ""
+"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
+"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
+"installed instead.)"
+msgstr ""
+"(Kildepakken <computeroutput>debian-edu-doc</computeroutput> inneholder "
+"dette bildet som en <computeroutput>dia</computeroutput>-fil.)"
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Japanese"
-msgstr "Japansk"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make the LDAP server handle more clients after increasing the server's file "
+"descriptor limit from 1024 to 32768."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "ja_JP.UTF-8"
-msgstr "ja_JP.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "jp"
-msgstr "jp"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide network blocking / exam mode by default, controlled by LDAP. In "
+"addition to network blocking, changes to the Squid proxy configuration is "
+"needed."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Northern Sami (Norway)"
-msgstr "Nordsamisk (Norge)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable automatic extending of full file systems on the Main Server by "
+"default. This can be disabled in LDAP."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "se_NO"
-msgstr "se_NO"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change SSL certificate name used by the LDAP server and adjust clients to "
+"use the new name to be able to enable certificate checking on clients."
+msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no(smi)"
-msgstr "no(smi)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
+"setup used for DNS."
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
-"the live images. Not all locales have translations installed, though.  The "
-"keyboard layout names can be found in /usr/share/keymaps/i386/."
+"Simplify autofs LDAP rules to make sure they work with extra home directory "
+"partitions exported from the main-server without any changes."
 msgstr ""
-"En fullstendig liste over lokalkoder er tilgjengelig i <computeroutput>/usr/"
-"share/i18n/SUPPORTED</computeroutput>, men bare UTF-8 lokalkoder er støttet "
-"av liveCD/DVDer. Ikke alle lokaler har oversettelser installert, men navn på "
-"tastaturutlegget finner man i /usr/share/keymaps/i386/."
 
-#. type: Content of: <article><section><section><title>
-msgid "Stuff to know"
-msgstr "Ting man må vite"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
+msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "the password for the user is \"user\", root has no passwd set."
-msgid "The password for the user is \"user\"; root has no passwd set."
-msgstr "passordet for user er «user», root har ingen passord."
-
-#. type: Content of: <article><section><section><title>
-msgid "Known issues with the image"
-msgstr "Kjente problemer med CD/DVDen"
+msgid ""
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
+msgstr ""
+"Gnome er lagt til som støttet skrivedbordmiljø, se i<ulink url=\"http://wiki."
+"debian.org/DebianEdu/Documentation/Squeeze/Installation#\"> kapittel om "
+"installasjon.</ulink> for å lære å innstallere med GNOME istedet for KDE som "
+"skrivebordmiljø ."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "There are no squeeze images yet"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Clients set up to shut down at night will stay up for at least an hour if "
+"they are turned on manually between 16:00 and 07:00."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/sad.png"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Additionally use local NTP clock on the main-server to ensure clients and "
+"server sync clocks also when disconnected from the Internet."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-msgid ":("
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Access to Debian repositories is always done via a proxy on the main server "
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Download"
-msgstr "Last ned"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "The home0 partition is mounted nosuid, to increase security."
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
+"from 144 to 24 MiB."
 msgstr ""
-"Diskbildet er 1,2 GiB og tilgjengelig ved bruk av <ulink url='ftp://ftp."
-"skolelinux.no/cd-etch-live/'>FTP</ulink>, <ulink url='http://ftp.skolelinux."
-"no/cd-etch-live/'>HTTP</ulink> eller rsync fra ftp.skolelinux.org ved cd-"
-"etch-live/"
 
-#. type: Content of: <article><section><title>
-msgid "Appendix C - Features in older releases"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New tool notify-local-users to send desktop notification to all logged in "
+"users on a machine.  Useful for thin client servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -11803,6 +11621,149 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#~ msgid "[attachment:welcome_to_tjener.png]"
+#~ msgstr "[attachment:welcome_to_tjener.png]"
+
+#~ msgid "Debian Edu login"
+#~ msgstr "Skolelinux innlogging"
+
+#, fuzzy
+#~| msgid "Installation options explained"
+#~ msgid "Installer advanced options screen 1"
+#~ msgstr "Installasjonsvalg i detalj"
+
+#, fuzzy
+#~| msgid "Installation options explained"
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Installasjonsvalg i detalj"
+
+#~ msgid "A note on some RAID controllers"
+#~ msgstr "En kommentar om RAID-kontrollere"
+
+#, fuzzy
+#~| msgid ""
+#~| "When using a USB drive to add missing firmware during install, with some "
+#~| "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
+#~| "installation results in a GRUB-error. A workaround for this problem is "
+#~| "to remove the USB drive after the firmware is loaded, and preferably "
+#~| "before partitioning starts."
+#~ msgid ""
+#~ "When using a USB drive to add missing firmware during install, with some "
+#~ "RAID-controllers GRUB is installed to the USB drive. So a reboot after "
+#~ "installation results in a GRUB error. A workaround for this problem is to "
+#~ "remove the USB drive after the firmware is loaded, and preferably before "
+#~ "partitioning starts."
+#~ msgstr ""
+#~ "Når man må bruke USB-pen for å legge inn manglende drivere under "
+#~ "installasjonen, så kan noen RAID-kontrollere feile og installere GRUB på "
+#~ "USB-pennen. For å unngå dette, så kan man nappe ut USB-pennen etter at "
+#~ "driver er laster, og helst i god tid før partisjonering av disker "
+#~ "starter.  "
+
+#, fuzzy
+#~ msgid ""
+#~ "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#~ "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#~ "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+#~ msgstr ""
+#~ "Mer informasjon om dettefinnes i <ulink url=\"http://bugs.skolelinux.org/"
+#~ "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> og i Debian bug "
+#~ "<ulink url=\"http://bugs.debian.org/516280\">516280</ulink>."
+
+#, fuzzy
+#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+#~ "edu-]squeeze-07-partitioning.png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+#~ "edu-]squeeze-07-partitioning.png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+#~ "edituser_squeeze.png\"/></imageobject>"
+
+#, fuzzy
+#~| msgid "Set passwords"
+#~ msgid "12-Set_up_users_and_passwords.png"
+#~ msgstr "Sett passord"
+
+#, fuzzy
+#~| msgid "Set passwords"
+#~ msgid "12a-Set_up_users_and_passwords.png"
+#~ msgstr "Sett passord"
+
+#, fuzzy
+#~| msgid "Set passwords"
+#~ msgid "12b-Set_up_users_and_passwords.png"
+#~ msgstr "Sett passord"
+
+#, fuzzy
+#~| msgid "Set passwords"
+#~ msgid "12c-Set_up_users_and_passwords.png"
+#~ msgstr "Sett passord"
+
+#, fuzzy
+#~ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+#~ "arch.]png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+#~ "started.png\"/></imageobject>"
+
+#, fuzzy
+#~| msgid "Requirements for a network setup"
+#~ msgid "Debian Edu desktop"
+#~ msgstr "Krav for nettverksoppsett"
+
+#, fuzzy
+#~| msgid "Adding users"
+#~ msgid "Editing user data"
+#~ msgstr "Legge til brukere"
+
+#, fuzzy
+#~| msgid "Set passwords"
+#~ msgid "Set user password"
+#~ msgstr "Sett passord"
+
+#, fuzzy
+#~| msgid "Maintainance"
+#~ msgid "slbackup-php Maintenance"
+#~ msgstr "Vedlikehold"
+
+#, fuzzy
+#~ msgid ""
+#~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
+#~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
+#~ "computeroutput> which was removed from Debian), all files in "
+#~ "<computeroutput>/etc/</computeroutput> are tracked using <ulink url="
+#~ "\"http://www.git-scm.com/\">git</ulink> as a version control system."
+#~ msgstr ""
+#~ "Med introduksjonen av skriptet <computeroutput>debian-edu-etc-svk</"
+#~ "computeroutput> i Debian Edu, vil alle filer i <computeroutput>/etc/</"
+#~ "computeroutput> bli versjonsporet ved hjelp av svk som et "
+#~ "versjonskontrollsystem. Dette gjør det mulig å se når en fil blir lagt "
+#~ "til, endret eller fjernet, i tillegg til hva som er endret hvis filen er "
+#~ "en tekstfil. Arkivet for svk er lagret i <computeroutput>~root/.svk/</"
+#~ "computeroutput>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Changes for Debian Edu 7.0.0+r0 Codename \"Wheezy\" *UN*released as of "
+#~ "2013-0?-??"
+#~ msgstr ""
+#~ "Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Squeeze - utgitt  "
+#~ "08.02.2010"
+
 #, fuzzy
 #~| msgid ""
 #~| "1. Create a user with membership in the \"admins\" group (if not already "
@@ -11937,14 +11898,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 +12643,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 +12651,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 +12756,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 +12949,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 +13552,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 +13638,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 +13653,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 +13699,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 +14079,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 +14229,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 +14314,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 +14534,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 +14552,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 +14564,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 +14575,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 +14588,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 +14607,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 +14769,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 +14818,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 +14832,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 "
@@ -14934,14 +14877,14 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "stop slapd. <computeroutput> invoke-rc.d slapd stop </computeroutput>"
-#~ msgstr "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>git pull</computeroutput>"
 
 #~ msgid "check syslog or ps output that it have truly stopped."
 #~ msgstr "sjekk syslog eller ps kommando at den virkelig har stoppet. "
 
 #, fuzzy
 #~ msgid "run <computeroutput> sudo -u openldap slapindex </computeroutput>"
-#~ msgstr "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>git pull</computeroutput>"
 
 #, fuzzy
 #~ msgid ""
@@ -14958,7 +14901,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "If starting <computeroutput>dhcp3-server</computeroutput> gives:"
-#~ msgstr "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>git pull</computeroutput>"
 
 #~ msgid ""
 #~ "tjener:~# invoke-rc.d dhcp3-server start\n"
@@ -14984,7 +14927,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 +14952,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 +14963,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 +14980,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 +14993,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:"
@@ -15116,7 +15059,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Start <computeroutput>dhcp3-server</computeroutput>."
-#~ msgstr "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>git pull</computeroutput>"
 
 #~ msgid ""
 #~ "tjener:~# cd /usr/share/doc/dhcp3-server-ldap/\n"
@@ -15157,7 +15100,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 +15140,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 +15168,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 +15197,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 +15271,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 +15293,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 +15302,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 +15319,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 +15328,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 +15353,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,15 +15378,15 @@ 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>:"
-#~ msgstr "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>git pull</computeroutput>"
 
 #~ msgid ""
 #~ "Uncomment the line <computeroutput>include /etc/ldap/schema/dnsdomain2."
@@ -15464,10 +15405,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 +15441,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 +15492,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 +15527,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 +15550,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 +15559,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 +15571,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 +15679,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 +15741,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 +15756,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 +15963,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 +15994,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 +16133,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 +16154,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 +16174,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 +16194,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 +16208,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 +16219,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 +16255,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,25 +16288,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 ""
-#~ "If you want your Windows computers to be aware of what groups users are "
-#~ "in, you must create the groupmaps in LDAP manually, this is explained in "
-#~ "more detail in the <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#~ "Documentation/Lenny/HowTo/NetworkClients#\">HowTo/NetworkClients</ulink> "
-#~ "chapter of this manual."
-#~ msgstr ""
-#~ "Hvis du vil at Windows-maskinene dine skal være klar over hvilke grupper "
-#~ "brukere er i, så må du lage gruppekart i LDAP-manuelt. Dette er forklart "
-#~ "mer detaljert i kapittelet <link linkend=\"NetworkClients\">Veiledning/"
-#~ "Nettverksklienter</link> i denne manualen."
 
 #, fuzzy
 #~ msgid ""
@@ -16444,10 +16368,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 +16482,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 +16543,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 +16556,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 +16603,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 +16694,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 +16713,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 +16769,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 +16779,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 +16855,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 +16864,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 +16876,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 +16883,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-wheezy/debian-edu-wheezy-manual.pot
similarity index 92%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 81b56c1..b51a5d9 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-14 14:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,29 +21,27 @@ msgid "en"
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr ""
-
-#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu login"
+#. type: Content of: <article><section><para>
+msgid ""
+"[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot here "
+"once we have new artwork"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Squeeze 6.0.6+r1 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze\"/> is a wiki and updated frequently."
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -135,7 +133,7 @@ msgid "Network"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Debian_Edu_Network_Squeeze.png"
+msgid "./images/Debian_Edu_Network_Wheezy.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -988,8 +986,8 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes for "
-"Debian Squeeze</ulink> before you start installing a system for production "
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 
@@ -1014,14 +1012,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Even more information about the Debian Squeeze release is available in its "
-"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
+"Even more information about the Debian Wheezy release is available in its "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Download the installation media for Debian Edu 6.0.6+r1 Codename \"Squeeze\""
+"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1035,22 +1033,28 @@ msgid ""
 "or rsync via:"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"FIXME: these download URLs need to be adapted for wheezy still... They "
+"currently don't work"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD."
-"iso\">debian-edu-6.0.6+r1-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
+"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1065,20 +1069,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-CD."
-"iso\">debian-edu-6.0.6+r1-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-CD."
-"iso\">debian-edu-6.0.6+r1-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
+"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"CD.iso debian-edu-6.0.6+r1-CD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1091,20 +1095,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-"
-"source-DVD.iso\">debian-edu-6.0.6+r1-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-"
-"source-DVD.iso\">debian-edu-6.0.6+r1-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-"
-"source-DVD.iso debian-edu-6.0.6+r1-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
+"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -1143,12 +1147,8 @@ msgstr ""
 msgid "Select type of installation"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:01-Installer_boot_menu.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1187,12 +1187,8 @@ msgid ""
 "installer"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_a.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1235,12 +1231,8 @@ msgid ""
 "preseed file."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_b.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_advanced_options_b.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1281,12 +1273,8 @@ msgid ""
 "needs a preseed file."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer help screen"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "[attachment:Installer_help.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1369,7 +1357,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/Requirements\">system requirements</ulink> and make sure you have at "
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
@@ -1539,9 +1527,9 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"deb http://ftp.debian.org/debian/ squeeze main \n"
-"deb http://security.debian.org/ squeeze/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux squeeze local]]"
+"deb http://ftp.debian.org/debian/ wheezy main \n"
+"deb http://security.debian.org/ wheezy/updates main \n"
+"deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -1562,7 +1550,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny."
+msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -1594,26 +1582,6 @@ msgid "Minimal: 12 of 83 MiB downloaded."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on some RAID controllers"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"When using a USB drive to add missing firmware during install, with some "
-"RAID-controllers GRUB is installed to the USB drive. So a reboot after "
-"installation results in a GRUB error. A workaround for this problem is to "
-"remove the USB drive after the firmware is loaded, and preferably before "
-"partitioning starts."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
 msgstr ""
 
@@ -1694,12 +1662,8 @@ msgid ""
 "Server</emphasis> profile only:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/pxe-tjener.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "pxe-tjener.png"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:pxe-tjener.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1709,12 +1673,8 @@ msgid ""
 "emphasis> profiles:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1748,7 +1708,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>
@@ -1767,7 +1727,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
-"releases/squeeze/installmanual\">manual of the Debian Installer</ulink>."
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -1833,240 +1793,124 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/02-select_a_language.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "02-select_a_language.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/03-select_your_location.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "03-select_your_location.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/04-Configure_the_keyboard.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "04-Configure_the_keyboard.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "05-Detect_and_mount_CD-ROM.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "06-Load_installer_components_from_CD.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/07-Detect_network_hardware.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "07-Detect_network_hardware.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "08-Choose_Debian_Edu_profile.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "11-Participate_in_the_package_usage_survey.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12a-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12b-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12b-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/12c-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "12c-Set_up_users_and_passwords.png"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/13-Install+the+base+system.png"
+#. type: Content of: <article><section><section><para>
+msgid "FIXME: these screenshots need to be redone once we have wheezy artwork"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "13-Install the base system.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:02-select_a_language.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:03-select_your_location.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "14-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:04-Configure_the_keyboard.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:05-Detect_and_mount_CD-ROM.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "17-Select_and_install_software.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:06-Load_installer_components_from_CD.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/18-Build+LTSP+chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:07-Detect_network_hardware.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "18-Build LTSP chroot.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "20-Finish_the_Installation.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12-Set_up_users_and_passwords.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12a-Set_up_users_and_passwords.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "21-Finish_the_Installation-Installation_complete.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12b-Set_up_users_and_passwords.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:12c-Set_up_users_and_passwords.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "22-Tjener_GRUB_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:13-Install the base system.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:14-Select_and_install_software.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "23-Tjener-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:17-Select_and_install_software.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:18-Build LTSP chroot.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:20-Finish_the_Installation.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "26-Tjener-KDE_Desktop_Browser.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:23-Tjener-KDM_Login.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:24-Tjener-KDE_Start.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "29-Diskless-WS-KDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:27-Tjener-KDE_Desktop.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "30-ThinClient-LDM_Login.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:30-ThinClient-LDM_Login.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -2115,12 +1959,8 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/getting-started-desktop.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu desktop"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:getting-started-desktop.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2179,7 +2019,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"If you are using a new Debian Edu Squeeze machine, the site certificate will "
+"If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
 
@@ -2200,12 +2040,8 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa2_overview.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² overview page after login as the first user"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:gosa2_overview.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2340,43 +2176,12 @@ msgid ""
 "within your network."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">Please note:</emphasis> If Squeeze/r0 was used to "
-"install the main server, all user passwords exept that one for the first "
-"user will expire in only 2 days.  To fix this, please execute the following "
-"script in a terminal.  This script is included in r1."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-"  #\n"
-"  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0\n"
-"  #\n"
-"  # Fix password expiring after 2 days (#664596) incorrectly introduced\n"
-"  # in Debian Edu Squeeze up to r0; for new users the password will\n"
-"  # never expire. For existing users this will be the case after they've\n"
-"  # changed their password. Give old users the chance to change the\n"
-"  # password, exclude not affected accounts: templates and first user.\n"
-"  #\n"
-"  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do\n"
-"    kadmin.local -q \"modprinc -pwexpire 7000days $i\"\n"
-"  done\n"
-"  kadmin.local -q \"modpol -maxlife 0secs users\"]]"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><title>
 msgid "Search, modify and delete users"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/filterbox.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Filterbox"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:filterbox.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2404,12 +2209,8 @@ msgid ""
 "belongs to."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/edit_user.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Editing user data"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:edit_user.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -2450,12 +2251,8 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/change_password_administratively.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Set user password"
+#. type: Content of: <article><section><section><section><para>
+msgid "[attachment:change_password_administratively.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2545,16 +2342,12 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/create_group.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "create group"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:create_group.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/list_groups.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:list_groups.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2599,7 +2392,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>
@@ -2660,46 +2453,30 @@ msgstr ""
 #, no-wrap
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
 "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
 "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
 "\n"
 "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: █]]"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_list.png"
+"enter password: █"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "GOsa² systems listing"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_host_details.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Host details"
-msgstr ""
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_edit_host.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_list.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Modify host"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_host_details.png]"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/gosa_systems_add_netgroup.png"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_edit_host.png]"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Add netgroup"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:gosa_systems_add_netgroup.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3036,7 +2813,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>
@@ -3058,12 +2835,8 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/slbackup-php_maintenance.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "slbackup-php Maintenance"
+#. type: Content of: <article><section><section><para>
+msgid "[attachment:slbackup-php_maintenance.png]"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -3135,7 +2908,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>
@@ -3354,12 +3127,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-msgid "Upgrades from Debian Edu Lenny"
+msgid "Upgrades from Debian Edu Squeeze"
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Lenny in a test "
+"Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
 
@@ -3370,7 +3143,7 @@ msgstr ""
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"lenny\" with \"squeeze\"."
+"occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
@@ -3391,6 +3164,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
 "accounts, passwords, network settings, services and machines are treated is "
 "quite different now. So LDAP has to be rebuild from scratch. There's a "
@@ -3406,7 +3184,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will automatically support both thin-clients and diskless workstations."
+"will still support both thin-clients and diskless workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3428,17 +3206,17 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 msgid ""
-"Upgrades from older Debian Edu / Skolelinux installations (before Lenny)"
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"To upgrade from any older release, you will need to upgrade to the Lenny-"
+"To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny#\">Manual for Debian Edu Lenny</"
-"ulink> about how to upgrade to Lenny from the previous release, Etch, and "
-"the Etch manual covers the one before that!"
+"debian.org/DebianEdu/Documentation/Squeeze#\">Manual for Debian Edu Squeeze</"
+"ulink> about how to upgrade to Squeeze from the previous release, Lenny, and "
+"the Lenny manual covers the one before that! (Etch was it's name.)"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -3535,7 +3313,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 +3328,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 +3337,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 +3347,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 +3425,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 +3453,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 +3472,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>
@@ -3784,8 +3562,8 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"echo \"deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-"apt-get update]]"
+"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3802,8 +3580,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to upgrade from one version to another (for example from Squeeze "
-"6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical "
+"If you want to upgrade from one version to another (for example from Wheezy "
+"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
 "media, follow these steps:"
 msgstr ""
 
@@ -3816,7 +3594,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 +3623,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 +3689,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 +3745,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 +3788,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 +3811,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 +3896,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 +3912,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 +4030,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 +4056,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 +4096,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>
@@ -4339,9 +4117,9 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
-"apt-get update]]"
+"apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4425,7 +4203,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 +4268,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 +4313,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 +4344,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 +4355,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 +4372,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 +4392,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 +4440,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 +4534,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 +4551,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 +4580,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 +4659,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 +4686,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 +4766,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 +4787,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 +4808,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 +4859,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "X -query ltspserverXX]]"
+msgid "X -query ltspserverXX"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5090,7 +4868,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 +4885,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 +4900,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 +4909,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>
@@ -5157,7 +4935,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
-"<link linkend=\"Samba\">Debian Edu Squeeze Samba Howto</link>."
+"<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5188,7 +4966,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 +5333,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
-"logon home = \"\"]]"
+"logon home = \"\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5640,7 +5418,7 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-"
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
 "style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
@@ -6034,7 +5812,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 +5831,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 +5840,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 +5867,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 +5876,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 +5891,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>
@@ -6314,8 +6092,8 @@ msgstr ""
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Squeeze/\"/> and you can contribute easily. Note: a user account is needed "
-"to edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 
@@ -6425,1393 +6203,1487 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-msgid "New features in Debian Edu Squeeze"
+msgid "New features in Debian Edu Wheezy"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"FIXME: this paragraph is work in progress and not yet to be translated. "
+"Please help writing it instead."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released as of "
-"2013-0?-??"
+"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "sitesummary was updated from 0.1.3 to 0.1.8"
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Make Nagios configuration more robust and efficient"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
+"installation, in the login screen and as desktop wallpaper."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Comply with 3.X kernel"
+#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: hopefully. h01ger is one it to ask gismo."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
+#. type: Content of: <article><section><section><section><title>
+msgid "Installation changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Minor updates from the wiki"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Danish translation now complete"
+#. type: Content of: <article><section><section><section><title>
+msgid "Software updates"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-config from 1.453 to 1.454"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Wheezy:"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
-"#664596"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 3.2.x"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Handle '#' characters in the root or first users password. Closes: #664976"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-sync:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 10 ESR"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't fail if password contains \""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LibreOffice 3.5.4"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Don't disclose new password string in syslog"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 12.01"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fixes for gosa-create:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 12.04"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Invalidate libnss cache before applying changes"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.8.2"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Multiple failures during mass user import into GOsa²"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.1"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.11.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"gosa-netgroups plugin: don't erase entries of attribute type "
-"\"memberNisNetgroup\". Closes: #687256"
+"Debian Wheezy includes over 10,000 new packages available for installation, "
+"including the Chromium browser"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "First user now uses the same Kerberos policy as all other users"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Add Danish web page"
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-install from 1.528 to 1.529"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "FIXME: to be documented, if any"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Improve preseeding support and documentation"
+#. type: Content of: <article><section><section><section><title>
+msgid "Documentation and translation updates"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in FIXME languages."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
+"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
+msgid "Regressions"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Updated artwork and new Debian Edu / Skolelinux logo, visible during "
-"installation, in the login screen and as desktop wallpaper."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <link linkend=\"GettingStarted\">Getting started chapter</link> of the "
-"manual for more information on GOsa²."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "See below for a list of updated software."
+#. type: Content of: <article><section><title>
+msgid "Copyright and authors"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Show welcome page to users when they first log in. This default start page "
-"for Iceweasel is fetched from LDAP at installation and boot time for "
-"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
-"Standalone installations."
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
+"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
+"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
+"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
+"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
+"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
+"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
+"GPL2 or any later version. Enjoy!"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
-"installation method."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the GPL2 or later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Speed up LTSP client boot."
+#. type: Content of: <article><section><title>
+msgid "Translation copyright and authors"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Provide a KDE menu entry for changing the password in GOsa²."
+#. type: Content of: <article><section><para>
+msgid ""
+"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
+"released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"For more information on how to change passwords (including expired passwords "
-"at the KDM/GDM login prompt), please see the <link linkend=\"Users\">HowTos "
-"for users</link> chapter of the manual."
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
+"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
+"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
-"shown to new users."
+"The German translation is copyrighted by Holger Levsen (2007), Patrick "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
+"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
+"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
+"and is released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"All LTSP servers are also <link linkend=\"NetworkClients--"
-"Remote_Desktop_Service\">RDP servers</link> by default."
+"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"Improve handing of removable media on thin clients. Show desktop "
-"notification longer when inserting new media and provide an option to start "
-"dolphin when such media is inserted."
+"The French translation is copyrighted by Christophe Masson (2008), Olivier "
+"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
+"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
+"2010, 2012) and is released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Installation changes"
+#. type: Content of: <article><section><para>
+msgid ""
+"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+"(2009) and is released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
-"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
-"for more details."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+"released under the GPL2 or any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
-"is set up during installation of the Main Server. This user is up as GOsa² "
-"administrator and is also granted sudo access. The Debian Edu menu "
-"reordering has been enabled as well, by adding the user also to the "
-"<computeroutput>teachers</computeroutput> group."
+#. type: Content of: <article><section><title>
+msgid "Translations of this document"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><para>
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"Versions of this document fully translated into German, Italian, French and "
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
+"\">take a look here</ulink> for your own language."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New roaming workstation profile for laptops."
+#. type: Content of: <article><section><section><title>
+msgid "HowTo translate this document"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Device access for all users is handled by <ulink url=\"http://wiki.debian."
-"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-"needed to get access to devices."
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-"
+"manual-translations</computeroutput>. The 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."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A warning will be issued when installing on too small disks for the selected "
-"profile."
+"To commit your translations you need to be a member of the Alioth project "
+"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
+"check out some files from from 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 ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/ "
-"but no seperate /usr anymore."
+"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
+"anonymously with the following command (you need to have the "
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"More tests in the test suite, and correct some of the tests that failed "
-"earlier."
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Make sure to report an error and abort the installation when trying to use "
-"the netinst images without a working Internet connection, instead of "
-"silently installing a broken system."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Software updates"
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
+"<computeroutput>lokalize</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Squeeze:"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"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><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"compatibility with the FHS v2.3 and software developed for version 3.2 of "
-"the LSB."
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Linux kernel 2.6.32"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 3.5"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<computeroutput>git pull</computeroutput>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "OpenOffice.org 3.2.1"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 9.3"
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Music creator Rosegarden 10.04.2"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Image editor Gimp 2.6.10"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If you are new to 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><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual universe Celestia 1.6.0"
+#. type: Content of: <article><section><section><para>
+msgid "Please report any problems."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Virtual stargazer Stellarium 0.10.4"
+#. type: Content of: <article><section><title>
+msgid "Appendix A - The GNU General Public License"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation, "
-"including the browser Chromium"
+#. type: CDATA
+#, no-wrap
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink url="
-"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
-"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
-"installmanual\">installation manual</ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
-"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The dynamic DHCP range was extended on the backbone network to around 4k IP "
-"addresses, and around 200 IP addresses for the thin client network."
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
-"computeroutput>"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"There are no pre-defined host entries for client systems in DNS anymore "
-"(staticXX, ..., dhcpYY...)"
+#. type: Content of: <article><section><section><title>
+msgid "GNU GENERAL PUBLIC LICENSE"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "MIT Kerberos5 used for user authentication, enabled for:"
+#. type: Content of: <article><section><section><para>
+msgid "Version 2, June 1991"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "PAM"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
+"distribute verbatim copies of this license document, but changing it is not "
+"allowed."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "IMAP"
+#. type: Content of: <article><section><section><title>
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "SMTP"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
+"or other work which contains a notice placed by the copyright holder saying "
+"it may be distributed under the terms of this General Public License.  The "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" means either the Program or any derivative work under "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
+"language.  (Hereinafter, translation is included without limitation in the "
+"term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the <computeroutput>workstation</"
-"computeroutput> netgroup to be able to mount the home directories"
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"A complete PXE boot environment is setup when installing from the DVD, so "
-"that further installations can be done using PXE network installs only. A "
-"new script pxe-addfirmware is provided to support more hardware models "
-"needing firmware."
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Remove all hard coded settings on workstations, and configure workstations "
-"and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
-"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
-"information on the changes</ulink>."
+"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
+"of the Program or any portion of it, thus forming a work based on the "
+"Program, and copy and distribute such modifications or work under the terms "
+"of Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Documentation and translation updates"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
+"any change."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
+"distribute or publish, that in whole or in part contains or is derived from "
+"the Program or any part thereof, to be licensed as a whole at no charge to "
+"all third parties under the terms of this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
-"proof-read with corrections was done by a native English linguist."
+"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
+"reads commands interactively when run, you must cause it, when started "
+"running for such interactive use in the most ordinary way, to print or "
+"display an announcement including an appropriate copyright notice and a "
+"notice that there is no warranty (or else, saying that you provide a "
+"warranty) and that users may redistribute the program under these "
+"conditions, and telling the user how to view a copy of this License.  "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
+"print an announcement.)"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
-"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
-"Spanish."
+"These requirements apply to the modified work as a whole.  If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works.  But when you distribute the same "
+"sections as part of a whole which is a work based on the Program, the "
+"distribution of the whole must be on the terms of this License, whose "
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to many language tasks, especially French and Danish."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Improvements to the welcome web page shown at first logins."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add new Japanese, Portuguese and Catalan translations of the welcome web "
-"page."
+"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
+"corresponding machine-readable source code, which must be distributed under "
+"the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
-"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
-"installing a KDE environemnt."
+"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
+"valid for at least three years, to give any third party, for a charge no "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
+"under the terms of Sections 1 and 2 above on a medium customarily used for "
+"software interchange; or,"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
-"netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less automated."
+"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
+"received the program in object code or executable form with such an offer, "
+"in accord with Subsection b above.)"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop gtick in the default installation, because it doesn't work on thin "
-"clients (BTS #566335)."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "New administration tool: GOsa²"
+"The source code for a work means the preferred form of the work for making "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
-"with:"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Fix DHCP host removal. Closes: #650258"
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Backport user generator unicode character transliteration. Closes: #657086"
+"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
+"sublicense, or distribute the Program except as expressly provided under "
+"this License.  Any attempt otherwise to copy, modify, sublicense or "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
+"from you under this License will not have their licenses terminated so long "
+"as such parties remain in full compliance."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Customized GOsa² configuration to better suit the Debian Edu network "
-"architecture."
+"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it.  However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works.  "
+"These actions are prohibited by law if you do not accept this License.  "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"GOsa² updates DNS and NFS exports immediately when a system is updated in "
-"LDAP, making diskless workstations work right after they are added to the "
-"required netgroup."
+"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
+"Program (or any work based on the Program), the recipient automatically "
+"receives a license from the original licensor to copy, distribute or modify "
+"the Program subject to these terms and conditions.  You may not impose any "
+"further restrictions on the recipients' exercise of the rights granted "
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
-"objects using information gathered by sitesummary, to make it easier to add "
-"new computers to the network."
+"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all.  For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "More software changes"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices.  Many people have made generous contributions to the wide range "
+"of software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change default package manager from adept to synaptic, to avoid getting two "
-"graphical package managers installed by default."
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
-"KDE."
+"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
+"the Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded.  In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"to time.  Such new versions will be similar in spirit to the present "
+"version, but may differ in detail to address new problems or concerns."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
-"default KDE installation."
+"Each version is given a distinguishing version number.  If the Program "
+"specifies a version number of this License which applies to it and \"any "
+"later version\", you have the option of following the terms and conditions "
+"either of that version or of any later version published by the Free "
+"Software Foundation.  If the Program does not specify a version number of "
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Replace network-manager-kde with plasma-widget-networkmanagement in the "
-"standalone KDE profile"
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this.  Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Add cifs-utils to the default installation to ensure SMB mounting can work "
-"in any profile."
+"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
+"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
+"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
-"and valgrind from the default installation and the DVD to make room for "
-"higher priority packages."
+"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
-"authoritive source of host names."
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
-"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
-"installed instead.)"
+#. type: Content of: <article><section><title>
+msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#. type: Content of: <article><section><para>
+msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Make the LDAP server handle more clients after increasing the server's file "
-"descriptor limit from 1024 to 32768."
+#. type: Content of: <article><section><section><title>
+msgid "Features of the Standalone image"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
-"flush all CUPS queues every night. Both can be disabled in LDAP."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Almost all packages from the Standalone profile"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Provide network blocking / exam mode by default, controlled by LDAP. In "
-"addition to network blocking, changes to the Squid proxy configuration is "
-"needed."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "All packages from the laptop task"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Enable automatic extending of full file systems on the Main Server by "
-"default. This can be disabled in LDAP."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The KDE desktop profile for students/pupils."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change SSL certificate name used by the LDAP server and adjust clients to "
-"use the new name to be able to enable certificate checking on clients."
+#. type: Content of: <article><section><section><title>
+msgid "Activating translations and regional support"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
-"setup used for DNS."
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Simplify autofs LDAP rules to make sure they work with extra home directory "
-"partitions exported from the main-server without any changes."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Make backup system more robust in handling LDAP database dump and restart."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Root logins are denied for both KDM and GDM - see above and <link linkend="
-"\"GettingStarted\">Getting started</link> for details."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Bokmål"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Clients set up to shut down at night will stay up for at least an hour if "
-"they are turned on manually between 16:00 and 07:00."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nb_NO.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Additionally use local NTP clock on the main-server to ensure clients and "
-"server sync clocks also when disconnected from the Internet."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink url=\"http://lists."
-"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Norwegian Nynorsk"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "The home0 partition is mounted nosuid, to increase security."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "nn_NO.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
-"from 144 to 24 MiB."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "German"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de_DE.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Copyright and authors"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "de"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012) and Bernhard Hammes (2012) and is released under the "
-"GPL2 or any later version. Enjoy!"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "French (France)"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr_FR.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Translation copyright and authors"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "fr"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Greek (Greece)"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el_GR.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
-"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
-"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
-"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "el"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
-"version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Japanese"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "ja_JP.UTF-8"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "jp"
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Northern Sami (Norway)"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Translations of this document"
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "se_NO"
 msgstr ""
 
-#. type: Content of: <article><section><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "no(smi)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
 msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "HowTo translate this document"
+msgid "Stuff to know"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"As in many free software projects, translations of this document are kept in "
-"PO files. More information about the process can be found in "
-"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
-"contains this file too. Take a look there and at the <ulink url=\"http://"
-"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-"specific conventions</ulink> if you want to help translating this document."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "The password for the user is \"user\"; root has no passwd set."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
-"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
-"\">instructions on how to submit bugs</ulink> here."
+#. type: Content of: <article><section><section><title>
+msgid "Known issues with the image"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "There are no wheezy images yet"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/sad.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-"
-"edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language "
-"code). There are many tools for translating available; we suggest using "
-"<computeroutput>lokalize</computeroutput>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+msgid ":("
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+#. type: Content of: <article><section><section><title>
+msgid "Download"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc</computeroutput> directory:"
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
+#. type: Content of: <article><section><title>
+msgid "Appendix C - Features in older releases"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><title>
 msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-"
-"translations to find information how to create a new PO file for your "
-"language if there isn't one yet, and how to update translations."
+"Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released 2013-0?-??"
 msgstr ""
 
-#.  <remark>
-#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Please keep in mind that this manual is still under development, so don't "
-"translate any string which contains \" FIXME\"."
+"FIXME: this paragraph is work in progress and will be copied from DebianEdu/"
+"Documentation/Squeeze/Features once its ready"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Make Nagios configuration more robust and efficient"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "Please report any problems."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Comply with 3.X kernel"
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Appendix A - The GNU General Public License"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0"
 msgstr ""
 
-#. type: CDATA
-#, no-wrap
-msgid "Note to translators: there is no need to translate the GPL license text. ]]"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Minor updates from the wiki"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
-"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
-"copyright owners."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Danish translation now complete"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-config from 1.453 to 1.454"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"Correct Kerberos user policy: don't expire password after 2 days. Closes: "
+"#664596"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "GNU GENERAL PUBLIC LICENSE"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-sync:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "Version 2, June 1991"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't fail if password contains \""
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Don't disclose new password string in syslog"
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fixes for gosa-create:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
-"or other work which contains a notice placed by the copyright holder saying "
-"it may be distributed under the terms of this General Public License.  The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language.  (Hereinafter, translation is included without limitation in the "
-"term \"modification\".)  Each licensee is addressed as \"you\"."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Invalidate libnss cache before applying changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope.  The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Multiple failures during mass user import into GOsa²"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
+"gosa-netgroups plugin: don't erase entries of attribute type "
+"\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "First user now uses the same Kerberos policy as all other users"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Add Danish web page"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "debian-edu-install from 1.528 to 1.529"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Improve preseeding support and documentation"
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
 msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+"Replace LWAT with GOsa² as the LDAP administration interface. See below and "
+"the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "See below for a list of updated software."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
-"carry prominent notices stating that you changed the files and the date of "
-"any change."
+"Show welcome page to users when they first log in. This default start page "
+"for Iceweasel is fetched from LDAP at installation and boot time for "
+"networked profiles. Set to <ulink url=\"http://www.skolelinux.org/\"/> for "
+"Standalone installations."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+"Gnome option, the LXDE desktop option is only supported by the CD "
+"installation method."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Speed up LTSP client boot."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Provide a KDE menu entry for changing the password in GOsa²."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</ulink> "
+"chapter of the manual."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"These requirements apply to the modified work as a whole.  If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works.  But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+"Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
+"shown to new users."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+"Improve handing of removable media on thin clients. Show desktop "
+"notification longer when inserting new media and provide an option to start "
+"dolphin when such media is inserted."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
+"is set up during installation of the Main Server. This user is up as GOsa² "
+"administrator and is also granted sudo access. The Debian Edu menu "
+"reordering has been enabled as well, by adding the user also to the "
+"<computeroutput>teachers</computeroutput> group."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
+"<computeroutput>cat</computeroutput>.."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New roaming workstation profile for laptops."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+"Device access for all users is handled by <ulink url=\"http://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+"More tests in the test suite, and correct some of the tests that failed "
+"earlier."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
-"License, since you have not signed it.  However, nothing else grants you "
-"permission to modify or distribute the Program or its derivative works.  "
-"These actions are prohibited by law if you do not accept this License.  "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+"Make sure to report an error and abort the installation when trying to use "
+"the netinst images without a working Internet connection, instead of "
+"silently installing a broken system."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Everything which is new in Debian Squeeze:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions.  You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+"compatibility with the FHS v2.3 and software developed for version 3.2 of "
+"the LSB."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Linux kernel 2.6.32"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Web browser Iceweasel 3.5"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "OpenOffice.org 3.2.1"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Educational toolbox GCompris 9.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Music creator Rosegarden 10.04.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Image editor Gimp 2.6.10"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual universe Celestia 1.6.0"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Virtual stargazer Stellarium 0.10.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices.  Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
+"gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+"The dynamic DHCP range was extended on the backbone network to around 4k IP "
+"addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded.  In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+"The DHCP network for 10.0.0.0/8 has been renamed from "
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time.  Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+"There are no pre-defined host entries for client systems in DNS anymore "
+"(staticXX, ..., dhcpYY...)"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "MIT Kerberos5 used for user authentication, enabled for:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "PAM"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "IMAP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Each version is given a distinguishing version number.  If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+"NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
-"the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this.  Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+"A complete PXE boot environment is setup when installing from the DVD, so "
+"that further installations can be done using PXE network installs only. A "
+"new script pxe-addfirmware is provided to support more hardware models "
+"needing firmware."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Remove all hard coded settings on workstations, and configure workstations "
+"and roaming workstations using settings detected from the environment using "
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
+"proof-read with corrections was done by a native English linguist."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to many language tasks, especially French and Danish."
 msgstr ""
 
-#. type: Content of: <article><section><para>
-msgid "Debian Edu Live CD/DVDs for Squeeze are not available at the moment."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Improvements to the welcome web page shown at first logins."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Features of the Standalone image"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add new Japanese, Portuguese and Catalan translations of the welcome web "
+"page."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Almost all packages from the Standalone profile"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "All packages from the laptop task"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop support for <computeroutput>powerpc</computeroutput> architecture from "
+"netinst installation CDs. It is still possible to run Debian Edu on "
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The KDE desktop profile for students/pupils."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop gtick in the default installation, because it doesn't work on thin "
+"clients (BTS #566335)."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Activating translations and regional support"
+#. type: Content of: <article><section><section><section><title>
+msgid "New administration tool: GOsa²"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want.  To activate a given keyboard layout, use the "
-"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
-"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live CD build script "
-"documentation</ulink>.  Here is a list of commonly used locale codes:"
-msgstr ""
-
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Locale value</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Fix DHCP host removal. Closes: #650258"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Backport user generator unicode character transliteration. Closes: #657086"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Bokmål"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Customized GOsa² configuration to better suit the Debian Edu network "
+"architecture."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nb_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"GOsa² updates DNS and NFS exports immediately when a system is updated in "
+"LDAP, making diskless workstations work right after they are added to the "
+"required netgroup."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
+"objects using information gathered by sitesummary, to make it easier to add "
+"new computers to the network."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Norwegian Nynorsk"
+#. type: Content of: <article><section><section><section><title>
+msgid "More software changes"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "nn_NO.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "German"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change default package manager from adept to synaptic, to avoid getting two "
+"graphical package managers installed by default."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de_DE.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
+"KDE."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "de"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change video player setup to install different players in KDE "
+"(dragonplayer), Gnome (totem) and LXDE (totem)."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "French (France)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
+"default KDE installation."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr_FR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace network-manager-kde with plasma-widget-networkmanagement in the "
+"standalone KDE profile"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "fr"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Greek (Greece)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add cifs-utils to the default installation to ensure SMB mounting can work "
+"in any profile."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el_GR.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
+"and valgrind from the default installation and the DVD to make room for "
+"higher priority packages."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "el"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Drop libnss-mdns from stationary profiles, to make sure DNS is the "
+"authoritive source of host names."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Japanese"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
+"and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
+"installed instead.)"
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "ja_JP.UTF-8"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make the LDAP server handle more clients after increasing the server's file "
+"descriptor limit from 1024 to 32768."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "jp"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Northern Sami (Norway)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Provide network blocking / exam mode by default, controlled by LDAP. In "
+"addition to network blocking, changes to the Squid proxy configuration is "
+"needed."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "se_NO"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable automatic extending of full file systems on the Main Server by "
+"default. This can be disabled in LDAP."
 msgstr ""
 
-#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "no(smi)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Change SSL certificate name used by the LDAP server and adjust clients to "
+"use the new name to be able to enable certificate checking on clients."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
-"the live images. Not all locales have translations installed, though.  The "
-"keyboard layout names can be found in /usr/share/keymaps/i386/."
+"Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
+"setup used for DNS."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Stuff to know"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Simplify autofs LDAP rules to make sure they work with extra home directory "
+"partitions exported from the main-server without any changes."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "The password for the user is \"user\"; root has no passwd set."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Known issues with the image"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "There are no squeeze images yet"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Clients set up to shut down at night will stay up for at least an hour if "
+"they are turned on manually between 16:00 and 07:00."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/sad.png"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Additionally use local NTP clock on the main-server to ensure clients and "
+"server sync clocks also when disconnected from the Internet."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-msgid ":("
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Access to Debian repositories is always done via a proxy on the main server "
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
 msgstr ""
 
-#. type: Content of: <article><section><section><title>
-msgid "Download"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "The home0 partition is mounted nosuid, to increase security."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-squeeze-live/\">FTP</ulink>, <ulink url="
-"\"http://ftp.skolelinux.org/cd-squeeze-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
-"squeeze-live/</computeroutput>."
+"Change KDE/Akonadi configuration to reduce the disk footprint of every user "
+"from 144 to 24 MiB."
 msgstr ""
 
-#. type: Content of: <article><section><title>
-msgid "Appendix C - Features in older releases"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New tool notify-local-users to send desktop notification to all logged in "
+"users on a machine.  Useful for thin client servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
similarity index 92%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 52a9263..1d866f6 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Squeeze 6.0.6+r1 Manual <?dbtimestamp?></title></articleinfo>
+<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual <?dbtimestamp?></title></articleinfo>
 <section id="AboutDebianEdu">
-<title>Manual for Debian Edu 6.0.6+r1 Codename "Squeeze"
+<title>Manual for Debian Edu 7.0.0+r0 Codename "Wheezy"
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/welcome_to_tjener.png"/></imageobject><textobject><phrase>Debian Edu login</phrase></textobject></inlinemediaobject> 
+<para>[attachment:welcome_to_tjener.png] 
+FIXME: we need a wheezy login shot here once we have new artwork 
 </para>
-<para>This is the manual for the Debian Edu Squeeze 6.0.6+r1 release.  
+<para>This is the manual for the Debian Edu Wheezy 7.0.0+r0 release.  
 </para>
-<para>The version at <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze"/> is a wiki and updated frequently.  
+<para>The version at <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Wheezy"/> is a wiki and updated frequently.  
 </para>
 <para><link linkend="Translations">Translations</link> are part of the <computeroutput>debian-edu-doc</computeroutput> package which can be installed on a webserver, and is available <ulink url="http://maintainer.skolelinux.org/debian-edu-doc/">online</ulink>. 
 </para>
@@ -47,7 +48,7 @@
 <section id="Architecture--Network">
 <title>Network
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Debian_Edu_Network_Squeeze.png"/></imageobject><textobject><phrase>The Debian Edu network topology</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Debian_Edu_Network_Wheezy.png"/></imageobject><textobject><phrase>The Debian Edu network topology</phrase></textobject></inlinemediaobject> 
 </para>
 <para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux network assumes that there is one (and only one) main-server, while allowing the inclusion of both normal workstations and thin-client-servers (with associated thin-clients). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the thin-client servers, each of which is on a separate network so that the traffic between the thin-clients and the thin-client server doesn't affect the rest of the network services. 
 </para>
@@ -412,16 +413,16 @@
 <section id="Installation--Where_to_find_additional_information">
 <title>Where to find additional information
 </title>
-<para>We recommend that you read or at least take a look at the <ulink url="http://www.debian.org/releases/squeeze/releasenotes">release notes for Debian Squeeze</ulink> before you start installing a system for production use. Please give Debian Edu/Skolelinux a try, it should just work. <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:-)</phrase></textobject></inlinemediaobject>  
+<para>We recommend that you read or at least take a look at the <ulink url="http://www.debian.org/releases/wheezy/releasenotes">release notes for Debian Wheezy</ulink> before you start installing a system for production use. Please give Debian Edu/Skolelinux a try, it should just work. <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:-)</phrase></textobject></inlinemediaobject>  
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be sure to read the <link linkend="GettingStarted">getting started</link> chapter of this manual, though, as it explains how to log in for the first time. 
 </para>
-<para>Even more information about the Debian Squeeze release is available in its <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink>. 
+<para>Even more information about the Debian Wheezy release is available in its <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink>. 
 </para>
 </section>
 
-<section id="Installation--Download_the_installation_media_for_Debian_Edu_6.0.6.2B-r1_Codename_.22Squeeze.22">
-<title>Download the installation media for Debian Edu 6.0.6+r1 Codename "Squeeze"
+<section id="Installation--Download_the_installation_media_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22">
+<title>Download the installation media for Debian Edu 7.0.0+r0 Codename "Wheezy"
 </title>
 
 <section id="Installation--DVD_for_i386.2C_amd64">
@@ -429,12 +430,15 @@
 </title>
 <para>The multi-architecture DVD ISO image is 4.4 GiB large and can be used for installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP or rsync via: 
 </para>
+<para>
+FIXME: these download URLs need to be adapted for wheezy still... They currently don't work 
+</para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD.iso">debian-edu-6.0.6+r1-DVD.iso</ulink> 
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso">debian-edu-7.0.0+r0-DVD.iso</ulink> 
 </para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-DVD.iso">debian-edu-6.0.6+r1-DVD.iso</ulink> 
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso">debian-edu-7.0.0+r0-DVD.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-DVD.iso debian-edu-6.0.6+r1-DVD.iso</computeroutput> 
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -444,11 +448,11 @@
 <para>The netinstall CD, which can be used for installation of i386 and amd64 as well, is available via 
 </para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-CD.iso">debian-edu-6.0.6+r1-CD.iso</ulink> 
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD.iso">debian-edu-7.0.0+r0-CD.iso</ulink> 
 </para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-CD.iso">debian-edu-6.0.6+r1-CD.iso</ulink> 
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD.iso">debian-edu-7.0.0+r0-CD.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-CD.iso debian-edu-6.0.6+r1-CD.iso</computeroutput> 
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -458,11 +462,11 @@
 <para>The sources are available via 
 </para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-source-DVD.iso">debian-edu-6.0.6+r1-source-DVD.iso</ulink> 
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso">debian-edu-7.0.0+r0-source-DVD.iso</ulink> 
 </para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-6.0.6+r1-source-DVD.iso">debian-edu-6.0.6+r1-source-DVD.iso</ulink> 
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso">debian-edu-7.0.0+r0-source-DVD.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-6.0.6+r1-source-DVD.iso debian-edu-6.0.6+r1-source-DVD.iso</computeroutput> 
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -483,7 +487,7 @@
 <section id="Installation--Select_type_of_installation">
 <title>Select type of installation
 </title><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>Installer boot menu</phrase></textobject></inlinemediaobject>
+<para>[attachment:01-Installer_boot_menu.png]
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para> <emphasis role="strong">Install</emphasis> is the default text mode installation on i386 and amd64.
 </para>
@@ -497,7 +501,7 @@
 </para>
 <para><emphasis role="strong">Help</emphasis> gives some hints on using the installer
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_a.png"/></imageobject><textobject><phrase>Installer advanced options screen 1</phrase></textobject></inlinemediaobject>
+<para>[attachment:Installer_advanced_options_a.png]
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para><emphasis role="strong">Back..</emphasis> brings back to the main menu.
 </para>
@@ -513,7 +517,7 @@
 </para>
 <para> <emphasis role="strong">64 bit automated install</emphasis> needs a preseed file.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_b.png"/></imageobject><textobject><phrase>Installer advanced options screen 2</phrase></textobject></inlinemediaobject>
+<para>[attachment:Installer_advanced_options_b.png]
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para><emphasis role="strong">Graphical expert install</emphasis> gives access to all available questions in graphical mode.
 </para>
@@ -527,7 +531,7 @@
 </para>
 <para> <emphasis role="strong">64 bit graphical automated install</emphasis> needs a preseed file.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_help.png"/></imageobject><textobject><phrase>Installer help screen</phrase></textobject></inlinemediaobject>
+<para>[attachment:Installer_help.png]
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para> This Help screen is self explaining and enables the <F>-keys on the keyboard for getting more detailed help on the topics described.
 </para></entry></row></tbody></tgroup></informaltable>
@@ -568,7 +572,7 @@
 <section id="Installation--The_installation_process">
 <title>The installation process
 </title>
-<para>Remember the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/Requirements">system requirements</ulink> and make sure you have at least two network cards (NICs) if you plan on setting up a thin client server. 
+<para>Remember the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Requirements">system requirements</ulink> and make sure you have at least two network cards (NICs) if you plan on setting up a thin client server. 
 </para>
 <itemizedlist>
 <listitem>
@@ -651,9 +655,9 @@
 <title>A note on DVD installs
 </title>
 <para>After you install from a DVD, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from the DVD. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed: 
-</para><screen><![CDATA[deb http://ftp.debian.org/debian/ squeeze main 
-deb http://security.debian.org/ squeeze/updates main 
-deb http://ftp.skolelinux.org/skolelinux squeeze local]]></screen>
+</para><screen><![CDATA[deb http://ftp.debian.org/debian/ wheezy main 
+deb http://security.debian.org/ wheezy/updates main 
+deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 <para>The DVD only works with KDE desktop installations.  If you want to install other desktop options, use the netinst images or PXE installation. 
 </para>
 </section>
@@ -664,7 +668,7 @@ deb http://ftp.skolelinux.org/skolelinux squeeze local]]></screen>
 <para>A netinst installation (which is the type of installation our CD provides) will fetch some packages from the CD and the rest from the net.  The amount of packages fetched from the net varies from profile to profile: 
 </para>
 <para>
-FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny. 
+FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny. 
 </para>
 <itemizedlist>
 <listitem>
@@ -690,15 +694,6 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Installation--A_note_on_some_RAID_controllers">
-<title>A note on some RAID controllers
-</title>
-<para>When using a USB drive to add missing firmware during install, with some RAID-controllers GRUB is installed to the USB drive. So a reboot after installation results in a GRUB error. A workaround for this problem is to remove the USB drive after the firmware is loaded, and preferably before partitioning starts.     
-</para>
-<para>More information is available in <ulink url="http://bugs.skolelinux.org/show_bug.cgi?id=1395">Debian-Edu bug #1395</ulink> and Debian bug <ulink url="http://bugs.debian.org/516280#">516280</ulink>. 
-</para>
-</section>
-
 <section id="Installation--A_note_on_thin-client-server_installations">
 <title>A note on thin-client-server installations
 </title>
@@ -731,11 +726,11 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> profile only: 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/pxe-tjener.png"/></imageobject><textobject><phrase>pxe-tjener.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:pxe-tjener.png] 
 </para>
 <para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> and <emphasis role="strong">Thin-Client-Server</emphasis> profiles: 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>28-Diskless-WS-GRUB_Boot_menu-PXE.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png] 
 </para>
 <para>This setup also allows diskless workstations and thin clients to be booted on the main network. Diskless workstations must be added with GOsa² just like normal workstations or thin client servers. 
 </para>
@@ -751,7 +746,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para><screen><![CDATA[d-i    pkgsel/include string my-extra-package(s)]]></screen>
 <para>The PXE installation uses <computeroutput>/var/lib/tftpboot/debian-edu/install.cfg</computeroutput> and the preseeding file in <computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput>. These files can be changed to adjust the preseeding used during installation, to avoid more questions when installing over the net. Another way to achieve this is to provide extra settings in <computeroutput>/etc/debian-edu/pxeinstall.conf</computeroutput> and <computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</computeroutput> and to run <computeroutput>/usr/sbin/debian-edu-pxeinstall</computeroutput> to update the generated files.  
 </para>
-<para>Further information can be found in the <ulink url="http://www.debian.org/releases/squeeze/installmanual">manual of the Debian Installer</ulink>. 
+<para>Further information can be found in the <ulink url="http://www.debian.org/releases/wheezy/installmanual">manual of the Debian Installer</ulink>. 
 </para>
 <para>To disable or change the use of the proxy when installing via PXE, the lines containing <computeroutput>mirror/http/proxy</computeroutput>, <computeroutput>mirror/ftp/proxy</computeroutput> and <computeroutput>preseed/early_command</computeroutput> in <computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </computeroutput> need to be changed.  To disable the use of a proxy when installing, put '#' in front of the first two lines, and remove the "<computeroutput>export xhttp_proxy="http://webcache:3128"; </computeroutput>" part from the last one. 
 </para>
@@ -777,67 +772,70 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <para>So here is a screenshot tour through a graphical Main-Server + Workstation + Thin Client Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network: 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_boot_menu.png</phrase></textobject></inlinemediaobject> 
+<para>
+FIXME: these screenshots need to be redone once we have wheezy artwork 
+</para>
+<para>[attachment:01-Installer_boot_menu.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/02-select_a_language.png"/></imageobject><textobject><phrase>02-select_a_language.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:02-select_a_language.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/03-select_your_location.png"/></imageobject><textobject><phrase>03-select_your_location.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:03-select_your_location.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/04-Configure_the_keyboard.png"/></imageobject><textobject><phrase>04-Configure_the_keyboard.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:04-Configure_the_keyboard.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/05-Detect_and_mount_CD-ROM.png"/></imageobject><textobject><phrase>05-Detect_and_mount_CD-ROM.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:05-Detect_and_mount_CD-ROM.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/06-Load_installer_components_from_CD.png"/></imageobject><textobject><phrase>06-Load_installer_components_from_CD.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:06-Load_installer_components_from_CD.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/07-Detect_network_hardware.png"/></imageobject><textobject><phrase>07-Detect_network_hardware.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:07-Detect_network_hardware.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/08-Choose_Debian_Edu_profile.png"/></imageobject><textobject><phrase>08-Choose_Debian_Edu_profile.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:08-Choose_Debian_Edu_profile.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/09-Really_use_the_automatic_partitioning_tool.png"/></imageobject><textobject><phrase>09-Really_use_the_automatic_partitioning_tool.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:09-Really_use_the_automatic_partitioning_tool.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"/></imageobject><textobject><phrase>10-Really_use_the_automatic_partitioning_tool-Yes.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/11-Participate_in_the_package_usage_survey.png"/></imageobject><textobject><phrase>11-Participate_in_the_package_usage_survey.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:11-Participate_in_the_package_usage_survey.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/12-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:12-Set_up_users_and_passwords.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/12a-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12a-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:12a-Set_up_users_and_passwords.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/12b-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12b-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:12b-Set_up_users_and_passwords.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/12c-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12c-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:12c-Set_up_users_and_passwords.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/13-Install+the+base+system.png"/></imageobject><textobject><phrase>13-Install the base system.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:13-Install the base system.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/14-Select_and_install_software.png"/></imageobject><textobject><phrase>14-Select_and_install_software.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:14-Select_and_install_software.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/17-Select_and_install_software.png"/></imageobject><textobject><phrase>17-Select_and_install_software.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:17-Select_and_install_software.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/18-Build+LTSP+chroot.png"/></imageobject><textobject><phrase>18-Build LTSP chroot.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:18-Build LTSP chroot.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"/></imageobject><textobject><phrase>19-Install_the_GRUB_boot_loader_on_a_hard_disk.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/20-Finish_the_Installation.png"/></imageobject><textobject><phrase>20-Finish_the_Installation.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:20-Finish_the_Installation.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/21-Finish_the_Installation-Installation_complete.png"/></imageobject><textobject><phrase>21-Finish_the_Installation-Installation_complete.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:21-Finish_the_Installation-Installation_complete.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/22-Tjener_GRUB_boot_menu.png"/></imageobject><textobject><phrase>22-Tjener_GRUB_boot_menu.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:22-Tjener_GRUB_boot_menu.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/23-Tjener-KDM_Login.png"/></imageobject><textobject><phrase>23-Tjener-KDM_Login.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:23-Tjener-KDM_Login.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/24-Tjener-KDE_Start.png"/></imageobject><textobject><phrase>24-Tjener-KDE_Start.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:24-Tjener-KDE_Start.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/26-Tjener-KDE_Desktop_Browser.png"/></imageobject><textobject><phrase>26-Tjener-KDE_Desktop_Browser.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:26-Tjener-KDE_Desktop_Browser.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-KDE_Desktop.png"/></imageobject><textobject><phrase>27-Tjener-KDE_Desktop.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:27-Tjener-KDE_Desktop.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>28-Diskless-WS-GRUB_Boot_menu-PXE.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/29-Diskless-WS-KDM_Login.png"/></imageobject><textobject><phrase>29-Diskless-WS-KDM_Login.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:29-Diskless-WS-KDM_Login.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/30-ThinClient-LDM_Login.png"/></imageobject><textobject><phrase>30-ThinClient-LDM_Login.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:30-ThinClient-LDM_Login.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/31-ThinClient-KDE_Desktop.png"/></imageobject><textobject><phrase>31-ThinClient-KDE_Desktop.png</phrase></textobject></inlinemediaobject> 
+<para>[attachment:31-ThinClient-KDE_Desktop.png] 
 </para>
 </section>
 </section>
@@ -866,7 +864,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <para>The <link linkend="HowTo">HowTo</link> chapter covers more tips and tricks and some frequently asked questions. 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/getting-started-desktop.png"/></imageobject><textobject><phrase>Debian Edu desktop</phrase></textobject></inlinemediaobject> 
+<para>[attachment:getting-started-desktop.png] 
 </para>
 
 <section id="GettingStarted--Services_running_on_the_main_server">
@@ -907,7 +905,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <itemizedlist>
 <listitem>
-<para>If you are using a new Debian Edu Squeeze machine, the site certificate will be known by the browser. 
+<para>If you are using a new Debian Edu Wheezy machine, the site certificate will be known by the browser. 
 </para></listitem>
 <listitem>
 <para>Otherwise, you will get an error message about the SSL certificate being wrong. If you know you are alone on your network, just tell the browser to accept it and ignore that. 
@@ -918,7 +916,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 <section id="GettingStarted--GOsa.2BALI-_Login_plus_Overview">
 <title>GOsa² Login plus Overview
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa2_overview.png"/></imageobject><textobject><phrase>GOsa² overview page after login as the first  user</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa2_overview.png] 
 </para>
 <para>After logging in to GOsa² you will see the overview page of GOsa². 
 </para>
@@ -965,33 +963,20 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </para>
 <para>If all went well, you can now see the new user in the user list table. You should now be able to log in with that username on any Skolelinux machine within your network. 
 </para>
-<para><emphasis role="strong">Please note:</emphasis> If Squeeze/r0 was used to install the main server, all user passwords exept that one for the first user will expire in only 2 days.  To fix this, please execute the following script in a terminal.  This script is included in r1. 
-</para><screen><![CDATA[  #!/bin/bash
-  #
-  # /usr/share/debian-edu-config/tools/password-fix-squeeze-r0
-  #
-  # Fix password expiring after 2 days (#664596) incorrectly introduced
-  # in Debian Edu Squeeze up to r0; for new users the password will
-  # never expire. For existing users this will be the case after they've
-  # changed their password. Give old users the chance to change the
-  # password, exclude not affected accounts: templates and first user.
-  #
-  for i in $(getent passwd | grep home0 | egrep -v   'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do
-    kadmin.local -q "modprinc -pwexpire 7000days $i"
-  done
-  kadmin.local -q "modpol -maxlife 0secs users"]]></screen>
 </section>
 
 <section id="GettingStarted--Search.2C_modify_and_delete_users">
 <title>Search, modify and delete users
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/filterbox.png"/></imageobject><textobject><phrase>Filterbox</phrase></textobject></inlinemediaobject> To modify or delete a user, use GOsa² to browse the list of users on your system. On the very right of the screen you will find the "Filter" box, a search tool provided by GOsa². If you don't know the exact location of your user account in your tree, change to the base level of the GOsa²/LDAP tree and search there with the option marked "[x] Search in subtrees". 
+<para>[attachment:filterbox.png] 
+</para>
+<para>To modify or delete a user, use GOsa² to browse the list of users on your system. On the very right of the screen you will find the "Filter" box, a search tool provided by GOsa². If you don't know the exact location of your user account in your tree, change to the base level of the GOsa²/LDAP tree and search there with the option marked "[x] Search in subtrees". 
 </para>
 <para>When using the "Filter" box, results will immediately appear in the middle of the text in the table list view. Every line represents a user account and the items farthest to the right on each line are little icons that provide actions for you: edit, lock, set password, restore snapshot (greyed out if no snapshot was taken before), take snapshot and delete. 
 </para>
 <para>A new page will show up where you can directly modify information about the user, change the password of the user and modify the list of groups the user belongs to. 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/edit_user.png"/></imageobject><textobject><phrase>Editing user data</phrase></textobject></inlinemediaobject> 
+<para>[attachment:edit_user.png] 
 </para>
 </section>
 
@@ -1013,7 +998,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 <listitem>
 <para>on the page subsequently presented you can set a new password chosen by yourself 
 </para></listitem></orderedlist>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/change_password_administratively.png"/></imageobject><textobject><phrase>Set user password</phrase></textobject></inlinemediaobject> 
+<para>[attachment:change_password_administratively.png] 
 </para>
 <para><emphasis role="strong">Beware of security implications due to easy to guess passwords!</emphasis> 
 </para>
@@ -1064,9 +1049,9 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 <section id="GettingStarted--Group_Management_with_GOsa.2BALI-">
 <title>Group Management with GOsa²
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/create_group.png"/></imageobject><textobject><phrase>create group</phrase></textobject></inlinemediaobject> 
+<para>[attachment:create_group.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/list_groups.png"/></imageobject><textobject><phrase>create group</phrase></textobject></inlinemediaobject> 
+<para>[attachment:list_groups.png] 
 </para>
 <para>The management of groups is very similar to the management of users.  
 </para>
@@ -1103,7 +1088,7 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
 </para>
 <para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa². Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suite your network. A few screenshots show how this may be done. 
 </para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a
-info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.
+info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.
 info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.
 info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.
 
@@ -1111,13 +1096,13 @@ Enter password if you want to activate these changes, and ^c to abort.
 
 Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
 enter password: █]]></screen>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_list.png"/></imageobject><textobject><phrase>GOsa² systems listing</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa_systems_list.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_host_details.png"/></imageobject><textobject><phrase>Host details</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa_systems_host_details.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_edit_host.png"/></imageobject><textobject><phrase>Modify host</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa_systems_edit_host.png] 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_add_netgroup.png"/></imageobject><textobject><phrase>Add netgroup</phrase></textobject></inlinemediaobject> 
+<para>[attachment:gosa_systems_add_netgroup.png] 
 </para>
 <para>A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</computeroutput> can be used to trigger the update manually.  
 </para>
@@ -1284,7 +1269,7 @@ enter password: █]]></screen>
 </para>
 <para>If you want to get rid of older backups, choose "Maintenance" in the menu on the backup page and select the oldest snapshot to keep: 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/slbackup-php_maintenance.png"/></imageobject><textobject><phrase>slbackup-php Maintenance</phrase></textobject></inlinemediaobject> 
+<para>[attachment:slbackup-php_maintenance.png] 
 </para>
 </section>
 
@@ -1405,17 +1390,17 @@ enter password: █]]></screen>
 </section>
 </section>
 
-<section id="Upgrades--Upgrades_from_Debian_Edu_Lenny">
-<title>Upgrades from Debian Edu Lenny
+<section id="Upgrades--Upgrades_from_Debian_Edu_Squeeze">
+<title>Upgrades from Debian Edu Squeeze
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be prepared: make sure you have tested the upgrade from Lenny in a test environment or have backups ready to be able to go back.  
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be prepared: make sure you have tested the upgrade from Squeeze in a test environment or have backups ready to be able to go back.  
 </para>
 
 <section id="Upgrades--The_basic_upgrade_operation">
 <title>The basic upgrade operation
 </title><orderedlist numeration="arabic">
 <listitem>
-<para>Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all occurrences of "lenny" with "squeeze". 
+<para>Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all occurrences of "squeeze" with "wheezy". 
 </para></listitem>
 <listitem>
 <para>run <computeroutput>apt-get update</computeroutput> 
@@ -1431,6 +1416,9 @@ enter password: █]]></screen>
 <section id="Upgrades--LDAP_service_needs_to_be_reconfigured">
 <title>LDAP service needs to be reconfigured
 </title>
+<para>
+FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed 
+</para>
 <para>The LDAP setup has changed a lot from Lenny to Squeeze. The way users accounts, passwords, network settings, services and machines are treated is quite different now. So LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that could be used to achieve this. Read the comment at the beginning of that script carefully before doing anything.       
 </para>
 </section>
@@ -1438,7 +1426,7 @@ enter password: █]]></screen>
 <section id="Upgrades--Recreating_an_LTSP_chroot">
 <title>Recreating an LTSP chroot
 </title>
-<para>On the LTSP server(s) the LTSP chroot should be recreated. The new chroot will automatically support both thin-clients and diskless workstations. 
+<para>On the LTSP server(s) the LTSP chroot should be recreated. The new chroot will still  support both thin-clients and diskless workstations. 
 </para>
 <para>Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or <computeroutput>/opt/ltsp/amd64</computeroutput>, depending on your setup). If you have enough diskspace, consider backing it up.  
 </para>
@@ -1449,10 +1437,10 @@ enter password: █]]></screen>
 </section>
 </section>
 
-<section id="Upgrades--Upgrades_from_older_Debian_Edu_.2BAC8_Skolelinux_installations_.28before_Lenny.29">
-<title>Upgrades from older Debian Edu / Skolelinux installations (before Lenny)
+<section id="Upgrades--Upgrades_from_older_Debian_Edu_.2BAC8_Skolelinux_installations_.28before_Squeeze.29">
+<title>Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)
 </title>
-<para>To upgrade from any older release, you will need to upgrade to the Lenny-based Debian Edu release first, before you can follow the instructions provided above. Instructions are given in the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Lenny#">Manual for Debian Edu Lenny</ulink> about how to upgrade to Lenny from the previous release, Etch, and the Etch manual covers the one before that! 
+<para>To upgrade from any older release, you will need to upgrade to the Squeeze-based Debian Edu release first, before you can follow the instructions provided above. Instructions are given in the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze#">Manual for Debian Edu Squeeze</ulink> about how to upgrade to Squeeze from the previous release, Lenny, and the Lenny manual covers the one before that! (Etch was it's name.) 
 </para>
 </section>
 
@@ -1602,7 +1590,7 @@ resize2fs /dev/vg_system/skole+tjener+home0]]></screen>
 <para>Backports are recompiled packages from Debian testing (mostly) and Debian unstable (in a few cases only, e.g. security updates), so they will run without new libraries (wherever this is possible) on a stable Debian distribution like Debian Edu. <emphasis role="strong">We recommend you to pick out individual backports which fit your needs, and not to use all backports available there.</emphasis>  
 </para>
 <para>Using backports.debian.org is simple: 
-</para><screen><![CDATA[echo "deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free" >> /etc/apt/sources.list
+</para><screen><![CDATA[echo "deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free" >> /etc/apt/sources.list
 apt-get update]]></screen>
 <para>Previously, extra configuration was needed to get updates installed automatically for installed backports, but since 2011 the <ulink url="http://backports.debian.org/news/squeeze-backports_and_lenny-backports-sloppy_started/">squeeze-backports suite</ulink> renders this unnecessary. 
 </para>
@@ -1611,7 +1599,7 @@ apt-get update]]></screen>
 <section id="Administration--Upgrading_with_a_CD_or_DVD_ROM">
 <title>Upgrading with a CD or DVD ROM
 </title>
-<para>If you want to upgrade from one version to another (for example from Squeeze 6.0.6 to 6.0.7) but you do not have Internet connectivity, only physical media, follow these steps: 
+<para>If you want to upgrade from one version to another (for example from Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical media, follow these steps: 
 </para>
 <para>Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command: 
 </para><screen><![CDATA[mount /media/cdrom
@@ -1876,7 +1864,7 @@ gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907
 # check securely if the key is correct and add it to the keyring used by APT if it is:
 gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -
 # add repository to sources.list - please check the homepages for mirrors!
-echo "deb http://deb-multimedia.org squeeze main" >> /etc/apt/sources.list
+echo "deb http://deb-multimedia.org wheezy main" >> /etc/apt/sources.list
 # update the list of available packages:
 apt-get update]]></screen>
 </section>
@@ -2207,7 +2195,7 @@ exit]]></screen>
 </title>
 <para>For Windows clients the Windows domain "SKOLELINUX" is available to be joined. A special service called Samba, installed on the main-server tjener, enables Windows clients to store profiles and user data, and also authenticates the users during the login. 
 </para>
-<para>Allowing a Windows client to join the domain requires steps described in the <link linkend="Samba">Debian Edu Squeeze Samba Howto</link>. 
+<para>Allowing a Windows client to join the domain requires steps described in the <link linkend="Samba">Debian Edu Wheezy Samba Howto</link>. 
 </para>
 <para>Windows will sync the profiles of domain users on every Windows login and logout. Depending on how much data is stored in the profile, this could take some time. To minimise the time needed, deactivate things like local cache in browsers (you can use the Squid proxy cache installed on tjener instead) and save files into the H: volume rather than under "My Documents". 
 </para>
@@ -2474,7 +2462,7 @@ logon home = ""]]></screen>
 <section id="Samba">
 <title>Samba in Debian Edu
 </title>
-<para>Samba (v3) in Debian Edu Squeeze has been fully prepared for use as an NT4-style domain controller with Windows XP, Windows Vista and Windows 7 as clients. After a machine has joined the domain, this machine can be fully managed with GOsa². 
+<para>Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-style domain controller with Windows XP, Windows Vista and Windows 7 as clients. After a machine has joined the domain, this machine can be fully managed with GOsa². 
 </para>
 
 <section id="Samba--Getting_Started">
@@ -2814,7 +2802,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 <para>This document needs your help! First and foremost, it is not finished yet: if you read it, you will notice various 
 FIXMEs within the text. If you happen to know (a bit of) what needs to be explained there, please consider sharing your knowledge with us.  
 </para>
-<para>The source of the text is a wiki and can be edited with a simple webbrowser. Just go to  <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/"/> and you can contribute easily. Note: a user account is needed to edit the pages; you need to <ulink url="http://wiki.debian.org/UserPreferences">create a wiki user</ulink> first. 
+<para>The source of the text is a wiki and can be edited with a simple webbrowser. Just go to  <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Wheezy/"/> and you can contribute easily. Note: a user account is needed to edit the pages; you need to <ulink url="http://wiki.debian.org/UserPreferences">create a wiki user</ulink> first. 
 </para>
 <para>Another very good way to contribute and to help users is by translating software and documentation. Information on how to translate this document can be found in the <link linkend="Translations">translations chapter</link> of this book. Please consider helping the translation effort of this book! 
 </para>
@@ -2902,86 +2890,14 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </section>
 
 <section id="Features">
-<title>New features in Debian Edu Squeeze
+<title>New features in Debian Edu Wheezy
 </title>
-
-<section id="Features--Changes_for_Debian_Edu_6.0.6.2B-r1_Codename_.22Squeeze.22_.2AUN.2Areleased_as_of_2013-0.3F-.3F.3F">
-<title>Changes for Debian Edu 6.0.6+r1 Codename "Squeeze" *UN*released as of 2013-0?-??
-</title>
-<itemizedlist>
-<listitem>
-<para>sitesummary was updated from 0.1.3 to 0.1.8 
-</para>
-<itemizedlist>
-<listitem>
-<para>Make Nagios configuration more robust and efficient 
-</para></listitem>
-<listitem>
-<para>Comply with 3.X kernel 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0 
-</para>
-<itemizedlist>
-<listitem>
-<para>Minor updates from the wiki 
-</para></listitem>
-<listitem>
-<para>Danish translation now complete 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>debian-edu-config from 1.453 to 1.454 
-</para>
-<itemizedlist>
-<listitem>
-<para>Correct Kerberos user policy: don't expire password after 2 days. Closes: #664596 
-</para></listitem>
-<listitem>
-<para>Handle '#' characters in the root or first users password. Closes: #664976 
-</para></listitem>
-<listitem>
-<para>Fixes for gosa-sync: 
-</para>
-<itemizedlist>
-<listitem>
-<para>Don't fail if password contains " 
-</para></listitem>
-<listitem>
-<para>Don't disclose new password string in syslog 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>Fixes for gosa-create: 
-</para>
-<itemizedlist>
-<listitem>
-<para>Invalidate libnss cache before applying changes 
-</para></listitem>
-<listitem>
-<para>Multiple failures during mass user import into GOsa² 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>gosa-netgroups plugin: don't erase entries of attribute type "memberNisNetgroup". Closes: #687256 
-</para></listitem>
-<listitem>
-<para>First user now uses the same Kerberos policy as all other users 
-</para></listitem>
-<listitem>
-<para>Add Danish web page 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>debian-edu-install from 1.528 to 1.529 
-</para>
-<itemizedlist>
-<listitem>
-<para>Improve preseeding support and documentation 
-</para></listitem></itemizedlist></listitem></itemizedlist>
 <para>
 FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead. 
 </para>
-</section>
 
-<section id="Features--New_features_for_Debian_Edu_6.0.4.2B-r0_Codename_.22Squeeze.22_released_2012-03-11">
-<title>New features for Debian Edu 6.0.4+r0 Codename "Squeeze" released 2012-03-11
+<section id="Features--New_features_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22_released_2013-.3F.3F-.3F.3F">
+<title>New features for Debian Edu 7.0.0+r0 Codename "Wheezy" released 2013-??-??
 </title>
 
 <section id="Features--User_visible_changes">
@@ -2990,38 +2906,10 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 <itemizedlist>
 <listitem>
 <para>Updated artwork and new Debian Edu / Skolelinux logo, visible during installation, in the login screen and as desktop wallpaper. 
-</para></listitem>
-<listitem>
-<para>Replace LWAT with GOsa² as the LDAP administration interface. See below and the <link linkend="GettingStarted">Getting started chapter</link> of the manual for more information on GOsa². 
-</para></listitem>
-<listitem>
-<para>See below for a list of updated software. 
-</para></listitem>
-<listitem>
-<para>Show welcome page to users when they first log in. This default start page for Iceweasel is fetched from LDAP at installation and boot time for networked profiles. Set to <ulink url="http://www.skolelinux.org/"/> for Standalone installations.  
-</para></listitem>
-<listitem>
-<para>New LXDE desktop option, in addition to KDE (default) and Gnome. As the Gnome option, the LXDE desktop option is only supported by the CD installation method. 
-</para></listitem>
-<listitem>
-<para>Speed up LTSP client boot. 
-</para></listitem>
-<listitem>
-<para>Provide a KDE menu entry for changing the password in GOsa².  
-</para>
-<itemizedlist>
-<listitem>
-<para>For more information on how to change passwords (including expired passwords at the KDM/GDM login prompt), please see the <link linkend="Users">HowTos for users</link> chapter of the manual. 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>Add link to <ulink url="http://linuxsignpost.org/"/> on the start page shown to new users. 
-</para></listitem>
-<listitem>
-<para>All LTSP servers are also <link linkend="NetworkClients--Remote_Desktop_Service">RDP servers</link> by default. 
-</para></listitem>
-<listitem>
-<para>Improve handing of removable media on thin clients. Show desktop notification longer when inserting new media and provide an option to start dolphin when such media is inserted.  
 </para></listitem></itemizedlist>
+<para>
+FIXME: hopefully. h01ger is one it to ask gismo. 
+</para>
 </section>
 
 <section id="Features--Installation_changes">
@@ -3029,31 +2917,7 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para>New version of debian-installer from Debian Squeeze, see <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink> for more details. 
-</para></listitem>
-<listitem>
-<para>Since root logins are no longer allowed when using gdm/kdm, a user in LDAP is set up during installation of the Main Server. This user is up as GOsa² administrator and is also granted sudo access. The Debian Edu menu reordering has been enabled as well, by adding the user also to the <computeroutput>teachers</computeroutput> group. 
-</para></listitem>
-<listitem>
-<para>The <computeroutput>.iso</computeroutput> images can directly be copied onto USB sticks, for example by using <computeroutput>dd</computeroutput> or even <computeroutput>cat</computeroutput>.. 
-</para></listitem>
-<listitem>
-<para>New roaming workstation profile for laptops. 
-</para></listitem>
-<listitem>
-<para>Device access for all users is handled by <ulink url="http://wiki.debian.org/PolicyKit#">PolicyKit</ulink>, and no extra group memberships are needed to get access to devices. 
-</para></listitem>
-<listitem>
-<para>A warning will be issued when installing on too small disks for the selected profile. 
-</para></listitem>
-<listitem>
-<para>Simplify partitioning for Standalone installs to only have a separate /home/ but no seperate /usr anymore.  
-</para></listitem>
-<listitem>
-<para>More tests in the test suite, and correct some of the tests that failed earlier.  
-</para></listitem>
-<listitem>
-<para>Make sure to report an error and abort the installation when trying to use the netinst images without a working Internet connection, instead of silently installing a broken system.  
+<para>New version of debian-installer from Debian Wheezy, see <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink> for more details. 
 </para></listitem></itemizedlist>
 </section>
 
@@ -3062,45 +2926,42 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para>Everything which is new in Debian Squeeze: 
+<para>Everything which is new in Debian Wheezy: 
 </para>
 <itemizedlist>
 <listitem>
-<para>compatibility with the FHS v2.3 and software developed for version 3.2 of the LSB. 
-</para></listitem>
-<listitem>
-<para>Linux kernel 2.6.32 
+<para>Linux kernel 3.2.x 
 </para></listitem>
 <listitem>
-<para>Desktop environments KDE "Plasma" 4.4 and GNOME 2.30 
+<para>Desktop environments KDE "Plasma" 4.8.4 and GNOME 3.4 
 </para></listitem>
 <listitem>
-<para>Web browser Iceweasel 3.5 
+<para>Web browser Iceweasel 10 ESR 
 </para></listitem>
 <listitem>
-<para>OpenOffice.org 3.2.1 
+<para>LibreOffice 3.5.4 
 </para></listitem>
 <listitem>
-<para>Educational toolbox GCompris 9.3 
+<para>Educational toolbox GCompris 12.01 
 </para></listitem>
 <listitem>
-<para>Music creator Rosegarden 10.04.2 
+<para>Music creator Rosegarden 12.04 
 </para></listitem>
 <listitem>
-<para>Image editor Gimp 2.6.10 
+<para>Image editor Gimp 2.8.2 
 </para></listitem>
 <listitem>
-<para>Virtual universe Celestia 1.6.0 
+<para>Virtual universe Celestia 1.6.1 
 </para></listitem>
 <listitem>
-<para>Virtual stargazer Stellarium 0.10.4 
+<para>Virtual stargazer Stellarium 0.11.3 
 </para></listitem>
 <listitem>
-<para>Debian Squeeze includes over 10,000 new packages available for installation, including the browser Chromium 
+<para>Debian Wheezy includes over 10,000 new packages available for installation, including the Chromium browser 
 </para></listitem></itemizedlist>
 <itemizedlist>
 <listitem>
-<para>More information about Debian Squeeze 6.0 is provided in the <ulink url="http://www.debian.org/releases/squeeze/releasenotes">release notes</ulink> and the <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink>. 
+<para>More information about Debian Wheezy 7.0 is provided in the <ulink url="http://www.debian.org/releases/wheezy/releasenotes">release notes</ulink> and the <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink>. 
 </para></listitem></itemizedlist></listitem></itemizedlist>
 </section>
 
@@ -3109,42 +2970,8 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para>The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past.  
-</para>
-<itemizedlist>
-<listitem>
-<para>The dynamic DHCP range was extended on the backbone network to around 4k IP addresses, and around 200 IP addresses for the thin client network.  
-</para></listitem>
-<listitem>
-<para>The DHCP network for 10.0.0.0/8 has been renamed from <computeroutput>barebone</computeroutput> to <computeroutput>intern</computeroutput> 
-</para></listitem>
-<listitem>
-<para>There are no pre-defined host entries for client systems in DNS anymore (staticXX, ..., dhcpYY...) 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>MIT Kerberos5 used for user authentication, enabled for: 
-</para>
-<itemizedlist>
-<listitem>
-<para>PAM 
-</para></listitem>
-<listitem>
-<para>IMAP 
-</para></listitem>
-<listitem>
-<para>SMTP 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>NFSv4, but without added Kerberos privacy/integrity/authentication.  The machines still have to be added to the <computeroutput>workstation</computeroutput> netgroup to be able to mount the home directories 
-</para></listitem>
-<listitem>
-<para>Full Samba NT4 domain support for Windows XP/Vista/7 
-</para></listitem>
-<listitem>
-<para>A complete PXE boot environment is setup when installing from the DVD, so that further installations can be done using PXE network installs only. A new script pxe-addfirmware is provided to support more hardware models needing firmware.  
-</para></listitem>
-<listitem>
-<para>Remove all hard coded settings on workstations, and configure workstations and roaming workstations using settings detected from the environment using DNS,  DHCP and LDAP.  See this <ulink url="http://people.skolelinux.org/pere/blog/No_hardcoded_config_on_Debian_Edu_clients.html">blog post with more information on the changes</ulink>. 
+<para>
+FIXME: to be documented, if any 
 </para></listitem></itemizedlist>
 </section>
 
@@ -3153,24 +2980,12 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para>Translation updates for the templates used in the installer. These templates are now available in 28 languages. 
-</para></listitem>
-<listitem>
-<para>The Debian Edu Squeeze Manual has generally been cleaned up and improved. A proof-read with corrections was done by a native English linguist. 
-</para></listitem>
-<listitem>
-<para>The Debian Edu Squeeze Manual is fully translated to German, French, Italian and Danish (new). Partly translated versions exist for Norwegian Bokmal and Spanish. 
+<para>Translation updates for the templates used in the installer. These templates are now available in 
+FIXME languages. 
 </para></listitem>
 <listitem>
-<para>Improvements to many language tasks, especially French and Danish. 
-</para></listitem>
-<listitem>
-<para>Improvements to the welcome web page shown at first logins.  
-</para>
-<itemizedlist>
-<listitem>
-<para>Add new Japanese, Portuguese and Catalan translations of the welcome web page. 
-</para></listitem></itemizedlist></listitem></itemizedlist>
+<para>The Debian Edu Wheezy Manual is fully translated to German, French, Italian and Danish. Partly translated versions exist for Norwegian Bokmal and Spanish. 
+</para></listitem></itemizedlist>
 </section>
 
 <section id="Features--Regressions">
@@ -3178,135 +2993,28 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
 </title>
 <itemizedlist>
 <listitem>
-<para><ulink url="http://lists.debian.org/20100810061204.GD7929@login2.uio.no">CD and DVD installs are different</ulink> - the DVD is only suitable for installing a KDE environemnt. 
-</para></listitem>
-<listitem>
-<para>Drop support for <computeroutput>powerpc</computeroutput> architecture from netinst installation CDs. It is still possible to run Debian Edu on <computeroutput>powerpc</computeroutput>, but installation is less automated. 
-</para></listitem>
-<listitem>
-<para>Drop gtick in the default installation, because it doesn't work on thin clients (BTS #566335). 
+<para>
+FIXME: to be documented, if any 
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Features--New_administration_tool:_GOsa.2BALI-">
-<title>New administration tool: GOsa²
+<section id="Features--Other_LDAP_related_changes">
+<title>Other LDAP related changes
 </title>
 <itemizedlist>
 <listitem>
-<para>gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, with: 
-</para>
-<itemizedlist>
-<listitem>
-<para>Fix DHCP host removal. Closes: #650258 
-</para></listitem>
-<listitem>
-<para>Backport user generator unicode character transliteration. Closes: #657086 
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>Customized GOsa² configuration to better suit the Debian Edu network architecture. 
-</para>
-<itemizedlist>
-<listitem>
-<para>GOsa² updates DNS and NFS exports immediately when a system is updated in LDAP, making diskless workstations work right after they are added to the required netgroup.  
-</para></listitem></itemizedlist></listitem>
-<listitem>
-<para>Provide script sitesummary2ldapdhcp to update or populate GOsa² with system objects using information gathered by sitesummary, to make it easier to add new computers to the network.  
+<para>
+FIXME: to be documented, if any 
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Features--More_software_changes">
-<title>More software changes
+<section id="Features--Other_changes">
+<title>Other changes
 </title>
 <itemizedlist>
 <listitem>
-<para>Add video editor Kdenlive 0.7.7  and interactive geometry tool Geogebra 3.2.42 
-</para></listitem>
-<listitem>
-<para>Change default package manager from adept to synaptic, to avoid getting two graphical package managers installed by default. 
-</para></listitem>
-<listitem>
-<para>Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in KDE. 
-</para></listitem>
-<listitem>
-<para>Change video player setup to install different players in KDE (dragonplayer), Gnome (totem) and LXDE (totem). 
-</para></listitem>
-<listitem>
-<para>Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the default KDE installation. 
-</para></listitem>
-<listitem>
-<para>Replace network-manager-kde with plasma-widget-networkmanagement in the standalone KDE profile 
-</para></listitem>
-<listitem>
-<para>Install usb-modeswitch on laptops to handle dual mode USB devices. 
-</para></listitem>
-<listitem>
-<para>Add cifs-utils to the default installation to ensure SMB mounting can work in any profile. 
-</para></listitem>
-<listitem>
-<para>Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, and valgrind from the default installation and the DVD to make room for higher priority packages. 
-</para></listitem>
-<listitem>
-<para>Drop libnss-mdns from stationary profiles, to make sure DNS is the authoritive source of host names. 
-</para></listitem>
-<listitem>
-<para><computeroutput>freerdp-x11</computeroutput> is installed by default as RDP and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was installed instead.) 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Features--Other_LDAP_related_changes">
-<title>Other LDAP related changes
-</title>
-<itemizedlist>
-<listitem>
-<para>Make the LDAP server handle more clients after increasing the server's file descriptor limit from 1024 to 32768.  
-</para></listitem>
-<listitem>
-<para>Add code to re-enable stopped CUPS queues every hour on the Main Server, and flush all CUPS queues every night. Both can be disabled in LDAP.  
-</para></listitem>
-<listitem>
-<para>Provide network blocking / exam mode by default, controlled by LDAP. In addition to network blocking, changes to the Squid proxy configuration is needed.  
-</para></listitem>
-<listitem>
-<para>Enable automatic extending of full file systems on the Main Server by default. This can be disabled in LDAP.  
-</para></listitem>
-<listitem>
-<para>Change SSL certificate name used by the LDAP server and adjust clients to use the new name to be able to enable certificate checking on clients. 
-</para></listitem>
-<listitem>
-<para>Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP setup used for DNS. 
-</para></listitem>
-<listitem>
-<para>Simplify autofs LDAP rules to make sure they work with extra home directory partitions exported from the main-server without any changes. 
-</para></listitem>
-<listitem>
-<para>Make backup system more robust in handling LDAP database dump and restart. 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Features--Other_changes">
-<title>Other changes
-</title>
-<itemizedlist>
-<listitem>
-<para>Root logins are denied for both KDM and GDM - see above and <link linkend="GettingStarted">Getting started</link> for details.  
-</para></listitem>
-<listitem>
-<para>Clients set up to shut down at night will stay up for at least an hour if they are turned on manually between 16:00 and 07:00. 
-</para></listitem>
-<listitem>
-<para>Additionally use local NTP clock on the main-server to ensure clients and server sync clocks also when disconnected from the Internet.  
-</para></listitem>
-<listitem>
-<para>Access to Debian repositories is always done via a proxy on the main server - read more about the implementation details <ulink url="http://lists.debian.org/20100704221022.GC30542@login1.uio.no">using DHCP and WPAD</ulink> 
-</para></listitem>
-<listitem>
-<para>The home0 partition is mounted nosuid, to increase security.  
-</para></listitem>
-<listitem>
-<para>Change KDE/Akonadi configuration to reduce the disk footprint of every user from 144 to 24 MiB.  
-</para></listitem>
-<listitem>
-<para>New tool notify-local-users to send desktop notification to all logged in users on a machine.  Useful for thin client servers. 
+<para>
+FIXME: to be documented, if any 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -3349,32 +3057,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-wheezy-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>Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language code). There are many tools for translating available; we suggest using <computeroutput>lokalize</computeroutput>. 
 </para>
-<para>Then you either commit the file directly to Subversion (if you have the rights to do so) or send the file to the bugreport. 
+<para>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>Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations. 
 </para>
 <para>Please keep in mind that this manual is still under development, so don't translate any string which contains "
 FIXME". <!-- <remark>status ignore</remark> --> 
 </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 +3093,8 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <title>Appendix A - The GNU General Public License
 </title><screen><![CDATA[Note to translators: there is no need to translate the GPL license text. ]]></screen>
 
-<section id="AppendixA--Manual_for_Debian_Edu_6.0.6.2B-r1_Codename_.22Squeeze.22">
-<title>Manual for Debian Edu 6.0.6+r1 Codename "Squeeze"
+<section id="AppendixA--Manual_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22">
+<title>Manual for Debian Edu 7.0.0+r0 Codename "Wheezy"
 </title>
 <para>Copyright (C) 2007-2013 Holger Levsen < <ulink url="mailto:holger at layer-acht.org">holger at layer-acht.org</ulink> > and others, see the <link linkend="CopyRight">Copyright chapter</link> for the full list of copyright owners. 
 </para>
@@ -3480,9 +3188,9 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 
 <section id="AppendixB">
-<title>Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet
+<title>Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet
 </title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Debian Edu Live CD/DVDs for Squeeze are not available at the moment. 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Debian Edu Live CD/DVDs for Wheezy are not available at the moment. 
 </para>
 
 <section id="AppendixB--Features_of_the_Standalone_image">
@@ -3571,14 +3279,14 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </title>
 <itemizedlist>
 <listitem>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> There are no squeeze images yet <inlinemediaobject><imageobject><imagedata fileref="./images/sad.png"/></imageobject><textobject><phrase>:(</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> There are no wheezy images yet <inlinemediaobject><imageobject><imagedata fileref="./images/sad.png"/></imageobject><textobject><phrase>:(</phrase></textobject></inlinemediaobject> 
 </para></listitem></itemizedlist>
 </section>
 
 <section id="AppendixB--Download">
 <title>Download
 </title>
-<para>The image is 1.2 GiB and would be (but currently isn't) available via <ulink url="ftp://ftp.skolelinux.org/cd-squeeze-live/">FTP</ulink>, <ulink url="http://ftp.skolelinux.org/cd-squeeze-live/">HTTP</ulink> or rsync from <computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-squeeze-live/</computeroutput>. 
+<para>The image is 1.2 GiB and would be (but currently isn't) available via <ulink url="ftp://ftp.skolelinux.org/cd-wheezy-live/">FTP</ulink>, <ulink url="http://ftp.skolelinux.org/cd-wheezy-live/">HTTP</ulink> or rsync from <computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-wheezy-live/</computeroutput>. 
 </para>
 </section>
 </section>
@@ -3587,6 +3295,412 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <title>Appendix C - Features in older releases
 </title>
 
+<section id="AppendixC--Changes_for_Debian_Edu_6.0.6.2B-r1_Codename_.22Squeeze.22_.2AUN.2Areleased_2013-0.3F-.3F.3F">
+<title>Changes for Debian Edu 6.0.6+r1 Codename "Squeeze" *UN*released 2013-0?-??
+</title>
+<para>
+FIXME: this paragraph is work in progress and will be copied from DebianEdu/Documentation/Squeeze/Features once its ready 
+</para>
+<itemizedlist>
+<listitem>
+<para>sitesummary was updated from 0.1.3 to 0.1.8 
+</para>
+<itemizedlist>
+<listitem>
+<para>Make Nagios configuration more robust and efficient 
+</para></listitem>
+<listitem>
+<para>Comply with 3.X kernel 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20120925~6.0.6+r0 
+</para>
+<itemizedlist>
+<listitem>
+<para>Minor updates from the wiki 
+</para></listitem>
+<listitem>
+<para>Danish translation now complete 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>debian-edu-config from 1.453 to 1.454 
+</para>
+<itemizedlist>
+<listitem>
+<para>Correct Kerberos user policy: don't expire password after 2 days. Closes: #664596 
+</para></listitem>
+<listitem>
+<para>Handle '#' characters in the root or first users password. Closes: #664976 
+</para></listitem>
+<listitem>
+<para>Fixes for gosa-sync: 
+</para>
+<itemizedlist>
+<listitem>
+<para>Don't fail if password contains " 
+</para></listitem>
+<listitem>
+<para>Don't disclose new password string in syslog 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Fixes for gosa-create: 
+</para>
+<itemizedlist>
+<listitem>
+<para>Invalidate libnss cache before applying changes 
+</para></listitem>
+<listitem>
+<para>Multiple failures during mass user import into GOsa² 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>gosa-netgroups plugin: don't erase entries of attribute type "memberNisNetgroup". Closes: #687256 
+</para></listitem>
+<listitem>
+<para>First user now uses the same Kerberos policy as all other users 
+</para></listitem>
+<listitem>
+<para>Add Danish web page 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>debian-edu-install from 1.528 to 1.529 
+</para>
+<itemizedlist>
+<listitem>
+<para>Improve preseeding support and documentation 
+</para></listitem></itemizedlist></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--New_features_for_Debian_Edu_6.0.4.2B-r0_Codename_.22Squeeze.22_released_2012-03-11">
+<title>New features for Debian Edu 6.0.4+r0 Codename "Squeeze" released 2012-03-11
+</title>
+
+<section id="AppendixC--User_visible_changes">
+<title>User visible changes
+</title>
+<itemizedlist>
+<listitem>
+<para>Updated artwork and new Debian Edu / Skolelinux logo, visible during installation, in the login screen and as desktop wallpaper. 
+</para></listitem>
+<listitem>
+<para>Replace LWAT with GOsa² as the LDAP administration interface. See below and the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#">Getting started chapter</ulink> of the manual for more information on GOsa². 
+</para></listitem>
+<listitem>
+<para>See below for a list of updated software. 
+</para></listitem>
+<listitem>
+<para>Show welcome page to users when they first log in. This default start page for Iceweasel is fetched from LDAP at installation and boot time for networked profiles. Set to <ulink url="http://www.skolelinux.org/"/> for Standalone installations.  
+</para></listitem>
+<listitem>
+<para>New LXDE desktop option, in addition to KDE (default) and Gnome. As the Gnome option, the LXDE desktop option is only supported by the CD installation method. 
+</para></listitem>
+<listitem>
+<para>Speed up LTSP client boot. 
+</para></listitem>
+<listitem>
+<para>Provide a KDE menu entry for changing the password in GOsa².  
+</para>
+<itemizedlist>
+<listitem>
+<para>For more information on how to change passwords (including expired passwords at the KDM/GDM login prompt), please see the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#">HowTos for users</ulink> chapter of the manual. 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Add link to <ulink url="http://linuxsignpost.org/"/> on the start page shown to new users. 
+</para></listitem>
+<listitem>
+<para>All LTSP servers are also <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service">RDP servers</ulink> by default. 
+</para></listitem>
+<listitem>
+<para>Improve handing of removable media on thin clients. Show desktop notification longer when inserting new media and provide an option to start dolphin when such media is inserted.  
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Installation_changes">
+<title>Installation changes
+</title>
+<itemizedlist>
+<listitem>
+<para>New version of debian-installer from Debian Squeeze, see <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink> for more details. 
+</para></listitem>
+<listitem>
+<para>Since root logins are no longer allowed when using gdm/kdm, a user in LDAP is set up during installation of the Main Server. This user is up as GOsa² administrator and is also granted sudo access. The Debian Edu menu reordering has been enabled as well, by adding the user also to the <computeroutput>teachers</computeroutput> group. 
+</para></listitem>
+<listitem>
+<para>The <computeroutput>.iso</computeroutput> images can directly be copied onto USB sticks, for example by using <computeroutput>dd</computeroutput> or even <computeroutput>cat</computeroutput>.. 
+</para></listitem>
+<listitem>
+<para>New roaming workstation profile for laptops. 
+</para></listitem>
+<listitem>
+<para>Device access for all users is handled by <ulink url="http://wiki.debian.org/PolicyKit#">PolicyKit</ulink>, and no extra group memberships are needed to get access to devices. 
+</para></listitem>
+<listitem>
+<para>A warning will be issued when installing on too small disks for the selected profile. 
+</para></listitem>
+<listitem>
+<para>Simplify partitioning for Standalone installs to only have a separate /home/ but no seperate /usr anymore.  
+</para></listitem>
+<listitem>
+<para>More tests in the test suite, and correct some of the tests that failed earlier.  
+</para></listitem>
+<listitem>
+<para>Make sure to report an error and abort the installation when trying to use the netinst images without a working Internet connection, instead of silently installing a broken system.  
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Software_updates">
+<title>Software updates
+</title>
+<itemizedlist>
+<listitem>
+<para>Everything which is new in Debian Squeeze: 
+</para>
+<itemizedlist>
+<listitem>
+<para>compatibility with the FHS v2.3 and software developed for version 3.2 of the LSB. 
+</para></listitem>
+<listitem>
+<para>Linux kernel 2.6.32 
+</para></listitem>
+<listitem>
+<para>Desktop environments KDE "Plasma" 4.4 and GNOME 2.30 
+</para></listitem>
+<listitem>
+<para>Web browser Iceweasel 3.5 
+</para></listitem>
+<listitem>
+<para>OpenOffice.org 3.2.1 
+</para></listitem>
+<listitem>
+<para>Educational toolbox GCompris 9.3 
+</para></listitem>
+<listitem>
+<para>Music creator Rosegarden 10.04.2 
+</para></listitem>
+<listitem>
+<para>Image editor Gimp 2.6.10 
+</para></listitem>
+<listitem>
+<para>Virtual universe Celestia 1.6.0 
+</para></listitem>
+<listitem>
+<para>Virtual stargazer Stellarium 0.10.4 
+</para></listitem>
+<listitem>
+<para>Debian Squeeze includes over 10,000 new packages available for installation, including the browser Chromium 
+</para></listitem></itemizedlist>
+<itemizedlist>
+<listitem>
+<para>More information about Debian Squeeze 6.0 is provided in the <ulink url="http://www.debian.org/releases/squeeze/releasenotes">release notes</ulink> and the <ulink url="http://www.debian.org/releases/squeeze/installmanual">installation manual</ulink>. 
+</para></listitem></itemizedlist></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Infrastructural_changes">
+<title>Infrastructural changes
+</title>
+<itemizedlist>
+<listitem>
+<para>The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past.  
+</para>
+<itemizedlist>
+<listitem>
+<para>The dynamic DHCP range was extended on the backbone network to around 4k IP addresses, and around 200 IP addresses for the thin client network.  
+</para></listitem>
+<listitem>
+<para>The DHCP network for 10.0.0.0/8 has been renamed from <computeroutput>barebone</computeroutput> to <computeroutput>intern</computeroutput> 
+</para></listitem>
+<listitem>
+<para>There are no pre-defined host entries for client systems in DNS anymore (staticXX, ..., dhcpYY...) 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>MIT Kerberos5 used for user authentication, enabled for: 
+</para>
+<itemizedlist>
+<listitem>
+<para>PAM 
+</para></listitem>
+<listitem>
+<para>IMAP 
+</para></listitem>
+<listitem>
+<para>SMTP 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>NFSv4, but without added Kerberos privacy/integrity/authentication.  The machines still have to be added to the <computeroutput>workstation</computeroutput> netgroup to be able to mount the home directories 
+</para></listitem>
+<listitem>
+<para>Full Samba NT4 domain support for Windows XP/Vista/7 
+</para></listitem>
+<listitem>
+<para>A complete PXE boot environment is setup when installing from the DVD, so that further installations can be done using PXE network installs only. A new script pxe-addfirmware is provided to support more hardware models needing firmware.  
+</para></listitem>
+<listitem>
+<para>Remove all hard coded settings on workstations, and configure workstations and roaming workstations using settings detected from the environment using DNS,  DHCP and LDAP.  See this <ulink url="http://people.skolelinux.org/pere/blog/No_hardcoded_config_on_Debian_Edu_clients.html">blog post with more information on the changes</ulink>. 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Documentation_and_translation_updates">
+<title>Documentation and translation updates
+</title>
+<itemizedlist>
+<listitem>
+<para>Translation updates for the templates used in the installer. These templates are now available in 28 languages. 
+</para></listitem>
+<listitem>
+<para>The Debian Edu Squeeze Manual has generally been cleaned up and improved. A proof-read with corrections was done by a native English linguist. 
+</para></listitem>
+<listitem>
+<para>The Debian Edu Squeeze Manual is fully translated to German, French and Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal and Spanish. 
+</para></listitem>
+<listitem>
+<para>Improvements to many language tasks, especially French and Danish. 
+</para></listitem>
+<listitem>
+<para>Improvements to the welcome web page shown at first logins.  
+</para>
+<itemizedlist>
+<listitem>
+<para>Add new Japanese, Portuguese and Catalan translations of the welcome web page. 
+</para></listitem></itemizedlist></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Regressions">
+<title>Regressions
+</title>
+<itemizedlist>
+<listitem>
+<para><ulink url="http://lists.debian.org/20100810061204.GD7929@login2.uio.no">CD and DVD installs are different</ulink> - the DVD is only suitable for installing a KDE environemnt. 
+</para></listitem>
+<listitem>
+<para>Drop support for <computeroutput>powerpc</computeroutput> architecture from netinst installation CDs. It is still possible to run Debian Edu on <computeroutput>powerpc</computeroutput>, but installation is less automated. 
+</para></listitem>
+<listitem>
+<para>Drop gtick in the default installation, because it doesn't work on thin clients (BTS #566335). 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--New_administration_tool:_GOsa.2BALI-">
+<title>New administration tool: GOsa²
+</title>
+<itemizedlist>
+<listitem>
+<para>gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, with: 
+</para>
+<itemizedlist>
+<listitem>
+<para>Fix DHCP host removal. Closes: #650258 
+</para></listitem>
+<listitem>
+<para>Backport user generator unicode character transliteration. Closes: #657086 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Customized GOsa² configuration to better suit the Debian Edu network architecture. 
+</para>
+<itemizedlist>
+<listitem>
+<para>GOsa² updates DNS and NFS exports immediately when a system is updated in LDAP, making diskless workstations work right after they are added to the required netgroup.  
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Provide script sitesummary2ldapdhcp to update or populate GOsa² with system objects using information gathered by sitesummary, to make it easier to add new computers to the network.  
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--More_software_changes">
+<title>More software changes
+</title>
+<itemizedlist>
+<listitem>
+<para>Add video editor Kdenlive 0.7.7  and interactive geometry tool Geogebra 3.2.42 
+</para></listitem>
+<listitem>
+<para>Change default package manager from adept to synaptic, to avoid getting two graphical package managers installed by default. 
+</para></listitem>
+<listitem>
+<para>Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in KDE. 
+</para></listitem>
+<listitem>
+<para>Change video player setup to install different players in KDE (dragonplayer), Gnome (totem) and LXDE (totem). 
+</para></listitem>
+<listitem>
+<para>Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the default KDE installation. 
+</para></listitem>
+<listitem>
+<para>Replace network-manager-kde with plasma-widget-networkmanagement in the standalone KDE profile 
+</para></listitem>
+<listitem>
+<para>Install usb-modeswitch on laptops to handle dual mode USB devices. 
+</para></listitem>
+<listitem>
+<para>Add cifs-utils to the default installation to ensure SMB mounting can work in any profile. 
+</para></listitem>
+<listitem>
+<para>Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, and valgrind from the default installation and the DVD to make room for higher priority packages. 
+</para></listitem>
+<listitem>
+<para>Drop libnss-mdns from stationary profiles, to make sure DNS is the authoritive source of host names. 
+</para></listitem>
+<listitem>
+<para><computeroutput>freerdp-x11</computeroutput> is installed by default as RDP and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was installed instead.) 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Other_LDAP_related_changes">
+<title>Other LDAP related changes
+</title>
+<itemizedlist>
+<listitem>
+<para>Make the LDAP server handle more clients after increasing the server's file descriptor limit from 1024 to 32768.  
+</para></listitem>
+<listitem>
+<para>Add code to re-enable stopped CUPS queues every hour on the Main Server, and flush all CUPS queues every night. Both can be disabled in LDAP.  
+</para></listitem>
+<listitem>
+<para>Provide network blocking / exam mode by default, controlled by LDAP. In addition to network blocking, changes to the Squid proxy configuration is needed.  
+</para></listitem>
+<listitem>
+<para>Enable automatic extending of full file systems on the Main Server by default. This can be disabled in LDAP.  
+</para></listitem>
+<listitem>
+<para>Change SSL certificate name used by the LDAP server and adjust clients to use the new name to be able to enable certificate checking on clients. 
+</para></listitem>
+<listitem>
+<para>Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP setup used for DNS. 
+</para></listitem>
+<listitem>
+<para>Simplify autofs LDAP rules to make sure they work with extra home directory partitions exported from the main-server without any changes. 
+</para></listitem>
+<listitem>
+<para>Make backup system more robust in handling LDAP database dump and restart. 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="AppendixC--Other_changes">
+<title>Other changes
+</title>
+<itemizedlist>
+<listitem>
+<para>Root logins are denied for both KDM and GDM - see above and <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#">Getting started</ulink> for details.  
+</para></listitem>
+<listitem>
+<para>Clients set up to shut down at night will stay up for at least an hour if they are turned on manually between 16:00 and 07:00. 
+</para></listitem>
+<listitem>
+<para>Additionally use local NTP clock on the main-server to ensure clients and server sync clocks also when disconnected from the Internet.  
+</para></listitem>
+<listitem>
+<para>Access to Debian repositories is always done via a proxy on the main server - read more about the implementation details <ulink url="http://lists.debian.org/20100704221022.GC30542@login1.uio.no">using DHCP and WPAD</ulink> 
+</para></listitem>
+<listitem>
+<para>The home0 partition is mounted nosuid, to increase security.  
+</para></listitem>
+<listitem>
+<para>Change KDE/Akonadi configuration to reduce the disk footprint of every user from 144 to 24 MiB.  
+</para></listitem>
+<listitem>
+<para>New tool notify-local-users to send desktop notification to all logged in users on a machine.  Useful for thin client servers. 
+</para></listitem></itemizedlist>
+</section>
+</section>
+
 <section id="AppendixC--New_in_Debian_Edu_5.0.6.2B-edu1_Codename_.22Lenny.22_released_2010-10-05">
 <title>New in Debian Edu 5.0.6+edu1 Codename "Lenny" released 2010-10-05
 </title>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
new file mode 100644
index 0000000..7a55452
--- /dev/null
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -0,0 +1,31 @@
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//AboutDebianEdu
+FIXME: we need a wheezy login shot here once we have new artwork 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
+FIXME: these download URLs need to be adapted for wheezy still... They currently don't work 
+FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny. 
+FIXME: these screenshots need to be redone once we have wheezy artwork 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Upgrades
+FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/NetworkClients
+FIXME: would it be better to explain user groups in Windows first with GOsa², and then with an example for the command line? 
+FIXME explain how to use profiles from global policies for Windows machines in the skolelinux network 
+FIXME: describe roaming profile key for the global policy editor here 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Features
+FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead. 
+FIXME: hopefully. h01ger is one it to ask gismo. 
+FIXME: to be documented, if any 
+FIXME languages. 
+FIXME: to be documented, if any 
+FIXME: to be documented, if any 
+FIXME: to be documented, if any 
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//AppendixC
+FIXME: this paragraph is work in progress and will be copied from DebianEdu/Documentation/Squeeze/Features once its ready 
+====================
+15 FIXMEs left to fix
+====================
diff --git a/documentation/debian-edu-squeeze/images/Debian_Edu_Network_Squeeze.png b/documentation/debian-edu-wheezy/images/Debian_Edu_Network_Wheezy.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/Debian_Edu_Network_Squeeze.png
copy to documentation/debian-edu-wheezy/images/Debian_Edu_Network_Wheezy.png
diff --git a/documentation/debian-edu-squeeze/images/alert.png b/documentation/debian-edu-wheezy/images/alert.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/alert.png
copy to documentation/debian-edu-wheezy/images/alert.png
diff --git a/documentation/debian-edu-squeeze/images/de/Debian_Edu_Network_Squeeze.png b/documentation/debian-edu-wheezy/images/de/Debian_Edu_Network_Wheezy.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/de/Debian_Edu_Network_Squeeze.png
copy to documentation/debian-edu-wheezy/images/de/Debian_Edu_Network_Wheezy.png
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
similarity index 96%
copy from documentation/debian-edu-squeeze/images/de/worldmap.png
copy to documentation/debian-edu-wheezy/images/de/worldmap.png
index acabfba..51bf3b2 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
similarity index 96%
copy from documentation/debian-edu-squeeze/images/es/worldmap.png
copy to documentation/debian-edu-wheezy/images/es/worldmap.png
index 1212c1d..a0b89cc 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/Debian_Edu_Network_Squeeze.png b/documentation/debian-edu-wheezy/images/fr/Debian_Edu_Network_Wheezy.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/fr/Debian_Edu_Network_Squeeze.png
copy to documentation/debian-edu-wheezy/images/fr/Debian_Edu_Network_Wheezy.png
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
similarity index 97%
copy from documentation/debian-edu-squeeze/images/fr/worldmap.png
copy to documentation/debian-edu-wheezy/images/fr/worldmap.png
index c9b1d83..c6d576b 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/sad.png b/documentation/debian-edu-wheezy/images/sad.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/sad.png
copy to documentation/debian-edu-wheezy/images/sad.png
diff --git a/documentation/debian-edu-squeeze/images/smile.png b/documentation/debian-edu-wheezy/images/smile.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/smile.png
copy to documentation/debian-edu-wheezy/images/smile.png
diff --git a/documentation/debian-edu-squeeze/images/source/Debian Edu Netzwerk_Squeeze_l10n.odg b/documentation/debian-edu-wheezy/images/source/Debian_Edu_Network_Wheezy.odg
similarity index 100%
copy from documentation/debian-edu-squeeze/images/source/Debian Edu Netzwerk_Squeeze_l10n.odg
copy to documentation/debian-edu-wheezy/images/source/Debian_Edu_Network_Wheezy.odg
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
similarity index 96%
copy from documentation/debian-edu-squeeze/images/worldmap.png
copy to documentation/debian-edu-wheezy/images/worldmap.png
index 6180794..3b2ef36 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/po4a.cfg b/documentation/debian-edu-wheezy/po4a.cfg
similarity index 77%
copy from documentation/debian-edu-squeeze/po4a.cfg
copy to documentation/debian-edu-wheezy/po4a.cfg
index af5d007..edb3673 100644
--- a/documentation/debian-edu-squeeze/po4a.cfg
+++ b/documentation/debian-edu-wheezy/po4a.cfg
@@ -1,5 +1,5 @@
 [po_directory] .
 
-[type: docbook] debian-edu-squeeze-manual.xml \
+[type: docbook] debian-edu-wheezy-manual.xml \
 	$lang:$lang.xml \
 	opt:"-o nodefault='<inlinemediaobject> <imagedata>' -o untranslated='<listitem> <inlinemediaobject> <imagedata>' -M UTF-8 -k 5"
diff --git a/documentation/rosegarden/README.rosegarden-manual-translations b/documentation/rosegarden/README.rosegarden-manual-translations
index 0a2e504..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:
@@ -31,9 +31,10 @@ How to start a translation
 Simply copy the POT file as a PO file:
 
 $ cp rosegarden-manual.pot rosegarden-manual.da.po	# create a new Danish PO file
-$ svn add rosegarden-manual.da.po				# add it to Subversion
+$ git add rosegarden-manual.da.po				# add it to the VCS
 $ vi rosegarden-manual.da.po					# better use Lokalize for this :)
-$ svn ci rosegarden-manual.da.po				# commit the new translation for the first time
+$ git commit rosegarden-manual.da.po				# commit the new translation for the first time
+$ git push								# update the remote repository
 
 
 
@@ -43,12 +44,13 @@ How to update the translations
 Update the translations every time before you start translating some new 
 strings:
 
-$ svn up					# update from Subversion, maybe someone else translated
+$ git pull					# update from the VCS, maybe someone else translated
 						# something or the English source was updated
 $ vi rosegarden-manual.da.po		# again, better use Lokalize 
 $ LINGUA=da make				# check the build and rewrap the PO file
-$ svn diff rosegarden-manual.da.po	# check the differences form the previous file
-$ svn ci rosegarden-manual.da.po	# commit your changes
+$ git diff rosegarden-manual.da.po	# check the differences from the previous file
+$ git commit rosegarden-manual.da.po	# commit changes to your local repository
+$ git push					# update the remote repository
 
 
 
@@ -83,7 +85,7 @@ TODO: filter out the fileref Attribute from the PO files
 Don't translate URLs - be careful: some wiki-URLs might be harder to notice 
 they are URLs.
 
-To "translate" images, add them to Subversion into the images/$CC/ directory, where 
+To "translate" images, add them to the VCS into the images/$CC/ directory, where 
 $CC is your language. They will be picked up automatically. 
 
 If you spot errors in the English version or see how it could be improved, 
@@ -92,10 +94,10 @@ http://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/ - an user acc
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
-If you cannot commit your work to Subversion directly, please file a bug against the
+If you cannot commit your work to the VCS directly, please file a bug against the
 debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach 
 the PO file to the bugreport. Instructions how to submit bugs are available
 at http://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2012-02-27
+-- Holger Levsen, holger at debian.org, last updated: 2013-02-08
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