[debian-edu-commits] debian-edu/debian-edu-doc.git (#176) - wheezy (branch) updated: 0.6.20070721-50-gf14e407

David Prévot taffit at alioth.debian.org
Sat Oct 5 12:13:45 UTC 2013


The branch, wheezy has been updated
       via  f14e407f0338d6eed8c54f15227a0c45711576d1 (commit)
      from  f4dd5e8afc0638b5f57caa8bc462c7ab2477fb64 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 documentation/release-manual/release-manual.de.po |  263 ++++++++++---------
 documentation/release-manual/release-manual.es.po |  282 ++++++++++++---------
 documentation/release-manual/release-manual.nb.po |  253 +++++++++---------
 documentation/release-manual/release-manual.xml   |   84 +++---
 4 files changed, 478 insertions(+), 404 deletions(-)

The diff of changes is:
diff --git a/documentation/release-manual/release-manual.de.po b/documentation/release-manual/release-manual.de.po
index 57ed9ee..6324f9d 100644
--- a/documentation/release-manual/release-manual.de.po
+++ b/documentation/release-manual/release-manual.de.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-10-07 12:28+0200\n"
+"POT-Creation-Date: 2007-10-10 13:51+0200\n"
 "PO-Revision-Date: 2007-07-26 22:49+0200\n"
 "Last-Translator: RalfGesellensetter <rages at arcor.de>\n"
 "Language-Team:  <de at li.org>\n"
@@ -24,15 +24,17 @@ msgid "DebianEdu/Documentation/Etch/AllInOne"
 msgstr "DebianEdu/Documentation/Etch/AllInOne"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:3 release-manual.xml:993
-msgid "Release manual for Debian-Edu etch 3.0 Codename \"Terra\""
+#: release-manual.xml:3 release-manual.xml:996
+#, fuzzy
+msgid "Release manual for Debian Edu etch 3.0 Codename \"Terra\""
 msgstr "Anleitung zum Release von Debian-Edu etch 3.0 Codename \"Terra\""
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:4
+#, fuzzy
 msgid ""
 "This is the (<emphasis>still incomplete </emphasis>) release manual for the "
-"Debian-Edu etch 3.0 release."
+"Debian Edu etch 3.0 release."
 msgstr ""
 "Dies ist das (<emphasis>noch unvollständige </emphasis>) Release Manual für "
 "das Debian-Edu etch 3.0 Release."
@@ -48,7 +50,7 @@ msgid "package on"
 msgstr "Paket auf"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:7 release-manual.xml:191
+#: release-manual.xml:7 release-manual.xml:191 release-manual.xml:969
 msgid "."
 msgstr ""
 
@@ -84,18 +86,20 @@ msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:14
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
-"Debian-Edu and Skolelinux"
+"Debian Edu and Skolelinux"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und "
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:17
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
-"ulink> - the design principles of Debian-Edu"
+"ulink> - the design principles of Debian Edu"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Netzwerktopologie </"
 "ulink> - Grundlagen der Architektur von Debian-Edu"
@@ -111,9 +115,10 @@ msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:23
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements </"
-"ulink> to run Debian-Edu"
+"ulink> to run Debian Edu"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Voraussetzungen</"
 "ulink> zum Betrieb von Debian-Edu"
@@ -150,7 +155,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
-"Debian-Edu sarge and woody"
+"Debian Edu sarge and woody"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrade </ulink> von "
 "<ulink url='/DebianEdu'>DebianEdu </ulink> sarge und woody"
@@ -166,9 +171,10 @@ msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:41
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
-"Debian-Edu"
+"Debian Edu"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Mitmachen </ulink> "
 "beiDebian-Edu"
@@ -214,7 +220,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixB'>Appendix B </ulink> - "
-"about the Debian Edu Live CD/DVDs"
+"about Debian Edu Live CD/DVDs"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Anhang A </ulink> - The "
 "GNU Public Licence"
@@ -232,14 +238,15 @@ msgstr ""
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:64
-msgid "About Debian-Edu and Skolelinux"
+#, fuzzy
+msgid "About Debian Edu and Skolelinux"
 msgstr "Über DebianEdu und Skolelinux"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:65
 #, fuzzy
 msgid ""
-"Skolelinux is the Debian-edu project's <ulink url='http://wiki.debian.net/"
+"Skolelinux is the Debian Edu project's <ulink url='http://wiki.debian.net/"
 "index.cgi?CustomDebian'>Custom Debian Distribution </ulink> (CDD) in "
 "development. What this means is that Skolelinux is a version of Debian whose "
 "out-of-the box environment gives you a completely configured school-network "
@@ -906,7 +913,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "FIXME: also link to <ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </"
-"ulink> change IP setup of Debian-Edu - but recommend against doing so."
+"ulink> change IP setup of Debian Edu - but recommend against doing so."
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </ulink> - einfache "
 "Schritt-fuer-Schritt Anleitungen"
@@ -922,7 +929,7 @@ msgid ""
 "We recommend to read or at least take a look at the <ulink url='http://www."
 "debian.org/releases/stable/releasenotes'>release notes for Debian etch </"
 "ulink> before you start installing a system for production use. If you just "
-"want to give Debian-Edu/Skolelinux a try, you don't have to though, it "
+"want to give Debian Edu/Skolelinux a try, you don't have to though, it "
 "should just work <inlinemediaobject>"
 msgstr ""
 
@@ -941,7 +948,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:252
-msgid "Download an installation media for Debian-edu etch 3.0r0"
+msgid "Download an installation media for Debian Edu etch 3.0r0"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
@@ -976,7 +983,7 @@ msgstr ""
 msgid ""
 "The powerpc port has not been tested as much as the other architectures, "
 "though it should work just fine and has been reported to work. Still, we "
-"consider the port an experimental release of Debian-Edu, which we might not "
+"consider the port an experimental release of Debian Edu, which we might not "
 "be able to support as the other archs."
 msgstr ""
 
@@ -1001,7 +1008,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><para><inlinemediaobject><textobject>
 #: release-manual.xml:305 release-manual.xml:360 release-manual.xml:705
-#: release-manual.xml:983
+#: release-manual.xml:986
 msgid "<phrase>:)  </phrase>"
 msgstr "<phrase>:)  </phrase>"
 
@@ -1033,7 +1040,7 @@ msgstr "Installations Optionen"
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:322
 msgid ""
-"When you do an Debian-Edu installation you have a few options to choose. But "
+"When you do an Debian Edu installation you have a few options to choose. But "
 "don't be afraid, there aren't many. We have done a good job hiding the "
 "complexity of Debian during the installation and beyond. Though, <ulink "
 "url='/DebianEdu'>DebianEdu </ulink> is Debian, if you want there are more "
@@ -1253,7 +1260,7 @@ msgstr ""
 #: release-manual.xml:458
 msgid ""
 "FIXME: Describe here, what needs to be done after the installation to use "
-"Debian-Edu for real."
+"Debian Edu for real."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
@@ -1490,7 +1497,7 @@ msgstr ""
 #: release-manual.xml:527
 msgid ""
 "Before explaining how to upgrade, please note, that you do this update on "
-"your productive server on your own risk. <emphasis role='strong'>Debian-Edu/"
+"your productive server on your own risk. <emphasis role='strong'>Debian Edu/"
 "Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by "
 "applicable law.  </emphasis>"
 msgstr ""
@@ -1517,7 +1524,7 @@ msgstr ""
 msgid ""
 "Also it might be wise to wait a bit and keep running sarge for some more "
 "weeks, so that others can test the upgrade, experience problems and document "
-"them here. Debian-Edu sarge will receive continued support for some time in "
+"them here. Debian Edu sarge will receive continued support for some time in "
 "the future, but when Debian <ulink url='http://www.debian.org/security/"
 "faq#lifespan'>ceases support for sarge </ulink>, Debian Edu will (have to) "
 "do that too. This is expected to happen in April 2008."
@@ -1525,7 +1532,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:534
-msgid "Upgrades from Debian-Edu sarge"
+msgid "Upgrades from Debian Edu sarge"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
@@ -1539,7 +1546,7 @@ msgstr ""
 msgid ""
 "In case of problems you could also read the <ulink url='http://www.debian."
 "org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
-"(Debian-Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
+"(Debian Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
 "if you are running a 2.4 kernel, you <emphasis>should </emphasis> read the "
 "<ulink url='http://www.debian.org/releases/stable/i386/release-notes/ch-"
 "information.en.html#s-upgrade-to-2.6'>notes on upgrading from kernel 2.4 to "
@@ -1881,13 +1888,13 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:659
-msgid "Upgrades from older Debian-Edu / Skolelinux installations"
+msgid "Upgrades from older Debian Edu / Skolelinux installations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:660
 msgid ""
-"Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
+"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/UpgradeFrom1.0'>http://"
 "wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0 </ulink>. Then upgrade to "
@@ -2607,7 +2614,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:899
-msgid "Join a local Debian-Edu team"
+msgid "Join a local Debian Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
@@ -2619,7 +2626,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:903
-msgid "Start a new local Debian-Edu team"
+msgid "Start a new local Debian Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
@@ -2799,7 +2806,7 @@ msgstr "Copyright dieses Dokuments"
 msgid ""
 "Fully translated versions of this document are not yet available, as the "
 "document itself is very incomplete. Incomplete translations for Norwegian "
-"Bokmål and Spanish exist."
+"Bokmål, Spanish and German exist."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
@@ -2825,14 +2832,16 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:968
+#, fuzzy
 msgid ""
-"for more information on this. There are many easy tools for translating."
+"for more information on this. There are many easy tools for translating, we "
+"suggest to use"
 msgstr ""
 "für weitere Einzelheiten. Zur Übersetzung gibt es mehrere einfache "
 "Hilfsprogramme."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:969
+#: release-manual.xml:970
 msgid ""
 "To update the translations you need to be a member of the alioth project"
 msgstr ""
@@ -2840,11 +2849,13 @@ msgstr ""
 "Mitgliedschaft beim Alioth-Projekt"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:970
+#: release-manual.xml:971
+#, fuzzy
 msgid ""
-". To work on them you just need to check them out anonymously from svn, "
-"create patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-"
-"edu at l.d.o </ulink> or file a bug against the debian-edu-doc package."
+". To translate, you just need to check out some files from from svn, create "
+"patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-edu at l."
+"d.o </ulink> - of course you can also file a bug against the debian-edu-doc "
+"package and attach the patch there.."
 msgstr ""
 ". Diese Dateien lassen sich einfach anonym aus dem SVN herunterladen, "
 "bearbeiten und anschließend an <ulink url='mailto:debian-edu at l.d.o'>debian-"
@@ -2852,67 +2863,81 @@ msgstr ""
 "dem Paket debian-edu-doc ein."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:972
-msgid "Checkout the source package with the following command:"
+#: release-manual.xml:973
+msgid "You can checkout the"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:974
+#, fuzzy
+msgid "source with the following command (you need to have the"
 msgstr "Das Quellpaket kann mit dem folgenden Befehl 'ausgecheckt' werden:"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:977
+#: release-manual.xml:975
+msgid "package installed for this to work):"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:980
 msgid "Then edit the"
 msgstr "Nun bearbeiten Sie  "
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:978
+#: release-manual.xml:981
+#, fuzzy
 msgid ""
-"and either commit it to svn (if you have the rights to do so) or send the "
-"file to the mailinglist."
+"(where you replace $CC with your language code) and either commit the file "
+"directly to svn (if you have the rights to do so) or send the file to the "
+"mailinglist or the BTS."
 msgstr ""
 "und reichen Sie die Änderung entweder ins SVN ein ('commit' bei "
 "entsprechenden Rechten im Alioth-Projekt)  oder senden Sie die Datei an die "
 "Mailingliste."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:979
+#: release-manual.xml:982
+#, fuzzy
 msgid ""
 "Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to "
 "find information how to create a new .po file for your language if there is "
-"none yet, and how to update it."
+"none yet, and how to update translations."
 msgstr ""
 "Lesen Sie /usr/share/doc/debian-edu-doc/README.release-manual-translations, "
 "um mehr darüber zu erfahren, wie man eine neue PO-Datei für eine weitere "
 "Sprache erzeugt bzw. eine bestehende ergänzt."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:981
+#: release-manual.xml:984
 msgid "Potential problems for translations"
 msgstr "Mögliche Probleme bei der Übersetzung"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:982
+#: release-manual.xml:985
 msgid ""
 "We will need to write sed-scripts (or something like that) to support "
 "different images for different translations. Laters <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:987
+#: release-manual.xml:990
 msgid "Please report any other showstoppers."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:990
+#: release-manual.xml:993
 #, fuzzy
 msgid "Appendix A - The GNU Public License"
 msgstr "Anhang A - The GNU Public Licence"
 
 # type: CDATA
-#: release-manual.xml:992
+#: release-manual.xml:995
 #, no-wrap
 msgid "Note to translators: there is no need to translate the GPL license text. ]]"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:994
+#: release-manual.xml:997
 msgid ""
 "Copyright (C) 2007 Holger Levsen < <ulink url='mailto:holger at layer-acht."
 "org'>holger at layer-acht.org </ulink> > and others, see <ulink url='http://"
@@ -2922,7 +2947,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:997
+#: release-manual.xml:1000
 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 "
@@ -2931,7 +2956,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:998
+#: release-manual.xml:1001
 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 "
@@ -2940,7 +2965,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:999
+#: release-manual.xml:1002
 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 "
@@ -2948,17 +2973,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1000
+#: release-manual.xml:1004
 msgid "GNU GENERAL PUBLIC LICENSE"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1001
+#: release-manual.xml:1005
 msgid "Version 2, June 1991"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1002
+#: release-manual.xml:1006
 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 "
@@ -2967,12 +2992,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1004
+#: release-manual.xml:1008
 msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1005
+#: release-manual.xml:1009
 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 "
@@ -2986,7 +3011,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1007
+#: release-manual.xml:1011
 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 "
@@ -2997,7 +3022,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1008
+#: release-manual.xml:1012
 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, "
@@ -3009,14 +3034,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1010
+#: release-manual.xml:1014
 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."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1011
+#: release-manual.xml:1015
 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 "
@@ -3025,7 +3050,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1013
+#: release-manual.xml:1017
 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 "
@@ -3033,7 +3058,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1015
+#: release-manual.xml:1019
 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 "
@@ -3042,7 +3067,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1017
+#: release-manual.xml:1021
 msgid ""
 "<emphasis role='strong'>c)  </emphasis> If the modified program normally "
 "reads commands interactively when run, you must cause it, when started "
@@ -3057,7 +3082,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1021
+#: release-manual.xml:1025
 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 "
@@ -3071,7 +3096,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1022
+#: release-manual.xml:1026
 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 "
@@ -3080,7 +3105,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1023
+#: release-manual.xml:1027
 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 "
@@ -3089,7 +3114,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1024
+#: release-manual.xml:1028
 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 "
@@ -3098,7 +3123,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1026
+#: release-manual.xml:1030
 msgid ""
 "<emphasis role='strong'>a)  </emphasis> Accompany it with the complete "
 "corresponding machine-readable source code, which must be distributed under "
@@ -3107,7 +3132,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1028
+#: release-manual.xml:1032
 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 "
@@ -3118,7 +3143,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1030
+#: release-manual.xml:1034
 msgid ""
 "<emphasis role='strong'>c)  </emphasis> Accompany it with the information "
 "you received as to the offer to distribute corresponding source code.  (This "
@@ -3128,7 +3153,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1034
+#: release-manual.xml:1038
 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 "
@@ -3142,7 +3167,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1035
+#: release-manual.xml:1039
 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 "
@@ -3152,7 +3177,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1036
+#: release-manual.xml:1040
 msgid ""
 "<emphasis role='strong'>4.  </emphasis> You may not copy, modify, "
 "sublicense, or distribute the Program except as expressly provided under "
@@ -3164,7 +3189,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1038
+#: release-manual.xml:1042
 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 "
@@ -3177,7 +3202,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1040
+#: release-manual.xml:1044
 msgid ""
 "<emphasis role='strong'>6.  </emphasis> Each time you redistribute the "
 "Program (or any work based on the Program), the recipient automatically "
@@ -3189,7 +3214,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1042
+#: release-manual.xml:1046
 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 "
@@ -3206,7 +3231,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1044
+#: release-manual.xml:1048
 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 "
@@ -3214,7 +3239,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1045
+#: release-manual.xml:1049
 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; "
@@ -3228,14 +3253,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1046
+#: release-manual.xml:1050
 msgid ""
 "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><para><section><section><para>
-#: release-manual.xml:1047
+#: release-manual.xml:1051
 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 "
@@ -3247,7 +3272,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1049
+#: release-manual.xml:1053
 msgid ""
 "<emphasis role='strong'>9.  </emphasis> The Free Software Foundation may "
 "publish revised and/or new versions of the General Public License from time "
@@ -3256,7 +3281,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1051
+#: release-manual.xml:1055
 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 "
@@ -3268,7 +3293,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1052
+#: release-manual.xml:1056
 msgid ""
 "<emphasis role='strong'>10.  </emphasis> If you wish to incorporate parts of "
 "the Program into other free programs whose distribution conditions are "
@@ -3281,7 +3306,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1056
+#: release-manual.xml:1060
 msgid ""
 "<emphasis role='strong'>11.  </emphasis> BECAUSE THE PROGRAM IS LICENSED "
 "FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
@@ -3295,7 +3320,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1058
+#: release-manual.xml:1062
 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 "
@@ -3309,39 +3334,39 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1061
+#: release-manual.xml:1065
 msgid "END OF TERMS AND CONDITIONS"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:1064
+#: release-manual.xml:1068
 msgid "Live DVD - Boot from CD to test the system"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1065
+#: release-manual.xml:1069
 msgid "Features of the Standalone image"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1070
+#: release-manual.xml:1074
 msgid "Activating translations and regional support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1071
+#: release-manual.xml:1075
 msgid "To activate a specific translation, boot using"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1072
+#: release-manual.xml:1076
 msgid ""
 "as a boot option, where ll_CC.UTF-8 is the locale name you want.  To "
 "aciviate a given keyboard layout, use the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1073
+#: release-manual.xml:1077
 msgid ""
 "option where KB is the wanted keyboard layout.  More information on this "
 "feature <ulink url='http://wiki.debian.org/DebianLive/l10n'>is available "
@@ -3350,102 +3375,102 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1085
+#: release-manual.xml:1089
 msgid "Norwegian Bokmål"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1087
+#: release-manual.xml:1091
 msgid "nb_NO.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1089 release-manual.xml:1096
+#: release-manual.xml:1093 release-manual.xml:1100
 msgid "no"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1092
+#: release-manual.xml:1096
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1094
+#: release-manual.xml:1098
 msgid "nn_NO.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1099
+#: release-manual.xml:1103
 msgid "German"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1101
+#: release-manual.xml:1105
 msgid "de_DE.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1103
+#: release-manual.xml:1107
 msgid "de"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1106
+#: release-manual.xml:1110
 msgid "French (France)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1108
+#: release-manual.xml:1112
 msgid "fr_FR.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1110 release-manual.xml:1117 release-manual.xml:1124
-msgid "?"
+#: release-manual.xml:1114 release-manual.xml:1121 release-manual.xml:1128
+msgid "? (FIXME)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1113
+#: release-manual.xml:1117
 msgid "Greek (Greece)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1115
+#: release-manual.xml:1119
 msgid "el_GR.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1120
+#: release-manual.xml:1124
 msgid "Japanese"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1122
+#: release-manual.xml:1126
 msgid "ja_JP.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1127
+#: release-manual.xml:1131
 msgid "Northern Sami (Norway)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1129
+#: release-manual.xml:1133
 msgid "se_NO"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1131
+#: release-manual.xml:1135
 msgid "no(smi)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1137
+#: release-manual.xml:1141
 msgid "A complete list of locale codes is available in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1138
+#: release-manual.xml:1142
 msgid ""
 ", but only the UTF-8 locales are supported by the live images. Not all "
 "locales have translations installed, though.  The keyboard layout names can "
@@ -3453,26 +3478,26 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1140
+#: release-manual.xml:1144
 msgid "Stuff to know"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1144
+#: release-manual.xml:1148
 msgid "Known issues with the image"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1148
+#: release-manual.xml:1152
 msgid "Download"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1149
+#: release-manual.xml:1153
 msgid ""
 "The image is 1.2 GiB and available using <ulink url='ftp://ftp.skolelinux.no/"
 "cd-etch-live/'>FTP </ulink>, <ulink url='http://ftp.skolelinux.no/cd-etch-"
-"live/'>HTTP </ulink> or rsync from ftp.skolelinux.org in the cd-etch-live/."
+"live/'>HTTP </ulink> or rsync from ftp.skolelinux.org at cd-etch-live/."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
diff --git a/documentation/release-manual/release-manual.es.po b/documentation/release-manual/release-manual.es.po
index 5d9a22d..abe8431 100644
--- a/documentation/release-manual/release-manual.es.po
+++ b/documentation/release-manual/release-manual.es.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-10-07 12:28+0200\n"
+"POT-Creation-Date: 2007-10-10 13:51+0200\n"
 "PO-Revision-Date: 2007-07-22 10:19+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <es at li.org>\n"
@@ -19,15 +19,17 @@ msgid "DebianEdu/Documentation/Etch/AllInOne"
 msgstr "DebianEdu/Documentación/Etch/TodoJunto"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:3 release-manual.xml:993
-msgid "Release manual for Debian-Edu etch 3.0 Codename \"Terra\""
+#: release-manual.xml:3 release-manual.xml:996
+#, fuzzy
+msgid "Release manual for Debian Edu etch 3.0 Codename \"Terra\""
 msgstr "Manual para Debian-Edu etch 3.0 también llamado \"Terra\""
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:4
+#, fuzzy
 msgid ""
 "This is the (<emphasis>still incomplete </emphasis>) release manual for the "
-"Debian-Edu etch 3.0 release."
+"Debian Edu etch 3.0 release."
 msgstr ""
 "Esta es el manual (<emphasis>aun incompleto </emphasis>) para el lanzamiento "
 "de  Debian-Edu etch 3.0."
@@ -43,7 +45,7 @@ msgid "package on"
 msgstr "paquete en"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:7 release-manual.xml:191
+#: release-manual.xml:7 release-manual.xml:191 release-manual.xml:969
 msgid "."
 msgstr ""
 
@@ -78,18 +80,20 @@ msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:14
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
-"Debian-Edu and Skolelinux"
+"Debian Edu and Skolelinux"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>Acerca de </ulink> "
 "Debian-Edu y Skolelinux"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:17
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
-"ulink> - the design principles of Debian-Edu"
+"ulink> - the design principles of Debian Edu"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Arquitectura </"
 "ulink> - Las bases de diseño de Debian-Edu"
@@ -105,9 +109,10 @@ msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:23
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements </"
-"ulink> to run Debian-Edu"
+"ulink> to run Debian Edu"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requisitos </"
 "ulink>para usar Debian-Edu"
@@ -145,7 +150,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
-"Debian-Edu sarge and woody"
+"Debian Edu sarge and woody"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Actualizaciones </ulink> "
 "desde <ulink url='/DebianEdu'>DebianEdu </ulink> sarge y woody"
@@ -161,9 +166,10 @@ msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:41
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
-"Debian-Edu"
+"Debian Edu"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribuir </ulink> a "
 "Debian-Edu"
@@ -209,7 +215,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixB'>Appendix B </ulink> - "
-"about the Debian Edu Live CD/DVDs"
+"about Debian Edu Live CD/DVDs"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Apéndice A </ulink> - "
 "The GNU Public Licence"
@@ -227,14 +233,15 @@ msgstr ""
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:64
-msgid "About Debian-Edu and Skolelinux"
+#, fuzzy
+msgid "About Debian Edu and Skolelinux"
 msgstr "Acerca de DebianEdu y Skolelinux"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:65
 #, fuzzy
 msgid ""
-"Skolelinux is the Debian-edu project's <ulink url='http://wiki.debian.net/"
+"Skolelinux is the Debian Edu project's <ulink url='http://wiki.debian.net/"
 "index.cgi?CustomDebian'>Custom Debian Distribution </ulink> (CDD) in "
 "development. What this means is that Skolelinux is a version of Debian whose "
 "out-of-the box environment gives you a completely configured school-network "
@@ -1072,7 +1079,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "FIXME: also link to <ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </"
-"ulink> change IP setup of Debian-Edu - but recommend against doing so."
+"ulink> change IP setup of Debian Edu - but recommend against doing so."
 msgstr ""
 "POR HACER: enlazar también a <ulink url='/HowTo'>Como </ulink> cambiar la "
 "configuración Ip de Debian-Edu - pero recomendar con insistencia que no se "
@@ -1090,7 +1097,7 @@ msgid ""
 "We recommend to read or at least take a look at the <ulink url='http://www."
 "debian.org/releases/stable/releasenotes'>release notes for Debian etch </"
 "ulink> before you start installing a system for production use. If you just "
-"want to give Debian-Edu/Skolelinux a try, you don't have to though, it "
+"want to give Debian Edu/Skolelinux a try, you don't have to though, it "
 "should just work <inlinemediaobject>"
 msgstr ""
 "Recomendamos leer, o al menos echar un vistazo a las <ulink url='http://www."
@@ -1117,7 +1124,8 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:252
-msgid "Download an installation media for Debian-edu etch 3.0r0"
+#, fuzzy
+msgid "Download an installation media for Debian Edu etch 3.0r0"
 msgstr "Descargar un formato de instalación para Debian-edu etch 3.0r0"
 
 # type: Content of: <article><para><section><section><section><title>
@@ -1151,10 +1159,11 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:290
+#, fuzzy
 msgid ""
 "The powerpc port has not been tested as much as the other architectures, "
 "though it should work just fine and has been reported to work. Still, we "
-"consider the port an experimental release of Debian-Edu, which we might not "
+"consider the port an experimental release of Debian Edu, which we might not "
 "be able to support as the other archs."
 msgstr ""
 "La versión powerpc no se ha probado tanto como las otras arquitecturas, "
@@ -1183,7 +1192,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
 #: release-manual.xml:305 release-manual.xml:360 release-manual.xml:705
-#: release-manual.xml:983
+#: release-manual.xml:986
 msgid "<phrase>:)  </phrase>"
 msgstr "<phrase>:)  </phrase>"
 
@@ -1216,8 +1225,9 @@ msgstr "Opciones de instalación"
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:322
+#, fuzzy
 msgid ""
-"When you do an Debian-Edu installation you have a few options to choose. But "
+"When you do an Debian Edu installation you have a few options to choose. But "
 "don't be afraid, there aren't many. We have done a good job hiding the "
 "complexity of Debian during the installation and beyond. Though, <ulink "
 "url='/DebianEdu'>DebianEdu </ulink> is Debian, if you want there are more "
@@ -1449,9 +1459,10 @@ msgstr "Para empezar"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:458
+#, fuzzy
 msgid ""
 "FIXME: Describe here, what needs to be done after the installation to use "
-"Debian-Edu for real."
+"Debian Edu for real."
 msgstr ""
 "POR CORREGIR: Describir aquí lo que haya que hacer después de la instalación "
 "para usar Debian-Edu en la práctica."
@@ -1735,9 +1746,10 @@ msgstr "Actualizaciones"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:527
+#, fuzzy
 msgid ""
 "Before explaining how to upgrade, please note, that you do this update on "
-"your productive server on your own risk. <emphasis role='strong'>Debian-Edu/"
+"your productive server on your own risk. <emphasis role='strong'>Debian Edu/"
 "Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by "
 "applicable law.  </emphasis>"
 msgstr ""
@@ -1776,7 +1788,7 @@ msgstr ""
 msgid ""
 "Also it might be wise to wait a bit and keep running sarge for some more "
 "weeks, so that others can test the upgrade, experience problems and document "
-"them here. Debian-Edu sarge will receive continued support for some time in "
+"them here. Debian Edu sarge will receive continued support for some time in "
 "the future, but when Debian <ulink url='http://www.debian.org/security/"
 "faq#lifespan'>ceases support for sarge </ulink>, Debian Edu will (have to) "
 "do that too. This is expected to happen in April 2008."
@@ -1788,7 +1800,8 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:534
-msgid "Upgrades from Debian-Edu sarge"
+#, fuzzy
+msgid "Upgrades from Debian Edu sarge"
 msgstr "Actualizar desde Debian-Edu sarge"
 
 # type: Content of: <article><para><section><section><para>
@@ -1800,10 +1813,11 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:536
+#, fuzzy
 msgid ""
 "In case of problems you could also read the <ulink url='http://www.debian."
 "org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
-"(Debian-Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
+"(Debian Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
 "if you are running a 2.4 kernel, you <emphasis>should </emphasis> read the "
 "<ulink url='http://www.debian.org/releases/stable/i386/release-notes/ch-"
 "information.en.html#s-upgrade-to-2.6'>notes on upgrading from kernel 2.4 to "
@@ -2219,13 +2233,15 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:659
-msgid "Upgrades from older Debian-Edu / Skolelinux installations"
+#, fuzzy
+msgid "Upgrades from older Debian Edu / Skolelinux installations"
 msgstr "Actualizar desde instalaciones antiguas de Debian-Edu / Skolelinux"
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:660
+#, fuzzy
 msgid ""
-"Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
+"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/UpgradeFrom1.0'>http://"
 "wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0 </ulink>. Then upgrade to "
@@ -3029,7 +3045,8 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:899
-msgid "Join a local Debian-Edu team"
+#, fuzzy
+msgid "Join a local Debian Edu team"
 msgstr "Unirse a un equipo local de Debian-Edu"
 
 # type: Content of: <article><para><section><section><para>
@@ -3043,7 +3060,8 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:903
-msgid "Start a new local Debian-Edu team"
+#, fuzzy
+msgid "Start a new local Debian Edu team"
 msgstr "Comenzar un nuevo equipo local de debian-edu"
 
 # type: Content of: <article><para><section><section><para>
@@ -3247,10 +3265,11 @@ msgstr "Traducciones de este documento"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:964
+#, fuzzy
 msgid ""
 "Fully translated versions of this document are not yet available, as the "
 "document itself is very incomplete. Incomplete translations for Norwegian "
-"Bokmål and Spanish exist."
+"Bokmål, Spanish and German exist."
 msgstr ""
 "Todavía no están disponibles traducciones de este documento, puesto que el "
 "propio documento está incompleto. Hay traducciones incompletas para noruego "
@@ -3278,54 +3297,70 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:968
+#, fuzzy
 msgid ""
-"for more information on this. There are many easy tools for translating."
+"for more information on this. There are many easy tools for translating, we "
+"suggest to use"
 msgstr ""
 "para más información sobre ello. Hay muchas herramientas fáciles de usar "
 "para traducir."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:969
+#: release-manual.xml:970
 msgid ""
 "To update the translations you need to be a member of the alioth project"
 msgstr ""
 "Para actualizar las traducciones debe ser un miembro del proyecto alioth"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:970
+#: release-manual.xml:971
+#, fuzzy
 msgid ""
-". To work on them you just need to check them out anonymously from svn, "
-"create patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-"
-"edu at l.d.o </ulink> or file a bug against the debian-edu-doc package."
+". To translate, you just need to check out some files from from svn, create "
+"patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-edu at l."
+"d.o </ulink> - of course you can also file a bug against the debian-edu-doc "
+"package and attach the patch there.."
 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><para><section><section><para>
-#: release-manual.xml:972
-msgid "Checkout the source package with the following command:"
+#: release-manual.xml:973
+msgid "You can checkout the"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:974
+#, fuzzy
+msgid "source with the following command (you need to have the"
 msgstr "Descargue los fuentes del paquete con este comando:"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:977
+#: release-manual.xml:975
+msgid "package installed for this to work):"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:980
 msgid "Then edit the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:978
+#: release-manual.xml:981
 msgid ""
-"and either commit it to svn (if you have the rights to do so) or send the "
-"file to the mailinglist."
+"(where you replace $CC with your language code) and either commit the file "
+"directly to svn (if you have the rights to do so) or send the file to the "
+"mailinglist or the BTS."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:979
+#: release-manual.xml:982
 #, fuzzy
 msgid ""
 "Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to "
 "find information how to create a new .po file for your language if there is "
-"none yet, and how to update it."
+"none yet, and how to update translations."
 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 "
@@ -3334,12 +3369,12 @@ msgstr ""
 "mimetype=xml/docbook'>los fuentes </ulink>."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:981
+#: release-manual.xml:984
 msgid "Potential problems for translations"
 msgstr "Problemas potenciales para los traductores"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:982
+#: release-manual.xml:985
 msgid ""
 "We will need to write sed-scripts (or something like that) to support "
 "different images for different translations. Laters <inlinemediaobject>"
@@ -3348,24 +3383,24 @@ msgstr ""
 "diferentes imágenes con diferentes traducciones <inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:987
+#: release-manual.xml:990
 msgid "Please report any other showstoppers."
 msgstr "Por favor, informa de otros posibles fallos importantes."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:990
+#: release-manual.xml:993
 #, fuzzy
 msgid "Appendix A - The GNU Public License"
 msgstr "Apéndice A - La Licencia Pública GNU (GPL)"
 
 # type: CDATA
-#: release-manual.xml:992
+#: release-manual.xml:995
 #, no-wrap
 msgid "Note to translators: there is no need to translate the GPL license text. ]]"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:994
+#: release-manual.xml:997
 #, fuzzy
 msgid ""
 "Copyright (C) 2007 Holger Levsen < <ulink url='mailto:holger at layer-acht."
@@ -3379,7 +3414,7 @@ msgstr ""
 "DebianEdu/Documentation/Etch/ </ulink> <inlinemediaobject>"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:997
+#: release-manual.xml:1000
 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 "
@@ -3388,7 +3423,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:998
+#: release-manual.xml:1001
 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 "
@@ -3397,7 +3432,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:999
+#: release-manual.xml:1002
 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 "
@@ -3405,17 +3440,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1000
+#: release-manual.xml:1004
 msgid "GNU GENERAL PUBLIC LICENSE"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1001
+#: release-manual.xml:1005
 msgid "Version 2, June 1991"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1002
+#: release-manual.xml:1006
 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 "
@@ -3424,12 +3459,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1004
+#: release-manual.xml:1008
 msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1005
+#: release-manual.xml:1009
 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 "
@@ -3443,7 +3478,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1007
+#: release-manual.xml:1011
 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 "
@@ -3454,7 +3489,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1008
+#: release-manual.xml:1012
 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, "
@@ -3466,14 +3501,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1010
+#: release-manual.xml:1014
 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."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1011
+#: release-manual.xml:1015
 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 "
@@ -3482,7 +3517,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1013
+#: release-manual.xml:1017
 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 "
@@ -3490,7 +3525,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1015
+#: release-manual.xml:1019
 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 "
@@ -3499,7 +3534,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1017
+#: release-manual.xml:1021
 msgid ""
 "<emphasis role='strong'>c)  </emphasis> If the modified program normally "
 "reads commands interactively when run, you must cause it, when started "
@@ -3514,7 +3549,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1021
+#: release-manual.xml:1025
 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 "
@@ -3528,7 +3563,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1022
+#: release-manual.xml:1026
 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 "
@@ -3537,7 +3572,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1023
+#: release-manual.xml:1027
 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 "
@@ -3546,7 +3581,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1024
+#: release-manual.xml:1028
 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 "
@@ -3555,7 +3590,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1026
+#: release-manual.xml:1030
 msgid ""
 "<emphasis role='strong'>a)  </emphasis> Accompany it with the complete "
 "corresponding machine-readable source code, which must be distributed under "
@@ -3564,7 +3599,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1028
+#: release-manual.xml:1032
 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 "
@@ -3575,7 +3610,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1030
+#: release-manual.xml:1034
 msgid ""
 "<emphasis role='strong'>c)  </emphasis> Accompany it with the information "
 "you received as to the offer to distribute corresponding source code.  (This "
@@ -3585,7 +3620,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1034
+#: release-manual.xml:1038
 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 "
@@ -3599,7 +3634,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1035
+#: release-manual.xml:1039
 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 "
@@ -3609,7 +3644,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1036
+#: release-manual.xml:1040
 msgid ""
 "<emphasis role='strong'>4.  </emphasis> You may not copy, modify, "
 "sublicense, or distribute the Program except as expressly provided under "
@@ -3621,7 +3656,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1038
+#: release-manual.xml:1042
 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 "
@@ -3634,7 +3669,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1040
+#: release-manual.xml:1044
 msgid ""
 "<emphasis role='strong'>6.  </emphasis> Each time you redistribute the "
 "Program (or any work based on the Program), the recipient automatically "
@@ -3646,7 +3681,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1042
+#: release-manual.xml:1046
 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 "
@@ -3663,7 +3698,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1044
+#: release-manual.xml:1048
 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 "
@@ -3671,7 +3706,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1045
+#: release-manual.xml:1049
 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; "
@@ -3685,14 +3720,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1046
+#: release-manual.xml:1050
 msgid ""
 "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><para><section><section><para>
-#: release-manual.xml:1047
+#: release-manual.xml:1051
 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 "
@@ -3704,7 +3739,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1049
+#: release-manual.xml:1053
 msgid ""
 "<emphasis role='strong'>9.  </emphasis> The Free Software Foundation may "
 "publish revised and/or new versions of the General Public License from time "
@@ -3713,7 +3748,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1051
+#: release-manual.xml:1055
 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 "
@@ -3725,7 +3760,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1052
+#: release-manual.xml:1056
 msgid ""
 "<emphasis role='strong'>10.  </emphasis> If you wish to incorporate parts of "
 "the Program into other free programs whose distribution conditions are "
@@ -3738,7 +3773,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1056
+#: release-manual.xml:1060
 msgid ""
 "<emphasis role='strong'>11.  </emphasis> BECAUSE THE PROGRAM IS LICENSED "
 "FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
@@ -3752,7 +3787,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1058
+#: release-manual.xml:1062
 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 "
@@ -3766,39 +3801,39 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1061
+#: release-manual.xml:1065
 msgid "END OF TERMS AND CONDITIONS"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:1064
+#: release-manual.xml:1068
 msgid "Live DVD - Boot from CD to test the system"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1065
+#: release-manual.xml:1069
 msgid "Features of the Standalone image"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1070
+#: release-manual.xml:1074
 msgid "Activating translations and regional support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1071
+#: release-manual.xml:1075
 msgid "To activate a specific translation, boot using"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1072
+#: release-manual.xml:1076
 msgid ""
 "as a boot option, where ll_CC.UTF-8 is the locale name you want.  To "
 "aciviate a given keyboard layout, use the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1073
+#: release-manual.xml:1077
 msgid ""
 "option where KB is the wanted keyboard layout.  More information on this "
 "feature <ulink url='http://wiki.debian.org/DebianLive/l10n'>is available "
@@ -3807,103 +3842,104 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1085
+#: release-manual.xml:1089
 msgid "Norwegian Bokmål"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1087
+#: release-manual.xml:1091
 msgid "nb_NO.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1089 release-manual.xml:1096
+#: release-manual.xml:1093 release-manual.xml:1100
 msgid "no"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1092
+#: release-manual.xml:1096
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1094
+#: release-manual.xml:1098
 msgid "nn_NO.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1099
+#: release-manual.xml:1103
 #, fuzzy
 msgid "German"
 msgstr "en alemán"
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1101
+#: release-manual.xml:1105
 msgid "de_DE.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1103
+#: release-manual.xml:1107
 msgid "de"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1106
+#: release-manual.xml:1110
 msgid "French (France)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1108
+#: release-manual.xml:1112
 msgid "fr_FR.UTF-8"
 msgstr ""
 
-# type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1110 release-manual.xml:1117 release-manual.xml:1124
-msgid "?"
-msgstr ""
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:1114 release-manual.xml:1121 release-manual.xml:1128
+#, fuzzy
+msgid "? (FIXME)"
+msgstr "POR CORREGIR"
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1113
+#: release-manual.xml:1117
 msgid "Greek (Greece)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1115
+#: release-manual.xml:1119
 msgid "el_GR.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1120
+#: release-manual.xml:1124
 msgid "Japanese"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1122
+#: release-manual.xml:1126
 msgid "ja_JP.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1127
+#: release-manual.xml:1131
 msgid "Northern Sami (Norway)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1129
+#: release-manual.xml:1133
 msgid "se_NO"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1131
+#: release-manual.xml:1135
 msgid "no(smi)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1137
+#: release-manual.xml:1141
 msgid "A complete list of locale codes is available in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1138
+#: release-manual.xml:1142
 msgid ""
 ", but only the UTF-8 locales are supported by the live images. Not all "
 "locales have translations installed, though.  The keyboard layout names can "
@@ -3911,26 +3947,26 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1140
+#: release-manual.xml:1144
 msgid "Stuff to know"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1144
+#: release-manual.xml:1148
 msgid "Known issues with the image"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1148
+#: release-manual.xml:1152
 msgid "Download"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1149
+#: release-manual.xml:1153
 msgid ""
 "The image is 1.2 GiB and available using <ulink url='ftp://ftp.skolelinux.no/"
 "cd-etch-live/'>FTP </ulink>, <ulink url='http://ftp.skolelinux.no/cd-etch-"
-"live/'>HTTP </ulink> or rsync from ftp.skolelinux.org in the cd-etch-live/."
+"live/'>HTTP </ulink> or rsync from ftp.skolelinux.org at cd-etch-live/."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
@@ -3961,10 +3997,6 @@ msgstr ""
 #~ msgid ". The old one named wlus required"
 #~ msgstr ". El antiguo nombre wlus necesitaba"
 
-# type: Content of: <article><para><section><section><para>
-#~ msgid "FIXME"
-#~ msgstr "POR CORREGIR"
-
 # type: Content of: <article><para><section><para>
 #~ msgid ""
 #~ ". (The version at <ulink url='http://wiki.skolelinux.no/DebianEdu/"
diff --git a/documentation/release-manual/release-manual.nb.po b/documentation/release-manual/release-manual.nb.po
index 7a2c02a..f80209a 100644
--- a/documentation/release-manual/release-manual.nb.po
+++ b/documentation/release-manual/release-manual.nb.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-10-07 12:28+0200\n"
+"POT-Creation-Date: 2007-10-10 13:51+0200\n"
 "PO-Revision-Date: 2007-07-14 11:34MET\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -17,16 +17,16 @@ msgstr ""
 msgid "DebianEdu/Documentation/Etch/AllInOne"
 msgstr ""
 
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:3 release-manual.xml:993
-msgid "Release manual for Debian-Edu etch 3.0 Codename \"Terra\""
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:3 release-manual.xml:996
+msgid "Release manual for Debian Edu etch 3.0 Codename \"Terra\""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:4
 msgid ""
 "This is the (<emphasis>still incomplete </emphasis>) release manual for the "
-"Debian-Edu etch 3.0 release."
+"Debian Edu etch 3.0 release."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
@@ -40,7 +40,7 @@ msgid "package on"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:7 release-manual.xml:191
+#: release-manual.xml:7 release-manual.xml:191 release-manual.xml:969
 msgid "."
 msgstr ""
 
@@ -70,14 +70,14 @@ msgstr ""
 #: release-manual.xml:14
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
-"Debian-Edu and Skolelinux"
+"Debian Edu and Skolelinux"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:17
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
-"ulink> - the design principles of Debian-Edu"
+"ulink> - the design principles of Debian Edu"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
@@ -91,7 +91,7 @@ msgstr ""
 #: release-manual.xml:23
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements </"
-"ulink> to run Debian-Edu"
+"ulink> to run Debian Edu"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
@@ -119,7 +119,7 @@ msgstr ""
 #: release-manual.xml:35
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
-"Debian-Edu sarge and woody"
+"Debian Edu sarge and woody"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
@@ -133,7 +133,7 @@ msgstr ""
 #: release-manual.xml:41
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
-"Debian-Edu"
+"Debian Edu"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
@@ -168,7 +168,7 @@ msgstr ""
 #: release-manual.xml:56
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixB'>Appendix B </ulink> - "
-"about the Debian Edu Live CD/DVDs"
+"about Debian Edu Live CD/DVDs"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
@@ -181,13 +181,13 @@ msgstr ""
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:64
-msgid "About Debian-Edu and Skolelinux"
+msgid "About Debian Edu and Skolelinux"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:65
 msgid ""
-"Skolelinux is the Debian-edu project's <ulink url='http://wiki.debian.net/"
+"Skolelinux is the Debian Edu project's <ulink url='http://wiki.debian.net/"
 "index.cgi?CustomDebian'>Custom Debian Distribution </ulink> (CDD) in "
 "development. What this means is that Skolelinux is a version of Debian whose "
 "out-of-the box environment gives you a completely configured school-network "
@@ -780,7 +780,7 @@ msgstr ""
 #: release-manual.xml:236
 msgid ""
 "FIXME: also link to <ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </"
-"ulink> change IP setup of Debian-Edu - but recommend against doing so."
+"ulink> change IP setup of Debian Edu - but recommend against doing so."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
@@ -794,7 +794,7 @@ msgid ""
 "We recommend to read or at least take a look at the <ulink url='http://www."
 "debian.org/releases/stable/releasenotes'>release notes for Debian etch </"
 "ulink> before you start installing a system for production use. If you just "
-"want to give Debian-Edu/Skolelinux a try, you don't have to though, it "
+"want to give Debian Edu/Skolelinux a try, you don't have to though, it "
 "should just work <inlinemediaobject>"
 msgstr ""
 
@@ -813,7 +813,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:252
-msgid "Download an installation media for Debian-edu etch 3.0r0"
+msgid "Download an installation media for Debian Edu etch 3.0r0"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
@@ -848,7 +848,7 @@ msgstr ""
 msgid ""
 "The powerpc port has not been tested as much as the other architectures, "
 "though it should work just fine and has been reported to work. Still, we "
-"consider the port an experimental release of Debian-Edu, which we might not "
+"consider the port an experimental release of Debian Edu, which we might not "
 "be able to support as the other archs."
 msgstr ""
 
@@ -873,7 +873,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
 #: release-manual.xml:305 release-manual.xml:360 release-manual.xml:705
-#: release-manual.xml:983
+#: release-manual.xml:986
 msgid "<phrase>:)  </phrase>"
 msgstr ""
 
@@ -905,7 +905,7 @@ msgstr ""
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:322
 msgid ""
-"When you do an Debian-Edu installation you have a few options to choose. But "
+"When you do an Debian Edu installation you have a few options to choose. But "
 "don't be afraid, there aren't many. We have done a good job hiding the "
 "complexity of Debian during the installation and beyond. Though, <ulink "
 "url='/DebianEdu'>DebianEdu </ulink> is Debian, if you want there are more "
@@ -1120,7 +1120,7 @@ msgstr ""
 #: release-manual.xml:458
 msgid ""
 "FIXME: Describe here, what needs to be done after the installation to use "
-"Debian-Edu for real."
+"Debian Edu for real."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
@@ -1357,7 +1357,7 @@ msgstr ""
 #: release-manual.xml:527
 msgid ""
 "Before explaining how to upgrade, please note, that you do this update on "
-"your productive server on your own risk. <emphasis role='strong'>Debian-Edu/"
+"your productive server on your own risk. <emphasis role='strong'>Debian Edu/"
 "Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by "
 "applicable law.  </emphasis>"
 msgstr ""
@@ -1384,7 +1384,7 @@ msgstr ""
 msgid ""
 "Also it might be wise to wait a bit and keep running sarge for some more "
 "weeks, so that others can test the upgrade, experience problems and document "
-"them here. Debian-Edu sarge will receive continued support for some time in "
+"them here. Debian Edu sarge will receive continued support for some time in "
 "the future, but when Debian <ulink url='http://www.debian.org/security/"
 "faq#lifespan'>ceases support for sarge </ulink>, Debian Edu will (have to) "
 "do that too. This is expected to happen in April 2008."
@@ -1392,7 +1392,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:534
-msgid "Upgrades from Debian-Edu sarge"
+msgid "Upgrades from Debian Edu sarge"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
@@ -1406,7 +1406,7 @@ msgstr ""
 msgid ""
 "In case of problems you could also read the <ulink url='http://www.debian."
 "org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
-"(Debian-Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
+"(Debian Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
 "if you are running a 2.4 kernel, you <emphasis>should </emphasis> read the "
 "<ulink url='http://www.debian.org/releases/stable/i386/release-notes/ch-"
 "information.en.html#s-upgrade-to-2.6'>notes on upgrading from kernel 2.4 to "
@@ -1748,13 +1748,13 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:659
-msgid "Upgrades from older Debian-Edu / Skolelinux installations"
+msgid "Upgrades from older Debian Edu / Skolelinux installations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:660
 msgid ""
-"Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
+"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/UpgradeFrom1.0'>http://"
 "wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0 </ulink>. Then upgrade to "
@@ -2471,7 +2471,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:899
-msgid "Join a local Debian-Edu team"
+msgid "Join a local Debian Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
@@ -2483,7 +2483,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:903
-msgid "Start a new local Debian-Edu team"
+msgid "Start a new local Debian Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
@@ -2652,7 +2652,7 @@ msgstr "Oversettelser av dette dokumentet"
 msgid ""
 "Fully translated versions of this document are not yet available, as the "
 "document itself is very incomplete. Incomplete translations for Norwegian "
-"Bokmål and Spanish exist."
+"Bokmål, Spanish and German exist."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
@@ -2675,79 +2675,92 @@ msgstr ""
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:968
 msgid ""
-"for more information on this. There are many easy tools for translating."
+"for more information on this. There are many easy tools for translating, we "
+"suggest to use"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:969
+#: release-manual.xml:970
 msgid ""
 "To update the translations you need to be a member of the alioth project"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:970
+#: release-manual.xml:971
 msgid ""
-". To work on them you just need to check them out anonymously from svn, "
-"create patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-"
-"edu at l.d.o </ulink> or file a bug against the debian-edu-doc package."
+". To translate, you just need to check out some files from from svn, create "
+"patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-edu at l."
+"d.o </ulink> - of course you can also file a bug against the debian-edu-doc "
+"package and attach the patch there.."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:973
+msgid "You can checkout the"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:974
+msgid "source with the following command (you need to have the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:972
-msgid "Checkout the source package with the following command:"
+#: release-manual.xml:975
+msgid "package installed for this to work):"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:977
+#: release-manual.xml:980
 msgid "Then edit the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:978
+#: release-manual.xml:981
 msgid ""
-"and either commit it to svn (if you have the rights to do so) or send the "
-"file to the mailinglist."
+"(where you replace $CC with your language code) and either commit the file "
+"directly to svn (if you have the rights to do so) or send the file to the "
+"mailinglist or the BTS."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:979
+#: release-manual.xml:982
 msgid ""
 "Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to "
 "find information how to create a new .po file for your language if there is "
-"none yet, and how to update it."
+"none yet, and how to update translations."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:981
+#: release-manual.xml:984
 msgid "Potential problems for translations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:982
+#: release-manual.xml:985
 msgid ""
 "We will need to write sed-scripts (or something like that) to support "
 "different images for different translations. Laters <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:987
+#: release-manual.xml:990
 msgid "Please report any other showstoppers."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:990
+#: release-manual.xml:993
 #, fuzzy
 msgid "Appendix A - The GNU Public License"
 msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
 
 # type: CDATA
-#: release-manual.xml:992
+#: release-manual.xml:995
 #, no-wrap
 msgid "Note to translators: there is no need to translate the GPL license text. ]]"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:994
+#: release-manual.xml:997
 msgid ""
 "Copyright (C) 2007 Holger Levsen < <ulink url='mailto:holger at layer-acht."
 "org'>holger at layer-acht.org </ulink> > and others, see <ulink url='http://"
@@ -2757,7 +2770,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:997
+#: release-manual.xml:1000
 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 "
@@ -2766,7 +2779,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:998
+#: release-manual.xml:1001
 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 "
@@ -2775,7 +2788,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:999
+#: release-manual.xml:1002
 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 "
@@ -2783,17 +2796,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1000
+#: release-manual.xml:1004
 msgid "GNU GENERAL PUBLIC LICENSE"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1001
+#: release-manual.xml:1005
 msgid "Version 2, June 1991"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1002
+#: release-manual.xml:1006
 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 "
@@ -2802,12 +2815,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1004
+#: release-manual.xml:1008
 msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1005
+#: release-manual.xml:1009
 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 "
@@ -2821,7 +2834,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1007
+#: release-manual.xml:1011
 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 "
@@ -2832,7 +2845,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1008
+#: release-manual.xml:1012
 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, "
@@ -2844,14 +2857,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1010
+#: release-manual.xml:1014
 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."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1011
+#: release-manual.xml:1015
 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 "
@@ -2860,7 +2873,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1013
+#: release-manual.xml:1017
 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 "
@@ -2868,7 +2881,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1015
+#: release-manual.xml:1019
 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 "
@@ -2877,7 +2890,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1017
+#: release-manual.xml:1021
 msgid ""
 "<emphasis role='strong'>c)  </emphasis> If the modified program normally "
 "reads commands interactively when run, you must cause it, when started "
@@ -2892,7 +2905,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1021
+#: release-manual.xml:1025
 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 "
@@ -2906,7 +2919,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1022
+#: release-manual.xml:1026
 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 "
@@ -2915,7 +2928,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1023
+#: release-manual.xml:1027
 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 "
@@ -2924,7 +2937,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1024
+#: release-manual.xml:1028
 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 "
@@ -2933,7 +2946,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1026
+#: release-manual.xml:1030
 msgid ""
 "<emphasis role='strong'>a)  </emphasis> Accompany it with the complete "
 "corresponding machine-readable source code, which must be distributed under "
@@ -2942,7 +2955,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1028
+#: release-manual.xml:1032
 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 "
@@ -2953,7 +2966,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:1030
+#: release-manual.xml:1034
 msgid ""
 "<emphasis role='strong'>c)  </emphasis> Accompany it with the information "
 "you received as to the offer to distribute corresponding source code.  (This "
@@ -2963,7 +2976,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1034
+#: release-manual.xml:1038
 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 "
@@ -2977,7 +2990,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1035
+#: release-manual.xml:1039
 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 "
@@ -2987,7 +3000,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1036
+#: release-manual.xml:1040
 msgid ""
 "<emphasis role='strong'>4.  </emphasis> You may not copy, modify, "
 "sublicense, or distribute the Program except as expressly provided under "
@@ -2999,7 +3012,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1038
+#: release-manual.xml:1042
 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 "
@@ -3012,7 +3025,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1040
+#: release-manual.xml:1044
 msgid ""
 "<emphasis role='strong'>6.  </emphasis> Each time you redistribute the "
 "Program (or any work based on the Program), the recipient automatically "
@@ -3024,7 +3037,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1042
+#: release-manual.xml:1046
 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 "
@@ -3041,7 +3054,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1044
+#: release-manual.xml:1048
 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 "
@@ -3049,7 +3062,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1045
+#: release-manual.xml:1049
 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; "
@@ -3063,14 +3076,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1046
+#: release-manual.xml:1050
 msgid ""
 "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><para><section><section><para>
-#: release-manual.xml:1047
+#: release-manual.xml:1051
 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 "
@@ -3082,7 +3095,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1049
+#: release-manual.xml:1053
 msgid ""
 "<emphasis role='strong'>9.  </emphasis> The Free Software Foundation may "
 "publish revised and/or new versions of the General Public License from time "
@@ -3091,7 +3104,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1051
+#: release-manual.xml:1055
 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 "
@@ -3103,7 +3116,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1052
+#: release-manual.xml:1056
 msgid ""
 "<emphasis role='strong'>10.  </emphasis> If you wish to incorporate parts of "
 "the Program into other free programs whose distribution conditions are "
@@ -3116,7 +3129,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1056
+#: release-manual.xml:1060
 msgid ""
 "<emphasis role='strong'>11.  </emphasis> BECAUSE THE PROGRAM IS LICENSED "
 "FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
@@ -3130,7 +3143,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:1058
+#: release-manual.xml:1062
 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 "
@@ -3144,39 +3157,39 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1061
+#: release-manual.xml:1065
 msgid "END OF TERMS AND CONDITIONS"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:1064
+#: release-manual.xml:1068
 msgid "Live DVD - Boot from CD to test the system"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:1065
+#: release-manual.xml:1069
 msgid "Features of the Standalone image"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1070
+#: release-manual.xml:1074
 msgid "Activating translations and regional support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1071
+#: release-manual.xml:1075
 msgid "To activate a specific translation, boot using"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1072
+#: release-manual.xml:1076
 msgid ""
 "as a boot option, where ll_CC.UTF-8 is the locale name you want.  To "
 "aciviate a given keyboard layout, use the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1073
+#: release-manual.xml:1077
 msgid ""
 "option where KB is the wanted keyboard layout.  More information on this "
 "feature <ulink url='http://wiki.debian.org/DebianLive/l10n'>is available "
@@ -3185,102 +3198,102 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1085
+#: release-manual.xml:1089
 msgid "Norwegian Bokmål"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1087
+#: release-manual.xml:1091
 msgid "nb_NO.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1089 release-manual.xml:1096
+#: release-manual.xml:1093 release-manual.xml:1100
 msgid "no"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1092
+#: release-manual.xml:1096
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1094
+#: release-manual.xml:1098
 msgid "nn_NO.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1099
+#: release-manual.xml:1103
 msgid "German"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1101
+#: release-manual.xml:1105
 msgid "de_DE.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1103
+#: release-manual.xml:1107
 msgid "de"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1106
+#: release-manual.xml:1110
 msgid "French (France)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1108
+#: release-manual.xml:1112
 msgid "fr_FR.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1110 release-manual.xml:1117 release-manual.xml:1124
-msgid "?"
+#: release-manual.xml:1114 release-manual.xml:1121 release-manual.xml:1128
+msgid "? (FIXME)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1113
+#: release-manual.xml:1117
 msgid "Greek (Greece)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1115
+#: release-manual.xml:1119
 msgid "el_GR.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1120
+#: release-manual.xml:1124
 msgid "Japanese"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1122
+#: release-manual.xml:1126
 msgid "ja_JP.UTF-8"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1127
+#: release-manual.xml:1131
 msgid "Northern Sami (Norway)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1129
+#: release-manual.xml:1133
 msgid "se_NO"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><table><tgroup><tbody><row><entry><para>
-#: release-manual.xml:1131
+#: release-manual.xml:1135
 msgid "no(smi)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1137
+#: release-manual.xml:1141
 msgid "A complete list of locale codes is available in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1138
+#: release-manual.xml:1142
 msgid ""
 ", but only the UTF-8 locales are supported by the live images. Not all "
 "locales have translations installed, though.  The keyboard layout names can "
@@ -3288,24 +3301,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1140
+#: release-manual.xml:1144
 msgid "Stuff to know"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1144
+#: release-manual.xml:1148
 msgid "Known issues with the image"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:1148
+#: release-manual.xml:1152
 msgid "Download"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:1149
+#: release-manual.xml:1153
 msgid ""
 "The image is 1.2 GiB and available using <ulink url='ftp://ftp.skolelinux.no/"
 "cd-etch-live/'>FTP </ulink>, <ulink url='http://ftp.skolelinux.no/cd-etch-"
-"live/'>HTTP </ulink> or rsync from ftp.skolelinux.org in the cd-etch-live/."
+"live/'>HTTP </ulink> or rsync from ftp.skolelinux.org at cd-etch-live/."
 msgstr ""
diff --git a/documentation/release-manual/release-manual.xml b/documentation/release-manual/release-manual.xml
index b831a15..ecd2489 100644
--- a/documentation/release-manual/release-manual.xml
+++ b/documentation/release-manual/release-manual.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?><article><articleinfo><title>DebianEdu/Documentation/Etch/AllInOne
 </title>
-</articleinfo><para><para/><section><title>Release manual for Debian-Edu etch 3.0 Codename "Terra"
+</articleinfo><para><para/><section><title>Release manual for Debian Edu etch 3.0 Codename "Terra"
 </title><para>This is the (<emphasis>still incomplete
-</emphasis>) release manual for the Debian-Edu etch 3.0 release.  
+</emphasis>) release manual for the Debian Edu etch 3.0 release.  
 </para><para>This document was put into the <code>debian-edu-doc
-</code> package on <code>2007-10-07 10:28 UTC</code>.  
+</code> package on <code>2007-10-10 11:51 UTC</code>.  
 </para><para>The version at <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch
 </ulink> is a wiki and updated frequently.  
 </para><para><ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations
@@ -12,16 +12,16 @@
 </code> package, which can be <ulink url='http://maintainer.skolelinux.no/debian-edu-doc/'>installed on a webserver
 </ulink>. 
 </para><itemizedlist><listitem><para><ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About
-</ulink> Debian-Edu and Skolelinux 
+</ulink> Debian Edu and Skolelinux 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture
-</ulink> - the design principles of Debian-Edu 
+</ulink> - the design principles of Debian Edu 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Features'>Features
 </ulink> - new Features in this release and old ones 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements
-</ulink> to run Debian-Edu 
+</ulink> to run Debian Edu 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation
 </ulink> - how to install  
@@ -33,13 +33,13 @@
 </ulink> - Security updates, Backups and monitoring the systems 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades
-</ulink> from Debian-Edu sarge and woody 
+</ulink> from Debian Edu sarge and woody 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo
 </ulink> - simple step by step Howtos 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute
-</ulink> to Debian-Edu 
+</ulink> to Debian Edu 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Support'>Support
 </ulink> - how+where to find help 
@@ -54,15 +54,15 @@
 </ulink> - The GNU Public Licence 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/AppendixB'>Appendix B
-</ulink> - about the Debian Edu Live CD/DVDs  
+</ulink> - about Debian Edu Live CD/DVDs  
 </para>
 </listitem>
 </itemizedlist><para>Special pages: <ulink url='/DebianEdu/Documentation/Etch'>Index page
 </ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>All in one page
 </ulink>  
 </para>
-</section> <para/><section><title>About Debian-Edu and Skolelinux
-</title><para>Skolelinux is the Debian-edu project's <ulink url='http://wiki.debian.net/index.cgi?CustomDebian'>Custom Debian Distribution
+</section> <para/><section><title>About Debian Edu and Skolelinux
+</title><para>Skolelinux is the Debian Edu project's <ulink url='http://wiki.debian.net/index.cgi?CustomDebian'>Custom Debian Distribution
 </ulink> (CDD) in development. What this means is that Skolelinux is a version of Debian whose out-of-the box environment gives you a completely configured school-network  In Norway, where Skolelinux was started, the main target group is schools serving the 6-16 years age bracket. 
 </para><para>The system is in use in several countries around the world, with most installations in Norway, Germany and France. 
 </para>
@@ -234,14 +234,14 @@
 </title><para>A router/gateway, connected to the internet on the external interface and running on the IP address 10.0.2.1 on the internal interface. The router must not run a DHCP server, it can run a DNS server, though this is not needed and will not be used. 
 </para><para>FIXME: We suggest coyote (link) or or. link to setup documentation 
 </para><para>FIXME: also link to <ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo
-</ulink> change IP setup of Debian-Edu - but recommend against doing so. 
+</ulink> change IP setup of Debian Edu - but recommend against doing so. 
 </para>
 </section>
 </section>
 </section> <para/><section><title>Installation
 </title><para/><section><title>Where to find more information
 </title><para>We recommend to read or at least take a look at the <ulink url='http://www.debian.org/releases/stable/releasenotes'>release notes for Debian etch
-</ulink> before you start installing a system for production use. If you just want to give Debian-Edu/Skolelinux a try, you don't have to though, it should just work <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
+</ulink> before you start installing a system for production use. If you just want to give Debian Edu/Skolelinux a try, you don't have to though, it should just work <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
 </imageobject><textobject><phrase>:-)
 </phrase>
 </textobject>
@@ -249,7 +249,7 @@
 </para><para>Even more <ulink url='http://www.debian.org/releases/stable/installmanual'>information about the Debian etch release
 </ulink> is available in its installation manual. 
 </para><para/>
-</section><section><title>Download an installation media for Debian-edu etch 3.0r0
+</section><section><title>Download an installation media for Debian Edu etch 3.0r0
 </title><para/><section><title>DVDs for i386, amd64 and powerpc
 </title><para>The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of these methods:  
 </para><itemizedlist><listitem><para><code>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-3.0r0.iso
@@ -287,7 +287,7 @@
 </code> 
 </para>
 </listitem>
-</itemizedlist><para>The  powerpc port has not been tested as much as the other architectures, though it should work just fine and has been reported to work. Still, we consider the port an experimental release of Debian-Edu, which we might not be able to support as the other archs. 
+</itemizedlist><para>The  powerpc port has not been tested as much as the other architectures, though it should work just fine and has been reported to work. Still, we consider the port an experimental release of Debian Edu, which we might not be able to support as the other archs. 
 </para><para>The source code for this release is available on a DVD image 
 </para><itemizedlist><listitem><para><code>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-source-DVD-3.0r0.iso
 </code> 
@@ -319,7 +319,7 @@
 </listitem>
 </itemizedlist><para/>
 </section><section><title>Installation options
-</title><para>When you do an Debian-Edu installation you have a few options to choose. But don't be afraid, there aren't many. We have done a good job hiding the complexity of Debian during the installation and beyond. Though, <ulink url='/DebianEdu'>DebianEdu
+</title><para>When you do an Debian Edu installation you have a few options to choose. But don't be afraid, there aren't many. We have done a good job hiding the complexity of Debian during the installation and beyond. Though, <ulink url='/DebianEdu'>DebianEdu
 </ulink> is Debian, if you want there are more than 15000 packages to choose from and a billion of configuration options. But for the majority of our users, our defaults should be fine. 
 </para><itemizedlist><listitem><para>Normal graphical installation is the default on i386 and amd64. The powerpc installer does not support graphical installation. Enter <code>install
 </code> at the boot prompt to do a text-mode install. 
@@ -455,7 +455,7 @@
 </para>
 </section>
 </section> <para/><section><title>Getting started
-</title><para>FIXME: Describe here, what needs to be done after the installation to use Debian-Edu for real. 
+</title><para>FIXME: Describe here, what needs to be done after the installation to use Debian Edu for real. 
 </para><para>The <ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo
 </ulink> chapter describes more tips and tricks and frequently asked questions, while this is for the stuff everybody needs to do. 
 </para><para/><section><title>Services running on the main server
@@ -524,17 +524,17 @@
 </section>
 </section>
 </section> <para/><section><title>Upgrades
-</title><para>Before explaining how to upgrade, please note, that you do this update on your productive server on your own risk. <emphasis role='strong'>Debian-Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by applicable law.
+</title><para>Before explaining how to upgrade, please note, that you do this update on your productive server on your own risk. <emphasis role='strong'>Debian Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by applicable law.
 </emphasis> 
 </para><para>More <ulink url='http://www.debian.org/releases/stable/installmanual'>information about the Debian etch release
 </ulink> is available in its installation manual. 
 </para><para>If you want to be sure that after the upgrade everything works like before , you should test the upgrade on a test server, which is configured the same way as your production server. There you can test the upgrade without risk and see if everything works as it should. 
-</para><para>Also it might be wise to wait a bit and keep running sarge for some more weeks, so that others can test the upgrade, experience problems and document them here. Debian-Edu sarge will receive continued support for some time in the future, but when Debian <ulink url='http://www.debian.org/security/faq#lifespan'>ceases support for sarge
+</para><para>Also it might be wise to wait a bit and keep running sarge for some more weeks, so that others can test the upgrade, experience problems and document them here. Debian Edu sarge will receive continued support for some time in the future, but when Debian <ulink url='http://www.debian.org/security/faq#lifespan'>ceases support for sarge
 </ulink>, Debian Edu will (have to) do that too. This is expected to happen in April 2008. 
-</para><para/><section><title>Upgrades from Debian-Edu sarge
+</para><para/><section><title>Upgrades from Debian Edu sarge
 </title><para>Please read this chapter completly before you start upgrading your systems. 
 </para><para>In case of problems you could also read the <ulink url='http://www.debian.org/releases/stable/releasenotes'>releasenotes for Debian etch
-</ulink>. (Debian-Edu/Skolelinux "2.0 Terra" installed a 2.6 kernel as default, but if you are running a 2.4 kernel, you <emphasis>should
+</ulink>. (Debian Edu/Skolelinux "2.0 Terra" installed a 2.6 kernel as default, but if you are running a 2.4 kernel, you <emphasis>should
 </emphasis> read the  <ulink url='http://www.debian.org/releases/stable/i386/release-notes/ch-information.en.html#s-upgrade-to-2.6'>notes on upgrading from kernel 2.4 to 2.6
 </ulink> before you upgrade!) 
 </para><para/><section><title>Partioning scheme changed
@@ -656,8 +656,8 @@ E: Sub-process /usr/bin/dpkg returned an error code (1)]]>
 </para><screen><![CDATA[chown bind:root -R /etc/bind ]]>
 </screen><para/>
 </section>
-</section><section><title>Upgrades from older Debian-Edu / Skolelinux installations
-</title><para>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/UpgradeFrom1.0'>http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0
+</section><section><title>Upgrades from older Debian Edu / Skolelinux installations
+</title><para>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/UpgradeFrom1.0'>http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0
 </ulink>. Then upgrade to Terrra (etch-based Release). 
 </para>
 </section>
@@ -896,11 +896,11 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"
 </title><para>Another good way to help is by translating software and documentation. Information how to translate the documentation can be found in the <ulink url='/DebianEdu/Documentation/Etch/Translations translation chapter'>DebianEdu/Documentation/Etch/Translations translation chapter
 </ulink> of this book. 
 </para><para/>
-</section><section><title>Join a local Debian-Edu team
+</section><section><title>Join a local Debian Edu team
 </title><para><emphasis role='strong'>FIXME
 </emphasis>: in Norway, Germany, France, Spain (the region of Extremadura).  
 </para><para/>
-</section><section><title>Start a new local Debian-Edu team
+</section><section><title>Start a new local Debian Edu team
 </title><para><emphasis role='strong'>FIXME:
 </emphasis> "isolated" contributors and users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet up for beer or coffee and form a new Debian Edu local team! 
 </para>
@@ -961,22 +961,25 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"
 </para><para>The german translation is copyrighted 2007 by Holger Levsen, Patrick Winnertz and Ralf Gesellensetter and is released under the GPL2 or any later version. 
 </para>
 </section> <para/><section><title>Translations of this document
-</title><para>Fully translated versions of this document are not yet available, as the document itself is very incomplete. Incomplete translations for Norwegian Bokmål and Spanish exist. 
+</title><para>Fully translated versions of this document are not yet available, as the document itself is very incomplete. Incomplete translations for Norwegian Bokmål, Spanish and German exist. 
 </para><para/><section><title>Howto translate this document
 </title><para>If you want to start/help translating this document, you can! 
 </para><para>Translations of this document are kept in .po files like in many free software projects, read <code>usr/share/doc/debian-edu-doc/README.release-manual-translations
-</code> for more information on this. There are many easy tools for translating. 
-</para><para>To update the translations you need to be a member of the alioth project <code>debian
-</code>. To work on them you just need to check them out anonymously from svn, create patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-edu at l.d.o
-</ulink> or file a bug against the debian-edu-doc package. 
-</para><para>Checkout the source package with the following command: 
+</code> for more information on this. There are many easy tools for translating, we suggest to use <code>kbabel
+</code>. 
+</para><para>To update the translations you need to be a member of the alioth project <code>debian-edu
+</code>. To translate, you just need to check out some files from from svn, create patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-edu at l.d.o
+</ulink> - of course you can also file a bug against the debian-edu-doc package and attach the patch there.. 
+</para><para>You can checkout the <code>debian-edu-doc
+</code> source with the following command (you need to have the <code>subversion
+</code> package installed for this to work): 
 </para><itemizedlist><listitem><para><code>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc
 </code> 
 </para>
 </listitem>
 </itemizedlist><para>Then edit the <code>documentation/release-manual/release-manual.$CC.po
-</code> and either commit it to svn (if you have the rights to do so) or send the file to the mailinglist. 
-</para><para>Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to find information how to create a new .po file for your language if there is none yet, and how to update it. 
+</code> (where you replace $CC with your language code) and either commit the file directly to svn (if you have the rights to do so) or send the file to the mailinglist or the BTS. 
+</para><para>Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to find information how to create a new .po file for your language if there is none yet, and how to update translations. 
 </para><para/>
 </section><section><title>Potential problems for translations
 </title><para>We will need to write sed-scripts (or something like that) to support different images for different translations. Laters <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
@@ -990,14 +993,15 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"
 </section> <para/><section><title>Appendix A - The GNU Public License
 </title><para>
 </para><screen><![CDATA[Note to translators: there is no need to translate the GPL license text. ]]>
-</screen><para>Release manual for Debian-Edu etch 3.0 Codename "Terra" 
-</para><para>Copyright (C) 2007 Holger Levsen < <ulink url='mailto:holger at layer-acht.org'>holger at layer-acht.org
+</screen><para/><section><title>Release manual for Debian Edu etch 3.0 Codename "Terra"
+</title><para>Copyright (C) 2007 Holger Levsen < <ulink url='mailto:holger at layer-acht.org'>holger at layer-acht.org
 </ulink> > and others, see <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/CopyRight'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/CopyRight
 </ulink> for the full list of copyright owners. 
 </para><para>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. 
 </para><para>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. 
 </para><para>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. 
-</para><para/><section><title>GNU GENERAL PUBLIC LICENSE
+</para><para/>
+</section><section><title>GNU GENERAL PUBLIC LICENSE
 </title><para>Version 2, June 1991 
 </para><para>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. 
 </para><para/>
@@ -1107,21 +1111,21 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"
 </para>
 </entry><entry><para> fr_FR.UTF-8 
 </para>
-</entry><entry><para> ? 
+</entry><entry><para> ? (FIXME) 
 </para>
 </entry>
 </row><row><entry><para> Greek (Greece)    
 </para>
 </entry><entry><para> el_GR.UTF-8 
 </para>
-</entry><entry><para> ? 
+</entry><entry><para> ? (FIXME) 
 </para>
 </entry>
 </row><row><entry><para> Japanese          
 </para>
 </entry><entry><para> ja_JP.UTF-8 
 </para>
-</entry><entry><para> ? 
+</entry><entry><para> ? (FIXME) 
 </para>
 </entry>
 </row><row><entry><para> Northern Sami (Norway)   
@@ -1148,7 +1152,7 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"
 </section><section><title>Download
 </title><para>The image is 1.2 GiB and available using <ulink url='ftp://ftp.skolelinux.no/cd-etch-live/'>FTP
 </ulink>, <ulink url='http://ftp.skolelinux.no/cd-etch-live/'>HTTP
-</ulink> or rsync from ftp.skolelinux.org in the cd-etch-live/. 
+</ulink> or rsync from ftp.skolelinux.org at cd-etch-live/. 
 </para>
 </section>
 </section>


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