[debian-edu-commits] debian-edu/debian-edu-doc.git (#1600) - master (branch) updated: 1.5_20130915_7.1-9-geecb7d2
David Prévot
taffit at alioth.debian.org
Tue Sep 17 21:55:23 UTC 2013
The branch, master has been updated
via eecb7d27c47e8f4d7a5b9a94cad3966e3533d8bf (commit)
from fd7ab91a790c8a214afe584f9509571add287cc1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eecb7d27c47e8f4d7a5b9a94cad3966e3533d8bf
Author: David Prévot <taffit at debian.org>
Date: Tue Sep 17 17:54:30 2013 -0400
Update manual from the wiki (no new strings)
Git-Dch: Ignore
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-wheezy-manual.de.po | 71 +++++++-------------
.../debian-edu-wheezy-manual.es.po | 70 +++++++------------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 37 +++++-----
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 20 +++---
4 files changed, 79 insertions(+), 119 deletions(-)
The diff of changes is:
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 142f8db..d7bcfcd 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-17 22:53+0300\n"
+"POT-Creation-Date: 2013-09-17 17:52-0400\n"
"PO-Revision-Date: 2013-09-17 23:15+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -201,15 +201,6 @@ msgid "The Debian Edu network topology"
msgstr "Die Struktur des Debian-Edu -Netzwerks"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main-"
-#| "server, while allowing the inclusion of both normal workstations and thin-"
-#| "client-servers (with associated thin-clients). The number of workstations "
-#| "can be as large or small as you want (starting from none to a lot). The "
-#| "same goes for the thin-client servers, each of which is on a separate "
-#| "network so that the traffic between the thin-clients and the thin-client "
-#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
@@ -761,9 +752,6 @@ msgid "LTSP server(s) (Thin client server(s))"
msgstr "LTSP-Server (Terminal-Server)"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the LTSP server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
"servers), which are installed by selecting the Thin client server profile."
@@ -792,8 +780,8 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
-"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
+"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
"Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
"Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
"Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -927,10 +915,6 @@ msgid "Installation"
msgstr "Installation"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Currently there are three kinds of installation media images: netinstall "
-#| "(CD) and i386-only DVD and multi-arch USB flash drive. All of these "
-#| "images can also be booted from USB sticks."
msgid ""
"Currently there are two kinds of installation media images: netinstall (CD) "
"and multi-arch USB flash drive. Both images can also be booted from USB "
@@ -1457,19 +1441,19 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"CD.iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-CD."
+"iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"CD.iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-CD."
+"iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
@@ -1497,19 +1481,19 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"USB.iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-USB."
+"iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"USB.iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-USB."
+"iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
msgid "Source DVD"
@@ -1541,13 +1525,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</"
-"computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</"
-"computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -9093,8 +9075,6 @@ msgid "New features in Debian Edu Wheezy"
msgstr "Neuerungen in Debian Edu Wheezy"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-??-??"
msgid ""
"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-21"
msgstr ""
@@ -9289,7 +9269,6 @@ msgstr ""
"Admin."
#. type: Content of: <article><section><section><section><title>
-#| msgid "Known issues with the image"
msgid "Known issues"
msgstr "Bekannte Probleme"
@@ -9579,8 +9558,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 5ec36b9..e02274a 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-17 22:53+0300\n"
+"POT-Creation-Date: 2013-09-17 17:52-0400\n"
"PO-Revision-Date: 2013-09-17 15:18-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -153,8 +153,8 @@ msgid ""
"(Debian-)\"Education\" are just two well understood terms in these regions."
msgstr ""
"El proyecto Skolelinux fué fundado en Noruega el 2 de julio de 2001, y casi "
-"a la vez Raphaël Hertzog iniciaba el proyecto Debian Edu en Francia. Desde el "
-"2003, ambos proyectos trabajaron unidos, aunque los nombres permanecieron "
+"a la vez Raphaël Hertzog iniciaba el proyecto Debian Edu en Francia. Desde "
+"el 2003, ambos proyectos trabajaron unidos, aunque los nombres permanecieron "
"separados. \"Skole\" y (Debian-)\"Educativo\" son dos términos bien "
"conocidos en estas regiones."
@@ -194,15 +194,6 @@ msgid "The Debian Edu network topology"
msgstr "La Topología de red de Debian Edu"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main-"
-#| "server, while allowing the inclusion of both normal workstations and thin-"
-#| "client-servers (with associated thin-clients). The number of workstations "
-#| "can be as large or small as you want (starting from none to a lot). The "
-#| "same goes for the thin-client servers, each of which is on a separate "
-#| "network so that the traffic between the thin-clients and the thin-client "
-#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
@@ -1733,8 +1724,8 @@ msgstr ""
#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"CD.iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-CD."
+"iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1745,8 +1736,8 @@ msgstr ""
#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/"
#| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -1790,8 +1781,8 @@ msgstr ""
#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"USB.iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-USB."
+"iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1802,8 +1793,8 @@ msgstr ""
#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/"
#| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -1857,9 +1848,8 @@ msgstr ""
#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/"
#| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</"
-"computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -5630,7 +5620,6 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-#| msgid "Upgrading with a CD or DVD ROM"
msgid "Upgrading with a CD or similar image"
msgstr "Actualizar con un CD o similar"
@@ -5645,9 +5634,6 @@ msgstr ""
"siguientes pasos:"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom "
-#| "command:"
msgid ""
"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
@@ -6293,11 +6279,10 @@ msgstr ""
"El reproductor de flash libre <computeroutput>gnash</computeroutput> se "
"instala de manera predeterminada, pero puede cambiar a Adobe Flash si lo "
"desea. Para instalar el complemento web del reproductor Adobe Flash (no "
-"libre), instale el paquete <computeroutput>flashplugin-"
-"nonfree</computeroutput> que está en el directorio "
-"<computeroutput>contrib</computeroutput>. Esto requiere que tenga habilitado "
-"<computeroutput>contrib</computeroutput> en "
-"<computeroutput>/etc/apt/sources.list</computeroutput>."
+"libre), instale el paquete <computeroutput>flashplugin-nonfree</"
+"computeroutput> que está en el directorio <computeroutput>contrib</"
+"computeroutput>. Esto requiere que tenga habilitado <computeroutput>contrib</"
+"computeroutput> en <computeroutput>/etc/apt/sources.list</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Playing DVDs"
@@ -6342,12 +6327,9 @@ msgstr ""
"apt-get install debian-keyring\n"
"# descargue la llave deb-multimedia:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# revise de manera segura si la llave es correcta y agreguela al keyring "
-"usado por APT:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 "
-"&& gpg --export 1F41B907 | apt-key add -\n"
-"# agregue el repositorio a sources.list - revise el sitio web para buscar "
-"réplicas!\n"
+"# revise de manera segura si la llave es correcta y agreguela al keyring usado por APT:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"# agregue el repositorio a sources.list - revise el sitio web para buscar réplicas!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# Actualice la lista de paquetes disponibles::\n"
"apt-get update"
@@ -6451,8 +6433,8 @@ msgstr "Agregar estaciones de trabajo sin disco a LDAP con GOsa²."
#, fuzzy
msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
msgstr ""
-"<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas indicaciones "
-"básicas:"
+"<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
+"indicaciones básicas:"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -11193,8 +11175,8 @@ msgstr ""
#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#~| "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
#~ msgid ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
-#~ "edu-7.1+edu0-DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
#~ msgstr ""
#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#~ "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
@@ -11204,8 +11186,8 @@ msgstr ""
#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#~| "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
#~ msgid ""
-#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-#~ "edu-7.1+edu0-DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
#~ msgstr ""
#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#~ "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index cb2a8ff..4c6bf94 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-17 22:53+0300\n"
+"POT-Creation-Date: 2013-09-17 17:52-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
-"same time Raphael Herzog started Debian-Edu in France. Since 2003 both "
+"same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both "
"projects are united, but both names stayed. \"Skole\" and "
"(Debian-)\"Education\" are just two well understood terms in these regions."
msgstr ""
@@ -1047,19 +1047,19 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~b2-CD.iso\">debian-edu-7.1+edu0~b2-CD.iso</ulink>"
+"edu-7.1+edu0-CD.iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b2-"
-"CD.iso\">debian-edu-7.1+edu0~b2-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-CD."
+"iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~b2-CD.iso|debian-edu-7.1+edu0~b2-CD.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1077,19 +1077,19 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~b2-USB.iso\">debian-edu-7.1+edu0~b2-USB.iso</ulink>"
+"edu-7.1+edu0-USB.iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b2-"
-"USB.iso\">debian-edu-7.1+edu0~b2-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-USB."
+"iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~b2-USB.iso|debian-edu-7.1+edu0~b2-USB.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1106,21 +1106,20 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b2-"
-"source-DVD.iso\">debian-edu-7.1+edu0~b2-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b2-"
-"source-DVD.iso\">debian-edu-7.1+edu0~b2-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~b2-source-DVD.iso debian-edu-7.1+edu0~b2-source-DVD.iso</"
-"computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 5f94d38..2b1c4b4 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -31,7 +31,7 @@
</para>
<para>What this means for your school is that Skolelinux is a version of Debian providing an out-of-the box environment of a completely configured school-network.
</para>
-<para>The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the same time Raphael Herzog started Debian-Edu in France. Since 2003 both projects are united, but both names stayed. "Skole" and (Debian-)"Education" are just two well understood terms in these regions.
+<para>The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both projects are united, but both names stayed. "Skole" and (Debian-)"Education" are just two well understood terms in these regions.
</para>
<para>The main target group in Norway initially were schools serving the 6-16 years age bracket. Today the system is in use in several countries around the world, with most installations in Norway, Spain, Germany and France.
</para>
@@ -432,11 +432,11 @@
<para>The netinstall CD, which also can be used for installation from USB flash drives, is suited to install on i386 and amd64 machines. It's available via
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0~b2-CD.iso">debian-edu-7.1+edu0~b2-CD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0-CD.iso">debian-edu-7.1+edu0-CD.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b2-CD.iso">debian-edu-7.1+edu0~b2-CD.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-CD.iso">debian-edu-7.1+edu0-CD.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~b2-CD.iso|debian-edu-7.1+edu0~b2-CD.iso </computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>
</para></listitem></itemizedlist>
</section>
@@ -446,11 +446,11 @@
<para>The multi-architecture ISO image is 5.2 GiB large and can be used for installation of amd64 and i386 machines. It behaves like the former DVD image which means it doesn't use internet access during installation. Like the others it can be downloaded over FTP, HTTP or rsync via:
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0~b2-USB.iso">debian-edu-7.1+edu0~b2-USB.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0-USB.iso">debian-edu-7.1+edu0-USB.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b2-USB.iso">debian-edu-7.1+edu0~b2-USB.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-USB.iso">debian-edu-7.1+edu0-USB.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~b2-USB.iso|debian-edu-7.1+edu0~b2-USB.iso </computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>
</para></listitem></itemizedlist>
</section>
@@ -463,11 +463,11 @@ FIXME: the source DVD download URL currently doesn't work
<para>The source DVD is available via
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b2-source-DVD.iso">debian-edu-7.1+edu0~b2-source-DVD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso">debian-edu-7.1+edu0-source-DVD.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b2-source-DVD.iso">debian-edu-7.1+edu0~b2-source-DVD.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso">debian-edu-7.1+edu0-source-DVD.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~b2-source-DVD.iso debian-edu-7.1+edu0~b2-source-DVD.iso</computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>
</para></listitem></itemizedlist>
</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