[debian-edu-commits] debian-edu/debian-edu-doc.git (#46) - wheezy (branch) updated: 0.4.20070713-3-g4720f0e

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


The branch, wheezy has been updated
       via  4720f0e38b60273f03d52447171a3c50923d3156 (commit)
      from  ba418602080ac31ca5335bc1d344ab5bdd82f19f (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 |  247 +++++---
 documentation/release-manual/release-manual.es.po |  689 ++++++++++-----------
 documentation/release-manual/release-manual.xml   |   91 ++-
 3 files changed, 578 insertions(+), 449 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 d891cca..6e358e4 100644
--- a/documentation/release-manual/release-manual.de.po
+++ b/documentation/release-manual/release-manual.de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-07-11 17:22+0200\n"
+"POT-Creation-Date: 2007-07-14 11:06+0100\n"
 "PO-Revision-Date: 2007-07-06 12:55+0200\n"
 "Last-Translator: Holger Levsen <holger at layer-acht.org>\n"
 "Language-Team: german team <users at skolelinux.de>\n"
@@ -20,22 +20,24 @@ msgstr "DebianEdu/Documentation/Etch/AllInOne"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:3
-msgid "Debian-Edu etch 3.0 Codename \"Terra\""
+#, fuzzy
+msgid "Release manual for Debian-Edu etch 3.0 Codename \"Terra\""
 msgstr "Debian-Edu etch 3.0 Codename \"Terra\""
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:4
 msgid ""
-"This is/will become the release manual for the Debian-Edu etch 3.0 release."
+"This is the (<emphasis>still incomplete </emphasis>) release manual for the "
+"Debian-Edu etch 3.0 release."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:5
+#: release-manual.xml:6
 msgid "This document was put into the"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:6
+#: release-manual.xml:7
 msgid ""
 "package on $DEBIAN_EDU_DOC_BUILDDATE. (The version at <ulink url='http://"
 "wiki.skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/"
@@ -45,12 +47,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:9
-msgid "package, which then can be installed on a webserver."
+#: release-manual.xml:10
+msgid "package, which can be installed on a webserver."
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:10
+#: release-manual.xml:11
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
@@ -60,7 +62,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:16
+#: release-manual.xml:17
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
 "Debian-Edu and Skolelinux"
@@ -69,7 +71,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:34
+#: release-manual.xml:35
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </ulink> - simple "
 "step by step Howtos"
@@ -78,7 +80,7 @@ msgstr ""
 "Schritt-fuer-Schritt Anleitungen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:37
+#: release-manual.xml:38
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
@@ -88,7 +90,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:40
+#: release-manual.xml:41
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - how"
@@ -98,7 +100,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:44
+#: release-manual.xml:45
 msgid ""
 "Special pages: <ulink url='/DebianEdu/Documentation/Etch'>Index page </"
 "ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>All in one page "
@@ -106,12 +108,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:48
+#: release-manual.xml:49
 msgid "Copyright and Authors"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:49
+#: release-manual.xml:50
 #, fuzzy
 msgid ""
 "This document is written and copyrighted by Holger Levsen 2007 and released "
@@ -121,7 +123,7 @@ msgstr ""
 "or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:50
+#: release-manual.xml:51
 msgid ""
 "If you add content to it, <emphasis role='strong'>please only do so if you "
 "are the author of it and plan to release it under the same conditions </"
@@ -130,38 +132,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:52
+#: release-manual.xml:53
 msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: Put full text of GPL into "
 "Appendix."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:55
+#: release-manual.xml:56
 #, fuzzy
 msgid "Translations of this document"
 msgstr "Copyright dieses Dokuments"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:56
+#: release-manual.xml:57
 msgid ""
 "Translated versions of this document are not yet available, as the document "
 "itself is very incomplete, even the skeleton is unfinished."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:57
+#: release-manual.xml:58
 #, fuzzy
 msgid "Howto translate this document"
 msgstr "Copyright dieses Dokuments"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:58
+#: release-manual.xml:59
 msgid "If you want to start translating, you can! Do"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:59
+#: release-manual.xml:60
 msgid ""
 "and in debian-edu-doc-$version/documentation/release-manual/README you find "
 "information how to create a .po file for your language, and how to update it "
@@ -170,19 +172,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:61
+#: release-manual.xml:62
 msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> describe how to work in svn and "
 "give a step by step howto."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:64
+#: release-manual.xml:65
 msgid "Potential problems for translators"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:65
+#: release-manual.xml:66
 msgid ""
 "<emphasis>Remark from Holger: </emphasis> I'm curious to learn if "
 "distributed translating and commiting the .po file into svn works, that is, "
@@ -190,47 +192,47 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:67
+#: release-manual.xml:68
 msgid ""
 "Also 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><para><inlinemediaobject><textobject>
-#: release-manual.xml:68 release-manual.xml:151
+#: release-manual.xml:69 release-manual.xml:191
 msgid "<phrase>:)  </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:72
+#: release-manual.xml:73
 msgid "Please report any other showstoppers."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:75
+#: release-manual.xml:76
 msgid "AboutDebianEdu"
 msgstr "AboutDebianEdu"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:76
+#: release-manual.xml:77
 msgid "Welcome to <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
 msgstr ""
 "Willkommen bei <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:79
+#: release-manual.xml:80
 msgid "Architecture"
 msgstr "Architektur"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:80
+#: release-manual.xml:81
 msgid ""
 "See <ulink url='http://developer.skolelinux.no/arkitektur/arkitektur.html."
 "en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </ulink>."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:82
+#: release-manual.xml:83
 msgid ""
 "FIXME: Copy <ulink url='http://developer.skolelinux.no/arkitektur/arkitektur."
 "html.en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </"
@@ -239,39 +241,39 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:85
+#: release-manual.xml:86
 msgid "Requirements"
 msgstr "Vorraussetzungen"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:91
+#: release-manual.xml:92
 msgid "Installation"
 msgstr "Installation"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:92
+#: release-manual.xml:93
 msgid "Download an installation media for Debian-edu etch rc4"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:93
+#: release-manual.xml:94
 msgid ""
 "The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of "
 "these methods:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:100
+#: release-manual.xml:101
 msgid "or for the netinstall cd you can download for i386"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:107
+#: release-manual.xml:108
 msgid "and for amd64"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:114
+#: release-manual.xml:115
 msgid ""
 "The powerpc port is still under development, and are currently not "
 "officially a supported part of Debian-Edu. The architecture have been "
@@ -281,7 +283,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:116
+#: release-manual.xml:117
 msgid ""
 "The netinst installation will fetch some packages from the CD and the rest "
 "from the net.  The amount of packages fetched from the net varies from "
@@ -289,13 +291,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:121
+#: release-manual.xml:122
 #, fuzzy
 msgid "Installation options"
 msgstr "Installation"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:122
+#: release-manual.xml:123
 msgid ""
 "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 "
@@ -306,17 +308,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:141
+#: release-manual.xml:150
 msgid "Screenshot tour through an i386 main-server installation"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:144
+#: release-manual.xml:153
 msgid "HowTo"
 msgstr "Anleitung"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:145
+#: release-manual.xml:154
 msgid ""
 "The <ulink url='/HowTos'>HowTos </ulink> from <ulink url='http://wiki.debian."
 "org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are "
@@ -328,126 +330,203 @@ msgstr ""
 "entweder Anwender- oder Entwicklerbezogen. Lasst uns die "
 "Anwenderspezifischen <ulink url='/HowTos'>HowTos </ulink> hierhin schieben!"
 
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:158
+msgid "Those are not that many:"
+msgstr ""
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#: release-manual.xml:183
+msgid ""
+"<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
+"wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but "
+"interesting"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:187
+msgid ""
+"(see the history of those wiki pages and ask the authors if they are fine "
+"with moving the howto and putting it under the GPL)"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:188
+msgid "Other topics"
+msgstr ""
+
 # type: Content of: <article><para><section><para><inlinemediaobject>
-#: release-manual.xml:149
+#: release-manual.xml:189
 msgid ""
 "Other topics the documentation should cover, not neccessarily in the <ulink "
 "url='/HowTo'>HowTo </ulink> Chapter though <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:155
+#: release-manual.xml:196
+msgid ""
+"Installing single service machines for spreading the load from main-server"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:204
 msgid "LDAP Setup"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:157
+#: release-manual.xml:206
 msgid "/etc/ in svk"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:159
+#: release-manual.xml:208
 msgid "modify Kiosk mode"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:161
+#: release-manual.xml:210
 msgid "Flash"
 msgstr ""
 
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:211
+msgid "To install the Adobe Flash Player web browser plugin, install the"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:212
+msgid ""
+"debian package.  It require a working Internet connection, and will download "
+"the precompiled binary from Adobe and convert it into a Debian package "
+"before [...].  [Hm, no use documenting this if it does not work. pere 2007-"
+"07-12]."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:214
+msgid "<phrase>/!\\ </phrase>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:217
+msgid ""
+"</inlinemediaobject> Version 9.0.31.0.1 of the package do not work in Etch "
+"[pere 2007-07-12]"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:218
+msgid ""
+"An alternative is to install flashplayer-mozilla from debian-multimedia.  It "
+"work with both konqueror and firefox."
+msgstr ""
+
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:165
+#: release-manual.xml:220
 msgid "Java"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:169
+#: release-manual.xml:224
 msgid "Sound & Video"
 msgstr ""
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:225
+msgid ""
+"- where to find libdvdcss for playing dvds.  Should we promote <ulink "
+"url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ </"
+"ulink> or some other site?"
+msgstr ""
+
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:171
+#: release-manual.xml:230
 msgid "Thin Clients vs Half-Thick Clients"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:173
+#: release-manual.xml:232
 msgid "printer managing"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:175
+#: release-manual.xml:234
 msgid "Firewall setup (coyote linux)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:177
+#: release-manual.xml:236
 msgid "LTSP in detail"
 msgstr ""
 
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:238
+msgid "Connecting windows machines to the network / windows integration"
+msgstr ""
+
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:180
+#: release-manual.xml:241
 msgid "Maintainance"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:181
+#: release-manual.xml:242
 msgid "Updating the software"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:182
+#: release-manual.xml:243
 msgid "document how to use aptitude upgrade / kde-update-notifier"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:183
+#: release-manual.xml:244
 msgid "are cron-apt and apt-listchanges installed and configured?"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:185
+#: release-manual.xml:246
 msgid "Backups"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:186
+#: release-manual.xml:247
 msgid "document slbackup-php / give pointers"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:188
+#: release-manual.xml:249
 msgid "Monitoring"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:189
-msgid "give pointers to munin doc"
+#: release-manual.xml:250
+msgid "give pointers to munin, sitesummary and nagios doc"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:192
+#: release-manual.xml:253
 msgid "Upgrades"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:193
+#: release-manual.xml:254
 msgid "Upgrades from Debian-Edu sarge"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:194
+#: release-manual.xml:255
 msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: document known any issues here!"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:197
+#: release-manual.xml:258
 msgid "Upgrades from older Debian-Edu / Skolelinux installations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:198
+#: release-manual.xml:259
 msgid ""
 "Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
 "supported. Upgrade to the sarge based version first, a howto can be found at "
@@ -456,54 +535,54 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:202
+#: release-manual.xml:263
 msgid "Contribute"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:203
+#: release-manual.xml:264
 msgid "Resources"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:204
+#: release-manual.xml:265
 msgid "<emphasis role='strong'>FIXME </emphasis>, for now some basic pointers:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:215
+#: release-manual.xml:276
 msgid "Translations wanted"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:218
+#: release-manual.xml:279
 msgid "how to help / translate"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:219
+#: release-manual.xml:280
 msgid "explain how to help debian-edu explain how to help debian / upstream"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:221
+#: release-manual.xml:282
 msgid "Join a local debian-edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:222
+#: release-manual.xml:283
 msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: in Norway, Germany, France, Spain "
 "(the region of Extremadura)."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:225
+#: release-manual.xml:286
 msgid "start a new local debian-edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:226
+#: release-manual.xml:287
 msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> \"isolated\" contributors and "
 "users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet "
@@ -511,17 +590,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:230
+#: release-manual.xml:291
 msgid "Support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:231
+#: release-manual.xml:292
 msgid "volunteer based support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:233
+#: release-manual.xml:294
 msgid "professional support"
 msgstr ""
 
diff --git a/documentation/release-manual/release-manual.es.po b/documentation/release-manual/release-manual.es.po
index 541546c..d056054 100644
--- a/documentation/release-manual/release-manual.es.po
+++ b/documentation/release-manual/release-manual.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-07-13 18:09+0200\n"
+"POT-Creation-Date: 2007-07-14 11:06+0100\n"
 "PO-Revision-Date: 2007-07-14 10:32+0200\n"
 "Last-Translator: José L. Redrejo Rodríguez\n"
 "Language-Team:  <jredrejo at edu.juntaextremadura.net>\n"
@@ -17,13 +17,11 @@ msgstr ""
 
 # type: Content of: <article><articleinfo><title>
 #: release-manual.xml:1
-#, no-wrap
 msgid "DebianEdu/Documentation/Etch/AllInOne"
 msgstr "DebianEdu/Documentación/Etch/TodoJunto"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:3
-#, no-wrap
 msgid "Release manual for Debian-Edu etch 3.0 Codename \"Terra\""
 msgstr "Manual para Debian-Edu etch 3.0 también llamado \"Terra\""
 
@@ -33,8 +31,8 @@ msgid ""
 "This is the (<emphasis>still incomplete </emphasis>) release manual for the "
 "Debian-Edu etch 3.0 release."
 msgstr ""
-"Esta es el manual (<emphasis>aun incompleto </emphasis>) para el lanzamiento de  "
-"Debian-Edu etch 3.0."
+"Esta es el manual (<emphasis>aun incompleto </emphasis>) para el lanzamiento "
+"de  Debian-Edu etch 3.0."
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:6
@@ -44,11 +42,17 @@ msgstr "Este documento está disponible en el"
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:7
 msgid ""
-"package on $DEBIAN_EDU_DOC_BUILDDATE. (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.) <ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </ulink> will be part of the"
+"package on $DEBIAN_EDU_DOC_BUILDDATE. (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.) "
+"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
+"ulink> will be part of the"
 msgstr ""
-"paquete $DEBIAN_EDU_DOC_BUILDDATE. (la versión en <ulink "
-"url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch </ulink> es un wiki actualizado a menudo.) <ulink url='/DebianEdu/Documentation/Etch/Translations'>Las traducciones </ulink> serán parte del"
+"paquete $DEBIAN_EDU_DOC_BUILDDATE. (la versión en <ulink url='http://wiki."
+"skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/"
+"DebianEdu/Documentation/Etch </ulink> es un wiki actualizado a menudo.) "
+"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Las traducciones </"
+"ulink> serán parte del"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:10
@@ -65,13 +69,6 @@ msgstr ""
 "Autores"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:14
-msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations of this "
-"document </ulink>"
-msgstr "<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones de este documento </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:17
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
@@ -81,54 +78,13 @@ msgstr ""
 "Debian-Edu y Skolelinux"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:20
-msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture "
-"</ulink>"
-msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Arquitectura"
-"</ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:23
-msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requierements "
-"</ulink>"
-msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requerimientos "
-"</ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:26
-msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation "
-"</ulink>"
-msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Installation'>Instalación "
-"</ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:29
-msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Maintainance "
-"</ulink>"
-msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Mantenimiento "
-"</ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:32
-msgid "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink>"
-msgstr "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Actualizaciones </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:35
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </ulink> - simple "
 "step by step Howtos"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTos </ulink> - Instrucciones "
-"simples paso a paso"
+"<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTos </ulink> - "
+"Instrucciones simples paso a paso"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:38
@@ -142,25 +98,25 @@ msgstr ""
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:41
 msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - "
-"how+where to find help"
+"<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - how"
+"+where to find help"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Support'>Soporte </ulink> - "
-"como y donde encontrar ayuda"
+"<ulink url='/DebianEdu/Documentation/Etch/Support'>Soporte </ulink> - como y "
+"donde encontrar ayuda"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:45
 msgid ""
-"Special pages: <ulink url='/DebianEdu/Documentation/Etch'>Index page "
-"</ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>All in one "
-"page </ulink>"
+"Special pages: <ulink url='/DebianEdu/Documentation/Etch'>Index page </"
+"ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>All in one page "
+"</ulink>"
 msgstr ""
-"Páginas especiales: <ulink url='/DebianEdu/Documentation/Etch'>Índice "
-"</ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>Todo en una página </ulink>"
+"Páginas especiales: <ulink url='/DebianEdu/Documentation/Etch'>Índice </"
+"ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>Todo en una "
+"página </ulink>"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:49
-#, no-wrap
 msgid "Copyright and Authors"
 msgstr "Copyright y Authores"
 
@@ -170,20 +126,20 @@ msgid ""
 "This document is written and copyrighted by Holger Levsen 2007 and released "
 "under the GPL2 or any later version. Enjoy!"
 msgstr ""
-"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y distribuido"
-"bajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
+"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
+"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:51
 msgid ""
 "If you add content to it, <emphasis role='strong'>please only do so if you "
-"are the author of it and plan to release it under the same conditions "
-"</emphasis>! Then add your name here and release it under the GPL2 or later "
+"are the author of it and plan to release it under the same conditions </"
+"emphasis>! Then add your name here and release it under the GPL2 or later "
 "version."
 msgstr ""
 "¡Si le añades contenido <emphasis role='strong'> hazlo sólo si eres su autor "
-"y planeas liberarlo bajo las mismas condiciones !</emphasis>. Después añade tu "
-"nombre aquí y libéralo bajo la GPL2 o posterior."
+"y planeas liberarlo bajo las mismas condiciones !</emphasis>. Después añade "
+"tu nombre aquí y libéralo bajo la GPL2 o posterior."
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:53
@@ -191,12 +147,11 @@ msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: Put full text of GPL into "
 "Appendix."
 msgstr ""
-"<emphasis role='strong'>POR CORREGIR </emphasis>: Poner el texto completo "
-"de la GPL en el Apéndice"
+"<emphasis role='strong'>POR CORREGIR </emphasis>: Poner el texto completo de "
+"la GPL en el Apéndice"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:56
-#, no-wrap
 msgid "Translations of this document"
 msgstr "Traducciones de este documento"
 
@@ -206,12 +161,11 @@ msgid ""
 "Translated versions of this document are not yet available, as the document "
 "itself is very incomplete, even the skeleton is unfinished."
 msgstr ""
-"Todavía no están disponibles traducciones de este documento, puesto que "
-"el propio documento está incompleto, incluso su esqueleto está inacabado."
+"Todavía no están disponibles traducciones de este documento, puesto que el "
+"propio documento está incompleto, incluso su esqueleto está inacabado."
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:58
-#, no-wrap
 msgid "Howto translate this document"
 msgstr "Como traducir este documento"
 
@@ -225,13 +179,14 @@ msgstr "Si quieres empezar a traducirlo ¡puedes! Hazlo"
 msgid ""
 "and in debian-edu-doc-$version/documentation/release-manual/README you find "
 "information how to create a .po file for your language, and how to update it "
-"against <ulink "
-"url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&mimetype=xml/docbook'>the source </ulink>."
+"against <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/"
+"AllInOne?action=format&mimetype=xml/docbook'>the source </ulink>."
 msgstr ""
-"y en  debian-edu-doc-$version/documentation/release-manual/README encontrarás"
-"información para crear un archivo .po para tu idioma y como actualizarlo en "
-"<ulink "
-"url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&mimetype=xml/docbook'>los fuentes </ulink>."
+"y en  debian-edu-doc-$version/documentation/release-manual/README "
+"encontrarásinformación para crear un archivo .po para tu idioma y como "
+"actualizarlo en <ulink url='http://wiki.skolelinux.no/DebianEdu/"
+"Documentation/Etch/AllInOne?action=format&mimetype=xml/docbook'>los "
+"fuentes </ulink>."
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:62
@@ -239,12 +194,11 @@ msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> describe how to work in svn and "
 "give a step by step howto."
 msgstr ""
-"<emphasis role='strong'>POR CORREGIR: </emphasis> describen como trabajar con "
-"svn y muestran un tutorial paso a paso"
+"<emphasis role='strong'>POR CORREGIR: </emphasis> describen como trabajar "
+"con svn y muestran un tutorial paso a paso"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:65
-#, no-wrap
 msgid "Potential problems for translators"
 msgstr "Problemas potenciales para los traductores"
 
@@ -256,8 +210,8 @@ msgid ""
 "if svn automatically merges correctly."
 msgstr ""
 "<emphasis>Comentarios de Holger: </emphasis> Me gustaría saber si las "
-"traducciones distribuidas y el envio del archivo .po en svn funciona, "
-"es decir, si svn lo mezcla bien de forma automática. "
+"traducciones distribuidas y el envio del archivo .po en svn funciona, es "
+"decir, si svn lo mezcla bien de forma automática. "
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:68
@@ -268,10 +222,10 @@ msgstr ""
 "También necesitamso escribir scripts de sed (o algo parecido) para soportar "
 "diferentes imágenes con diferentes traducciones <inlinemediaobject>"
 
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:72 release-manual.xml:194
-msgid "</inlinemediaobject>"
-msgstr "</inlinemediaobject>"
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:69 release-manual.xml:191
+msgid "<phrase>:)  </phrase>"
+msgstr ""
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:73
@@ -280,7 +234,6 @@ msgstr "Por favor, informa de otros posibles fallos importantes"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:76
-#, no-wrap
 msgid "AboutDebianEdu"
 msgstr "Acerca de DebianEdu"
 
@@ -291,43 +244,43 @@ msgstr "Bienvenido a  <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:80
-#, no-wrap
 msgid "Architecture"
 msgstr "Arquitectura"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:81
 msgid ""
-"See <ulink "
-"url='http://developer.skolelinux.no/arkitektur/arkitektur.html.en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </ulink>."
+"See <ulink url='http://developer.skolelinux.no/arkitektur/arkitektur.html."
+"en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </ulink>."
 msgstr ""
-"Ver <ulink "
-"url='http://developer.skolelinux.no/arkitektur/arkitektur.html.en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </ulink>."
+"Ver <ulink url='http://developer.skolelinux.no/arkitektur/arkitektur.html."
+"en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </ulink>."
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:83
 msgid ""
-"FIXME: Copy <ulink "
-"url='http://developer.skolelinux.no/arkitektur/arkitektur.html.en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </ulink> over here and and mention the source in an extra paragraph or is adding Petter to the authors enough?"
+"FIXME: Copy <ulink url='http://developer.skolelinux.no/arkitektur/arkitektur."
+"html.en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </"
+"ulink> over here and and mention the source in an extra paragraph or is "
+"adding Petter to the authors enough?"
 msgstr ""
-"POR CORREGIR: Copiar <ulink "
-"url='http://developer.skolelinux.no/arkitektur/arkitektur.html.en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en </ulink> aquí encima y mencionar los fuentes en un párrafo extra o ¿es suficiente añadiendo a Petter a los autores?"
+"POR CORREGIR: Copiar <ulink url='http://developer.skolelinux.no/arkitektur/"
+"arkitektur.html.en'>http://developer.skolelinux.no/arkitektur/arkitektur."
+"html.en </ulink> aquí encima y mencionar los fuentes en un párrafo extra o "
+"¿es suficiente añadiendo a Petter a los autores?"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:86
-#, no-wrap
 msgid "Requirements"
 msgstr "Requisitos"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:92
-#, no-wrap
 msgid "Installation"
 msgstr "Instalación"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:93
-#, no-wrap
 msgid "Download an installation media for Debian-edu etch rc4"
 msgstr "Descargar un formato de instalación para Debian-edu etch rc4"
 
@@ -340,82 +293,30 @@ msgstr ""
 "La imagen multiarquitecturas tiene 4,4 Gb. Para descargarla, usa cualquiera "
 "de estos métodos:"
 
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:95
-msgid ""
-"<ulink "
-"url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc4.iso </ulink>"
-msgstr ""
-"<ulink "
-"url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc4.iso </ulink>"
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:97
-msgid ""
-"<ulink "
-"url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc4.iso </ulink>"
-msgstr ""
-"<ulink "
-"url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc4.iso </ulink>"
-
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:101
 msgid "or for the netinstall cd you can download for i386"
 msgstr "o con el cd netinstall puedes descargarla para i386"
 
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:102
-msgid ""
-"<ulink "
-"url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc4.iso </ulink>"
-msgstr ""
-"<ulink "
-"url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc4.iso </ulink>"
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:104
-msgid ""
-"<ulink "
-"url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc4.iso </ulink>"
-msgstr ""
-"<ulink "
-"url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc4.iso </ulink>"
-
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:108
 msgid "and for amd64"
 msgstr "y para amd64"
 
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:109
-msgid ""
-"<ulink "
-"url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc4.iso </ulink>"
-msgstr ""
-"<ulink "
-"url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc4.iso </ulink>"
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:111
-msgid ""
-"<ulink "
-"url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc4.iso </ulink>"
-msgstr ""
-"<ulink "
-"url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc4.iso </ulink>"
-
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:115
 msgid ""
 "The powerpc port is still under development, and are currently not "
 "officially a supported part of Debian-Edu. The architecture have been "
-"reported to work. Its available for download at <ulink "
-"url='http://ftp.skolelinux.org/cd-etch-test-powerpc/debian-edu-powerpc-CD-1.iso'>http://ftp.skolelinux.org/cd-etch-test-powerpc/debian-edu-powerpc-CD-1.iso </ulink>."
+"reported to work. Its available for download at <ulink url='http://ftp."
+"skolelinux.org/cd-etch-test-powerpc/debian-edu-powerpc-CD-1.iso'>http://ftp."
+"skolelinux.org/cd-etch-test-powerpc/debian-edu-powerpc-CD-1.iso </ulink>."
 msgstr ""
 "La versión powerpc todavía está en desarrollo, y actualmente no es "
-"oficialmente soportada por Debian-Edu. Hay informes de que esa "
-"arquitectura funciona. Se puede descargar en <ulink "
-"url='http://ftp.skolelinux.org/cd-etch-test-powerpc/debian-edu-powerpc-CD-1.iso'>http://ftp.skolelinux.org/cd-etch-test-powerpc/debian-edu-powerpc-CD-1.iso </ulink>."
+"oficialmente soportada por Debian-Edu. Hay informes de que esa arquitectura "
+"funciona. Se puede descargar en <ulink url='http://ftp.skolelinux.org/cd-"
+"etch-test-powerpc/debian-edu-powerpc-CD-1.iso'>http://ftp.skolelinux.org/cd-"
+"etch-test-powerpc/debian-edu-powerpc-CD-1.iso </ulink>."
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:117
@@ -425,12 +326,10 @@ msgid ""
 "profile to profile:"
 msgstr ""
 "La instalación via red (netinst) descargará algunso paquetes desde el CD y "
-"el resto desde la red. La cantidad de paquetes a descargar depende del "
-"pefil:"
+"el resto desde la red. La cantidad de paquetes a descargar depende del pefil:"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:122
-#, no-wrap
 msgid "Installation options"
 msgstr "Opciones de instalación"
 
@@ -441,38 +340,39 @@ msgid ""
 "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."
+"than 15000 packages to choose from and a billion of configuration options. "
+"But for the majority of our users, our defaults should be fine."
 msgstr ""
-"Cuando haces una instalación Debian-Edu tienes que elegir entre algunas opciones. "
-"Pero no te preocupes, son pocas. Hemos hecho una buena labor ocultando la "
-"complejidad de Debian durante la instalación. Aunque <ulink "
-"url='/DebianEdu'>DebianEdu </ulink> es Debian, si los quieres hay más de 15000 "
-"paquetes para elegir en Debian y millones de opciones de ocnfiguración. "
-"Pero para la mayor parte de nuestros usuarios, las que ponemos por defecto "
-"van estupendamente."
+"Cuando haces una instalación Debian-Edu tienes que elegir entre algunas "
+"opciones. Pero no te preocupes, son pocas. Hemos hecho una buena labor "
+"ocultando la complejidad de Debian durante la instalación. Aunque <ulink "
+"url='/DebianEdu'>DebianEdu </ulink> es Debian, si los quieres hay más de "
+"15000 paquetes para elegir en Debian y millones de opciones de "
+"ocnfiguración. Pero para la mayor parte de nuestros usuarios, las que "
+"ponemos por defecto van estupendamente."
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:150
-#, no-wrap
 msgid "Screenshot tour through an i386 main-server installation"
 msgstr "Varios pantallazos de la instalación de un Servidor principal i386"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:153
-#, no-wrap
 msgid "HowTo"
 msgstr "HowTo"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:154
 msgid ""
-"The <ulink url='/HowTos'>HowTos </ulink> from <ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are either user- or developer-specific. Let's move the user-specific <ulink url='/HowTos'>HowTos </ulink> over here!"
+"The <ulink url='/HowTos'>HowTos </ulink> from <ulink url='http://wiki.debian."
+"org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are "
+"either user- or developer-specific. Let's move the user-specific <ulink "
+"url='/HowTos'>HowTos </ulink> over here!"
 msgstr ""
-"Los <ulink url='/HowTos'>HowTos </ulink> de <ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> son específicos tanto "
-"de los usuarios como de los desarrolladores. Deberíamos mover los de los usuarios <ulink url='/HowTos'>HowTos </ulink>aquí."
+"Los <ulink url='/HowTos'>HowTos </ulink> de <ulink url='http://wiki.debian."
+"org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> son "
+"específicos tanto de los usuarios como de los desarrolladores. Deberíamos "
+"mover los de los usuarios <ulink url='/HowTos'>HowTos </ulink>aquí."
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:158
@@ -480,85 +380,15 @@ msgid "Those are not that many:"
 msgstr "No son demasiados"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:159
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn'>http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn </ulink>"
-msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn'>http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:162
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/BackupPC'>http://wiki.debian.org/DebianEdu/HowTo/BackupPC </ulink>"
-msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/BackupPC'>http://wiki.debian.org/DebianEdu/HowTo/BackupPC </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:165
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet </ulink>"
-msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:168
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/EtcInSvk'>http://wiki.debian.org/DebianEdu/HowTo/EtcInSvk </ulink>"
-msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/EtcInSvk'>http://wiki.debian.org/DebianEdu/HowTo/EtcInSvk </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:171
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs'>http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs </ulink>"
-msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs'>http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:174
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation </ulink>"
-msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:177
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/HowTo/SiteSummary </ulink>"
-msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/HowTo/SiteSummary </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:180
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication'>http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication </ulink>"
-msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication'>http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:183
 msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but interesting"
+"<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
+"wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but "
+"interesting"
 msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incompleo pero interesante"
+"<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
+"wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incompleo pero "
+"interesante"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:187
@@ -566,12 +396,11 @@ msgid ""
 "(see the history of those wiki pages and ask the authors if they are fine "
 "with moving the howto and putting it under the GPL)"
 msgstr ""
-"(ver la historia de estas páginas del wiki y preguntar a los autores si "
-"no les importa moverlas al howto y ponerlas bajo GPL)"
+"(ver la historia de estas páginas del wiki y preguntar a los autores si no "
+"les importa moverlas al howto y ponerlas bajo GPL)"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:188
-#, no-wrap
 msgid "Other topics"
 msgstr "Otros temas"
 
@@ -582,36 +411,33 @@ msgid ""
 "url='/HowTo'>HowTo </ulink> Chapter though <inlinemediaobject>"
 msgstr ""
 "Otros temas que debería cubrir la documentación, aunque no necesariamente en "
-"<ulink "
-"url='/HowTo'>HowTo </ulink> Capítulo sobre <inlinemediaobject>"
+"<ulink url='/HowTo'>HowTo </ulink> Capítulo sobre <inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:196
-#, no-wrap
-msgid "Installing single service machines for spreading the load from main-server"
-msgstr "Instalar máquinas con servicios separados para liberar carga del servidor principal"
+msgid ""
+"Installing single service machines for spreading the load from main-server"
+msgstr ""
+"Instalar máquinas con servicios separados para liberar carga del servidor "
+"principal"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:204
-#, no-wrap
 msgid "LDAP Setup"
 msgstr "Configuración de LDAP"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:206
-#, no-wrap
 msgid "/etc/ in svk"
 msgstr "/etc/ en svk"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:208
-#, no-wrap
 msgid "modify Kiosk mode"
 msgstr "modificar el modo Kiosk"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:210
-#, no-wrap
 msgid "Flash"
 msgstr "Flash"
 
@@ -625,16 +451,16 @@ msgstr "Instalar el plugin del reproductor de Adobe Flash, instalar el"
 msgid ""
 "debian package.  It require a working Internet connection, and will download "
 "the precompiled binary from Adobe and convert it into a Debian package "
-"before [...].  [Hm, no use documenting this if it does not work. pere "
-"2007-07-12]."
+"before [...].  [Hm, no use documenting this if it does not work. pere 2007-"
+"07-12]."
 msgstr ""
-"paquete debian. Requiere una conexión funcional a internet, y descargará "
-"el binario precompilado de Adobe para convertirlo antes en un paquete Debian."
+"paquete debian. Requiere una conexión funcional a internet, y descargará el "
+"binario precompilado de Adobe para convertirlo antes en un paquete Debian."
 
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:213
-msgid "<inlinemediaobject>"
-msgstr "<inlinemediaobject>"
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:214
+msgid "<phrase>/!\\ </phrase>"
+msgstr ""
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:217
@@ -656,13 +482,11 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:220
-#, no-wrap
 msgid "Java"
 msgstr "Java"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:224
-#, no-wrap
 msgid "Sound & Video"
 msgstr "Sonido y Vídeo"
 
@@ -670,52 +494,45 @@ msgstr "Sonido y Vídeo"
 #: release-manual.xml:225
 msgid ""
 "- where to find libdvdcss for playing dvds.  Should we promote <ulink "
-"url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ "
-"</ulink> or some other site?"
+"url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ </"
+"ulink> or some other site?"
 msgstr ""
-"- donde enconttrar libdvdcss para reproducir dvds.  ¿Deberíamos promocionar <ulink "
-"url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ "
-"</ulink> o algún otro sitio?"
+"- donde enconttrar libdvdcss para reproducir dvds.  ¿Deberíamos promocionar "
+"<ulink url='http://www.debian-multimedia.org/'>http://www.debian-multimedia."
+"org/ </ulink> o algún otro sitio?"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:230
-#, no-wrap
 msgid "Thin Clients vs Half-Thick Clients"
 msgstr "Clientes ligeros / Clientes semi-ligeros"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:232
-#, no-wrap
 msgid "printer managing"
 msgstr "gestión de impresora"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:234
-#, no-wrap
 msgid "Firewall setup (coyote linux)"
 msgstr "Configuración del Cortafuegos (coyote linux)"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:236
-#, no-wrap
 msgid "LTSP in detail"
 msgstr "LTSP en detalle"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:238
-#, no-wrap
 msgid "Connecting windows machines to the network / windows integration"
 msgstr "Conectar máquinas windows a la red / integración con windows"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:241
-#, no-wrap
 msgid "Maintainance"
 msgstr "Mantenimiento"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:242
-#, no-wrap
 msgid "Updating the software"
 msgstr "Actualizar el software"
 
@@ -731,7 +548,6 @@ msgstr "¿están cron-apt y apt-listchanges instalados y configurados?"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:246
-#, no-wrap
 msgid "Backups"
 msgstr "Copias de Seguridad"
 
@@ -742,7 +558,6 @@ msgstr "documentar slbackup-php / dar pistas"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:249
-#, no-wrap
 msgid "Monitoring"
 msgstr "Monitorización"
 
@@ -753,24 +568,24 @@ msgstr "dar apuntes sobre munin, sitesummary y nagios"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:253
-#, no-wrap
 msgid "Upgrades"
 msgstr "Actualizaciones"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:254
-#, no-wrap
 msgid "Upgrades from Debian-Edu sarge"
 msgstr "Actualizar desde Debian-Edu sarge"
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:255
-msgid "<emphasis role='strong'>FIXME </emphasis>: document known any issues here!"
-msgstr "<emphasis role='strong'>POR CORREGIR </emphasis>: ¡documenta cualquier problema conocido aquí!"
+msgid ""
+"<emphasis role='strong'>FIXME </emphasis>: document known any issues here!"
+msgstr ""
+"<emphasis role='strong'>POR CORREGIR </emphasis>: ¡documenta cualquier "
+"problema conocido aquí!"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:258
-#, no-wrap
 msgid "Upgrades from older Debian-Edu / Skolelinux installations"
 msgstr "Actualizar desde instalaciones antiguas de Debian-Edu / Skolelinux"
 
@@ -779,65 +594,38 @@ msgstr "Actualizar desde instalaciones antiguas de Debian-Edu / Skolelinux"
 msgid ""
 "Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
 "supported. Upgrade to the sarge based version first, a howto can be found at "
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0'>http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0 </ulink>"
+"<ulink url='http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0'>http://"
+"wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0 </ulink>"
 msgstr ""
-"NO están soportadas las actualizaciones desde instalaciones de Debian-Edu / Skolelinux basadas "
-"en Woody. Actualízalas primero a Sarge. Se pueden encontrar instrucciones para ello en"
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0'>http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0 </ulink>"
+"NO están soportadas las actualizaciones desde instalaciones de Debian-Edu / "
+"Skolelinux basadas en Woody. Actualízalas primero a Sarge. Se pueden "
+"encontrar instrucciones para ello en<ulink url='http://wiki.debian.org/"
+"DebianEdu/HowTo/UpgradeFrom1.0'>http://wiki.debian.org/DebianEdu/HowTo/"
+"UpgradeFrom1.0 </ulink>"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:263
-#, no-wrap
 msgid "Contribute"
 msgstr "Contribuir"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:264
-#, no-wrap
 msgid "Resources"
 msgstr "Recursos"
 
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:265
 msgid "<emphasis role='strong'>FIXME </emphasis>, for now some basic pointers:"
-msgstr "<emphasis role='strong'>POR CORREGIR </emphasis>, por ahora unas indicaciones básicas:"
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:267
-msgid ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/DebianEdu "
-"</ulink>"
 msgstr ""
-"<ulink "
-"url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/DebianEdu "
-"</ulink>"
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:270
-msgid ""
-"<ulink "
-"url='http://lists.debian.org/debian-edu'>http://lists.debian.org/debian-edu "
-"</ulink>"
-msgstr ""
-"<ulink "
-"url='http://lists.debian.org/debian-edu'>http://lists.debian.org/debian-edu "
-"</ulink>"
+"<emphasis role='strong'>POR CORREGIR </emphasis>, por ahora unas "
+"indicaciones básicas:"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:276
-#, no-wrap
 msgid "Translations wanted"
 msgstr "Se necesitan traducciones"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:277
-msgid "<emphasis role='strong'>FIXME </emphasis>"
-msgstr "<emphasis role='strong'>POR CORREGIR </emphasis>"
-
-# type: Content of: <article><para><section><section><para>
 #: release-manual.xml:279
 msgid "how to help / translate"
 msgstr "como ayudar / traducir"
@@ -845,11 +633,11 @@ msgstr "como ayudar / traducir"
 # type: Content of: <article><para><section><section><para>
 #: release-manual.xml:280
 msgid "explain how to help debian-edu explain how to help debian / upstream"
-msgstr "explicar como ayudar a debian-edu, explicar como ayudar a debian /upstream"
+msgstr ""
+"explicar como ayudar a debian-edu, explicar como ayudar a debian /upstream"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:282
-#, no-wrap
 msgid "Join a local debian-edu team"
 msgstr "Unirse a un equipo local de debian-edu"
 
@@ -859,12 +647,11 @@ msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: in Norway, Germany, France, Spain "
 "(the region of Extremadura)."
 msgstr ""
-"<emphasis role='strong'>FIXME </emphasis>: en Noruega, Alemania, Francia, España  "
-"(la región de Extremadura con LinEx)."
+"<emphasis role='strong'>FIXME </emphasis>: en Noruega, Alemania, Francia, "
+"España  (la región de Extremadura con LinEx)."
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:286
-#, no-wrap
 msgid "start a new local debian-edu team"
 msgstr "comenzar un nuevo equipo local de debian-edu"
 
@@ -876,24 +663,226 @@ msgid ""
 "up for beer or coffee and form a new Debian Edu local team!"
 msgstr ""
 "<emphasis role='strong'>POR CORREGIR: </emphasis> existen contribuidores  y "
-"usuarios \"aislados\" en Grecia, Holanda, Japón y más sitios. ¡Cítate con ellos "
-"para una cerveza o un café y formad un nuevo equipo local de Debian-edu!"
+"usuarios \"aislados\" en Grecia, Holanda, Japón y más sitios. ¡Cítate con "
+"ellos para una cerveza o un café y formad un nuevo equipo local de Debian-"
+"edu!"
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:291
-#, no-wrap
 msgid "Support"
 msgstr "Soporte"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:292
-#, no-wrap
 msgid "volunteer based support"
 msgstr "soporte basado en voluntarios"
 
 # type: Content of: <article><para><section><section><title>
 #: release-manual.xml:294
-#, no-wrap
 msgid "professional support"
 msgstr "soporte profesional"
 
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations of "
+#~ "this document </ulink>"
+#~ msgstr ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones de "
+#~ "este documento </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Arquitectura</"
+#~ "ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requierements </"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requerimientos </"
+#~ "ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation </"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Installation'>Instalación </"
+#~ "ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Maintainance </"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Mantenimiento </"
+#~ "ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink>"
+#~ msgstr ""
+#~ "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Actualizaciones </"
+#~ "ulink>"
+
+# type: Content of: <article><para><section><section><para>
+#~ msgid "</inlinemediaobject>"
+#~ msgstr "</inlinemediaobject>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-"
+#~ "i386-powerpc-DVD-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-etch-amd64-i386-powerpc-DVD-rc4.iso </ulink>"
+#~ msgstr ""
+#~ "<ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-"
+#~ "i386-powerpc-DVD-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-etch-amd64-i386-powerpc-DVD-rc4.iso </ulink>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-"
+#~ "i386-powerpc-DVD-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-etch-amd64-i386-powerpc-DVD-rc4.iso </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-"
+#~ "i386-powerpc-DVD-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-etch-amd64-i386-powerpc-DVD-rc4.iso </ulink>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-"
+#~ "netinst-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
+#~ "i386-netinst-rc4.iso </ulink>"
+#~ msgstr ""
+#~ "<ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-"
+#~ "netinst-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
+#~ "i386-netinst-rc4.iso </ulink>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-"
+#~ "netinst-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
+#~ "i386-netinst-rc4.iso </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-"
+#~ "netinst-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
+#~ "i386-netinst-rc4.iso </ulink>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-"
+#~ "netinst-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
+#~ "amd64-netinst-rc4.iso </ulink>"
+#~ msgstr ""
+#~ "<ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-"
+#~ "netinst-rc4.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
+#~ "amd64-netinst-rc4.iso </ulink>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-"
+#~ "netinst-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
+#~ "amd64-netinst-rc4.iso </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-"
+#~ "netinst-rc4.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
+#~ "amd64-netinst-rc4.iso </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn'>http://"
+#~ "wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn'>http://"
+#~ "wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/BackupPC'>http://wiki."
+#~ "debian.org/DebianEdu/HowTo/BackupPC </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/BackupPC'>http://wiki."
+#~ "debian.org/DebianEdu/HowTo/BackupPC </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>http://"
+#~ "wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>http://"
+#~ "wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/EtcInSvk'>http://wiki."
+#~ "debian.org/DebianEdu/HowTo/EtcInSvk </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/EtcInSvk'>http://wiki."
+#~ "debian.org/DebianEdu/HowTo/EtcInSvk </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "LocalDeviceLtspfs'>http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "LocalDeviceLtspfs </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "LocalDeviceLtspfs'>http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "LocalDeviceLtspfs </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "LtspDisklessWorkstation </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "LtspDisklessWorkstation </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://"
+#~ "wiki.debian.org/DebianEdu/HowTo/SiteSummary </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://"
+#~ "wiki.debian.org/DebianEdu/HowTo/SiteSummary </ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "Squid_LDAP_Authentication'>http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "Squid_LDAP_Authentication </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "Squid_LDAP_Authentication'>http://wiki.debian.org/DebianEdu/HowTo/"
+#~ "Squid_LDAP_Authentication </ulink>"
+
+# type: Content of: <article><para><section><section><para>
+#~ msgid "<inlinemediaobject>"
+#~ msgstr "<inlinemediaobject>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
+#~ "DebianEdu </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
+#~ "DebianEdu </ulink>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+#~ "debian-edu </ulink>"
+#~ msgstr ""
+#~ "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+#~ "debian-edu </ulink>"
+
+# type: Content of: <article><para><section><section><para>
+#~ msgid "<emphasis role='strong'>FIXME </emphasis>"
+#~ msgstr "<emphasis role='strong'>POR CORREGIR </emphasis>"
diff --git a/documentation/release-manual/release-manual.xml b/documentation/release-manual/release-manual.xml
index 2249bd3..448c628 100644
--- a/documentation/release-manual/release-manual.xml
+++ b/documentation/release-manual/release-manual.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0"?><article><articleinfo><title>DebianEdu/Documentation/Etch/AllInOne
 </title>
-</articleinfo><para><para/><section><title>Debian-Edu etch 3.0 Codename "Terra"
-</title><para>This is/will become the release manual for the Debian-Edu etch 3.0 release.  
+</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.  
 </para><para>This document was put into the <code>debian-edu-doc
 </code> package on $DEBIAN_EDU_DOC_BUILDDATE. (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.) <ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations
 </ulink> will be part of the <code>debian-edu-doc
-</code> package, which then can be installed on a webserver. 
+</code> package, which can be installed on a webserver. 
 </para><itemizedlist><listitem><para><ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright
 </ulink> and Authors 
 </para>
@@ -19,7 +20,7 @@
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture
 </ulink>  
 </para>
-</listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requierements
+</listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements
 </ulink>  
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation
@@ -126,12 +127,20 @@
 </listitem><listitem>Choose a language (for the installation and the installed system) 
 </listitem><listitem>Choose a time-zone 
 </listitem><listitem>Choose a keyboard keymap (usually the countrys default is fine) 
-</listitem><listitem>Choose a profile, explain those here (FIXME) <itemizedlist><listitem>server 
-</listitem><listitem>workstation 
-</listitem><listitem>terminal server 
-</listitem><listitem>standalone 
+</listitem><listitem>Choose a profile: <itemizedlist><listitem>server <itemizedlist><listitem>This is the main server for your school. File, print, intranet, proxy, DNS, DHCP, LDAP, backup, ..... all pre-configured and working. This computer needs a big hard drive. 
 </listitem>
 </itemizedlist>
+</listitem><listitem>workstation <itemizedlist><listitem>A computer booting from its local hard drive, and running all software and devices locally like an ordinary computer, but the user login is authenticated by the main server, where the user's files and desktop profile are stored. 
+</listitem>
+</itemizedlist>
+</listitem><listitem>terminal server <itemizedlist><listitem>Thin client (and diskless workstation) server. Clients with no hard drive boot and run software from this server. This computer needs two network cards, a lot of memory, and ideally more than one processor or core. 
+</listitem>
+</itemizedlist>
+</listitem><listitem>standalone <itemizedlist><listitem>An ordinary computer that can function without a main server, ie. doesn't need to be on the network. Includes laptops. 
+</listitem>
+</itemizedlist>
+</listitem>
+</itemizedlist>The first 3 profiles can all be installed on the same machine. That means the main server can also be a thin client server and can be used as a workstation. 
 </listitem><listitem>say yes to automatic partioning, it will destroy the data on the harddrives! 
 </listitem><listitem>say yes to partman 
 </listitem><listitem>wait 
@@ -146,28 +155,78 @@
 </ulink> from <ulink url='http://wiki.debian.org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/
 </ulink> are either user- or developer-specific. Let's move the user-specific <ulink url='/HowTos'>HowTos
 </ulink> over here! 
-</para><para>Other topics the documentation should cover, not neccessarily in the <ulink url='/HowTo'>HowTo
+</para><para>Those are not that many:  
+</para><itemizedlist><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn'>http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn
+</ulink> 
+</para>
+</listitem><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/BackupPC'>http://wiki.debian.org/DebianEdu/HowTo/BackupPC
+</ulink> 
+</para>
+</listitem><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet
+</ulink> 
+</para>
+</listitem><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/EtcInSvk'>http://wiki.debian.org/DebianEdu/HowTo/EtcInSvk
+</ulink> 
+</para>
+</listitem><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs'>http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs
+</ulink> 
+</para>
+</listitem><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation
+</ulink> 
+</para>
+</listitem><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/HowTo/SiteSummary
+</ulink> 
+</para>
+</listitem><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication'>http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication
+</ulink> 
+</para>
+</listitem><listitem><para><ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep
+</ulink> - incomplete but interesting  
+</para>
+</listitem>
+</itemizedlist><para>(see the history of those wiki pages and ask the authors if they are fine with moving the howto and putting it under the GPL) 
+</para><para/><section><title>Other topics
+</title><para>Other topics the documentation should cover, not neccessarily in the <ulink url='/HowTo'>HowTo
 </ulink> Chapter though <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
 </imageobject><textobject><phrase>:)
 </phrase>
 </textobject>
 </inlinemediaobject> 
-</para><para/><section><title>LDAP Setup
+</para><para/>
+</section><section><title>Installing single service machines for spreading the load from main-server
+</title><itemizedlist><listitem>barebone install using debian-edu-expert 
+</listitem><listitem>install the packages for the service 
+</listitem><listitem>configure the service 
+</listitem><listitem>disable the service on main-server 
+</listitem><listitem>update dns on main-server 
+</listitem>
+</itemizedlist><para/>
+</section><section><title>LDAP Setup
 </title><para/>
 </section><section><title>/etc/ in svk
 </title><para/>
 </section><section><title>modify Kiosk mode
 </title><para/>
 </section><section><title>Flash
-</title><itemizedlist><listitem>- install flashplugin-nonfree 
-</listitem>
-</itemizedlist><para/>
+</title><para>To install the Adobe Flash Player web browser plugin, install the <code>flashplugin-nonfree
+</code> debian package.  It require a working Internet connection, and will download the precompiled binary from Adobe and convert it into a Debian package before [...].  [Hm, no use documenting this if it does not work. pere 2007-07-12]. 
+</para><para><inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/alert.png' depth='15'/>
+</imageobject><textobject><phrase>/!\
+</phrase>
+</textobject>
+</inlinemediaobject> Version 9.0.31.0.1 of the package do not work in Etch [pere 2007-07-12] 
+</para><para>An alternative is to install flashplayer-mozilla from debian-multimedia.  It work with both konqueror and firefox. 
+</para><para/>
 </section><section><title>Java
 </title><itemizedlist><listitem>- install sun-java5-plugin 
 </listitem>
 </itemizedlist><para/>
 </section><section><title>Sound & Video
-</title><para/>
+</title><itemizedlist><listitem><para>- where to find libdvdcss for playing dvds.  Should we promote <ulink url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/
+</ulink> or some other site? 
+</para>
+</listitem>
+</itemizedlist><para/>
 </section><section><title>Thin Clients vs Half-Thick Clients
 </title><para/>
 </section><section><title>printer managing
@@ -175,6 +234,8 @@
 </section><section><title>Firewall setup (coyote linux)
 </title><para/>
 </section><section><title>LTSP in detail
+</title><para/>
+</section><section><title>Connecting windows machines to the network / windows integration
 </title>
 </section>
 </section> <para/><section><title>Maintainance
@@ -186,7 +247,7 @@
 </title><para>document slbackup-php / give pointers 
 </para><para/>
 </section><section><title>Monitoring
-</title><para>give pointers to munin doc  
+</title><para>give pointers to munin, sitesummary and nagios doc  
 </para>
 </section>
 </section> <para/><section><title>Upgrades


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