[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Jessie manual from the wiki.
Holger Levsen
holger at moszumanska.debian.org
Sat Apr 25 23:11:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-doc.
commit 51a404546afdf118f788057f1ce86c42a62cc6c8
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Apr 26 01:11:21 2015 +0200
Update Debian Edu Jessie manual from the wiki.
---
debian/changelog | 2 +-
.../debian-edu-jessie-manual.da.po | 125 ++++++-----
.../debian-edu-jessie-manual.de.po | 73 ++++---
.../debian-edu-jessie-manual.es.po | 91 ++++----
.../debian-edu-jessie-manual.fr.po | 145 +++++--------
.../debian-edu-jessie-manual.it.po | 93 ++++----
.../debian-edu-jessie-manual.nb.po | 239 +++++++++++++--------
.../debian-edu-jessie-manual.nl.po | 134 +++++-------
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 25 +--
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 13 +-
10 files changed, 476 insertions(+), 464 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e040367..9342cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
debian-edu-doc (1.6~20150423~8+edu0~beta2) UNRELEASED; urgency=medium
- * continue development...
+ * Update Debian Edu Jessie manual from the wiki.
-- Holger Levsen <holger at debian.org> Wed, 22 Apr 2015 13:29:55 +0200
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index 721adf1..172abe4 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2015-04-20 17:29+0000\n"
+"POT-Creation-Date: 2015-04-25 23:04+0000\n"
"PO-Revision-Date: 2015-04-21 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1432,8 +1432,8 @@ msgid ""
msgstr ""
"Dvd ISO-aftrykket for flere arkitekturer er på 5,2 GiB og kan bruges for "
"installation på amd64- og i386-maskiner. Bemærk venligst at internetadgang "
-"under installatonen er krævet. Som de andre kan aftrykket hentes over "
-"FTP, HTTP eller rsync via:"
+"under installatonen er krævet. Som de andre kan aftrykket hentes over FTP, "
+"HTTP eller rsync via:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1460,38 +1460,16 @@ msgstr ""
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source image"
-msgstr "Kildeaftryk"
+#, fuzzy
+#| msgid "Sources:"
+msgid "Sources"
+msgstr "Kilder:"
#. type: Content of: <article><section><section><section><para>
-msgid "The source image is available via"
-msgstr "Kildeaftrykket er tilgængelig via"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
+"Sources are available from the Debian archive, see <ulink url=\"http://ftp."
+"debian.org/debian-cd/8.0.0/source/\"/> for some download options."
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
-msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -4613,8 +4591,8 @@ msgid ""
"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
"Fjern diversion; <computeroutput>debian-edu-config</computeroutput>s "
-"postinst ser ud til at gøre det for sent (Debianfejl "
-"<ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"postinst ser ud til at gøre det for sent (Debianfejl <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
#. type: CDATA
#, no-wrap
@@ -4651,8 +4629,9 @@ msgid ""
"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
msgstr ""
"Hvis <computeroutput>apt-get</computeroutput> stadig afslutter med en fejl, "
-"så prøv at rette den og/eller køre <computeroutput>apt-get</computeroutput>"
-"-kommandoerne igen, specielt <computeroutput>apt-get -f install</computeroutput>.."
+"så prøv at rette den og/eller køre <computeroutput>apt-get</computeroutput>-"
+"kommandoerne igen, specielt <computeroutput>apt-get -f install</"
+"computeroutput>.."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4674,9 +4653,9 @@ msgid ""
"computeroutput> is deprecated and missing in jessie (Debian bug <ulink url="
"\"https://bugs.debian.org/779649#\">779649</ulink>)."
msgstr ""
-"Installer <computeroutput>squid3</computeroutput> da <computeroutput>squid"
-"</computeroutput> er forældet og mangler i Jessie (Debianfejl <ulink "
-"url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"Installer <computeroutput>squid3</computeroutput> da <computeroutput>squid</"
+"computeroutput> er forældet og mangler i Jessie (Debianfejl <ulink url="
+"\"https://bugs.debian.org/779649#\">779649</ulink>)."
#. type: CDATA
#, no-wrap
@@ -4725,8 +4704,8 @@ msgid ""
"in case it has been modified."
msgstr ""
"Gendan <computeroutput>gosa.secrets</computeroutput> for at GOsa² fungerer "
-"med den nye php-version; lav en sikkerhedskopi af <computeroutput>gosa.conf"
-"</computeroutput> i tilfælde af, at den er blevet ændret."
+"med den nye php-version; lav en sikkerhedskopi af <computeroutput>gosa.conf</"
+"computeroutput> i tilfælde af, at den er blevet ændret."
#. type: CDATA
#, no-wrap
@@ -7632,10 +7611,10 @@ msgid ""
"manual <computeroutput>/usr/share/doc/ltsp/LTSPManual.html#printer</"
"computeroutput> for details."
msgstr ""
-"Konfigurer denne maskine til at køre en printer i lts.conf (standardplacering: "
-"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>, se LTSP-"
-"manualen <computeroutput>/usr/share/doc/ltsp/LTSPManual.html#printer</"
-"computeroutput> for detaljer."
+"Konfigurer denne maskine til at køre en printer i lts.conf "
+"(standardplacering: <computeroutput>/opt/ltsp/i386/etc/lts.conf</"
+"computeroutput>, se LTSP-manualen <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html#printer</computeroutput> for detaljer."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -7645,11 +7624,11 @@ msgid ""
"regardless of brand or model) and set <computeroutput>socket://<LTSP "
"client ip>:9100</computeroutput> as connection URI."
msgstr ""
-"Konfigurer printeren via netgrænsefladen <computeroutput>https://"
-"www:631</computeroutput> på tjener; vælg netværksprintertype "
+"Konfigurer printeren via netgrænsefladen <computeroutput>https://www:631</"
+"computeroutput> på tjener; vælg netværksprintertype "
"<computeroutput>AppSocket/HP JetDirect</computeroutput> (for alle printere "
-"uanset mærke eller model) og angiv <computeroutput>socket://<LTSP "
-"client ip>:9100</computeroutput> som forbindelses-URI."
+"uanset mærke eller model) og angiv <computeroutput>socket://<LTSP client "
+"ip>:9100</computeroutput> som forbindelses-URI."
#. type: Content of: <article><section><section><section><title>
msgid "Upgrading the LTSP environment"
@@ -9827,8 +9806,8 @@ msgid ""
msgstr ""
"Dette er den første betaudgivelse af Debian Edu 8.0+edu0. Ingen væsentlige "
"ændringer ventes for den endelige udgivelse. Giv venligst tilbagemeldinger "
-"til <ulink url=\"mailto:debian-edu at lists.debian.org\">"
-"debian-edu at lists.debian.org</ulink>!"
+"til <ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists."
+"debian.org</ulink>!"
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
@@ -9879,8 +9858,8 @@ msgid ""
"KDE Plasma Workspace is installed by default; to choose one of the others "
"see this manual."
msgstr ""
-"KDE Plasma Workspace installeres som standard; for at vælge en af de andre så se "
-"denne manual."
+"KDE Plasma Workspace installeres som standard; for at vælge en af de andre "
+"så se denne manual."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "the browsers Iceweasel 31 ESR and Chromium 41"
@@ -10100,8 +10079,9 @@ msgid ""
"2013) and is released under the GPL v2 or any later version."
msgstr ""
"Den spanske oversættelse er underlagt ophavsretten af José L. Redrejo "
-"Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012, 2015) og Norman Garcia "
-"(2010, 2012, 2013). Udgivet under GPL version 2 eller enhver senere version."
+"Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012, 2015) og Norman "
+"Garcia (2010, 2012, 2013). Udgivet under GPL version 2 eller enhver senere "
+"version."
#. type: Content of: <article><section><para>
msgid ""
@@ -10144,8 +10124,8 @@ msgid ""
"and is released under the GPL v2 or any later version."
msgstr ""
"Den italiensk oversættelse Claudio Carboncini (2007, 2008, 2009, 2010, 2011, "
-"2012, 2013, 2014, 2015) og Beatrice Torracca (2013, 2014) og er udgivet under "
-"GPL version 2 eller en senere version."
+"2012, 2013, 2014, 2015) og Beatrice Torracca (2013, 2014) og er udgivet "
+"under GPL version 2 eller en senere version."
#. type: Content of: <article><section><para>
msgid ""
@@ -12635,6 +12615,39 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Source image"
+#~ msgstr "Kildeaftryk"
+
+#~ msgid "The source image is available via"
+#~ msgstr "Kildeaftrykket er tilgængelig via"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+
#~ msgid ""
#~ "Replace squid with squid3, keep the cache; a new swap file will be "
#~ "generated and the cache index be rebuilt upon first squid3 start."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 4bcd32a..c2f70a2 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-20 17:29+0000\n"
+"POT-Creation-Date: 2015-04-25 23:04+0000\n"
"PO-Revision-Date: 2015-04-20 21:20+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1509,38 +1509,16 @@ msgstr ""
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source image"
-msgstr "Quelltext-Image"
+#, fuzzy
+#| msgid "Sources:"
+msgid "Sources"
+msgstr "Quellen:"
#. type: Content of: <article><section><section><section><para>
-msgid "The source image is available via"
-msgstr "Das Quelltext-Image ist so erhältlich:"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
+"Sources are available from the Debian archive, see <ulink url=\"http://ftp."
+"debian.org/debian-cd/8.0.0/source/\"/> for some download options."
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -10607,8 +10585,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 "
@@ -12960,6 +12938,39 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid "Source image"
+#~ msgstr "Quelltext-Image"
+
+#~ msgid "The source image is available via"
+#~ msgstr "Das Quelltext-Image ist so erhältlich:"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+
#~ msgid ""
#~ "Replace <computeroutput>squid</computeroutput> with "
#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 1ad8f08..e70e213 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-20 17:29+0000\n"
+"POT-Creation-Date: 2015-04-25 23:04+0000\n"
"PO-Revision-Date: 2015-03-30 22:30+0000\n"
"Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1486,50 +1486,16 @@ msgstr ""
"USB.iso|debian-edu-8.0+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source image"
-msgstr "Imagen del código fuente"
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The source image is available via"
-msgstr "La imagen del código fuente esta disponible vía: "
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
-"iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
-"iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+#| msgid "Sources:"
+msgid "Sources"
+msgstr "Fuentes:"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </"
-#| "computeroutput>"
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
+"Sources are available from the Debian archive, see <ulink url=\"http://ftp."
+"debian.org/debian-cd/8.0.0/source/\"/> for some download options."
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso|debian-edu-8.0+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -10780,3 +10746,46 @@ msgid ""
msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+
+#~ msgid "Source image"
+#~ msgstr "Imagen del código fuente"
+
+#~ msgid "The source image is available via"
+#~ msgstr "La imagen del código fuente esta disponible vía: "
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~| "debian-edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </"
+#~| "computeroutput>"
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-8.0+edu0-USB.iso|debian-edu-8.0+edu0-USB.iso </computeroutput>"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index dbe0e67..6165a15 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-04-20 17:29+0000\n"
+"POT-Creation-Date: 2015-04-25 23:04+0000\n"
"PO-Revision-Date: 2015-04-21 15:45+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1435,10 +1435,6 @@ msgid "netinstall CD image for i386, amd64"
msgstr "images CD d'installation par le réseau pour i386 et amd64"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "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"
msgid ""
"The netinstall CD, which also can be used for installation from USB flash "
"drives, is suitable to install i386 and amd64 machines. As the name implies, "
@@ -1450,9 +1446,6 @@ msgstr ""
"nécessaire pour l'installation. Cette image est disponible :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
@@ -1461,9 +1454,6 @@ msgstr ""
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
@@ -1472,9 +1462,6 @@ msgstr ""
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0~b1-CD.iso ./debian-edu-8.0+edu0~b1-CD.iso </computeroutput>"
@@ -1488,11 +1475,6 @@ msgstr ""
"image pour clé USB ou disque Blu-ray pour les architectures i386 et amd64"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "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:"
msgid ""
"The multi-architecture ISO image is 5.2 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
@@ -1505,9 +1487,6 @@ msgstr ""
"téléchargée en utilisant FTP, HTTP ou rsync :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
@@ -1516,9 +1495,6 @@ msgstr ""
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
@@ -1527,10 +1503,6 @@ msgstr ""
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </"
-#| "computeroutput>"
msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
@@ -1539,48 +1511,16 @@ msgstr ""
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source image"
-msgstr "Image des sources"
+#, fuzzy
+#| msgid "Sources:"
+msgid "Sources"
+msgstr "Sources :"
#. type: Content of: <article><section><section><section><para>
-msgid "The source image is available via"
-msgstr "L'image contenant les sources est disponible :"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
-#| "computeroutput>"
msgid ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
+"Sources are available from the Debian archive, see <ulink url=\"http://ftp."
+"debian.org/debian-cd/8.0.0/source/\"/> for some download options."
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -10181,8 +10121,6 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nouvelles fonctionnalités dans Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 8.0+edu0 Codename Jessie released 2015-XX-YY"
msgid ""
"New features for Debian Edu 8.0+edu0~b1 Codename Jessie released 2015-04-25"
msgstr ""
@@ -10219,7 +10157,6 @@ msgid "Software updates"
msgstr "Mises à jour des logiciels"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Everything which is new in Debian Jessie 8.0, eg:"
msgid "Everything which is new in Debian 8 Jessie, eg:"
msgstr "Toutes les nouveautés de Debian Jessie 8, comme par exemple :"
@@ -10234,9 +10171,6 @@ msgstr ""
"anciens sont les i586 (tels qu'Intel Pentium et AMD K5)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-#| "0.5.6"
msgid ""
"Desktop environments KDE Plasma Workspace 4.11.13, GNOME 3.14, Xfce 4.10, "
"LXDE 0.5.6"
@@ -10249,9 +10183,6 @@ msgid "new optional desktop environment: MATE 1.8"
msgstr "nouvel environnement de bureau proposé en option : MATE 1.8"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "KDE \"Plasma\" is installed by default; to choose one of the others see "
-#| "this manual."
msgid ""
"KDE Plasma Workspace is installed by default; to choose one of the others "
"see this manual."
@@ -10268,7 +10199,6 @@ msgid "LibreOffice 4.3.3"
msgstr "LibreOffice 4.3.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Educational toolbox GCompris 14.07"
msgid "Educational toolbox GCompris 14.12"
msgstr "Boîte à outils éducative GCompris 14.12"
@@ -10301,11 +10231,6 @@ msgid "Debian Jessie includes about 42000 packages available for installation."
msgstr "Debian Jessie contient environ 42 000 paquets prêts à être installés."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "More information about Debian Jessie 8.0 is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/jessie/"
-#| "installmanual\">installation manual</ulink>."
msgid ""
"More information about Debian 8 Jessie is provided in the <ulink url="
"\"http://www.debian.org/releases/jessie/releasenotes\">release notes</ulink> "
@@ -10478,10 +10403,6 @@ msgid "Translation copyright and authors"
msgstr "Droits d'auteur et auteurs des traductions"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
-#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
-#| "2012, 2013) and is released under the GPL v2 or any later version."
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012, 2015) and Norman Garcia (2010, 2012, "
@@ -10528,10 +10449,6 @@ msgstr ""
"toute version ultérieure."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) "
-#| "and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
@@ -10557,9 +10474,6 @@ msgstr ""
"distribuée sous GPL v2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) "
-#| "and is released under the GPL v2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
"and is released under the GPL v2 or any later version."
@@ -10728,7 +10642,7 @@ msgstr ""
"langue s'il n'existe pas déjà et comment mettre à jour les traductions."
#. <remark>
-#. status ignore</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 "
@@ -13101,6 +13015,49 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid "Source image"
+#~ msgstr "Image des sources"
+
+#~ msgid "The source image is available via"
+#~ msgstr "L'image contenant les sources est disponible :"
+
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+
+#~| msgid ""
+#~| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+
+#~| msgid ""
+#~| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~| "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+#~| "computeroutput>"
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+
#~ msgid ""
#~ "Replace <computeroutput>squid</computeroutput> with "
#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index 7e450fa..4cc08fa 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-04-20 17:29+0000\n"
+"POT-Creation-Date: 2015-04-25 23:04+0000\n"
"PO-Revision-Date: 2015-03-16 19:55+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1518,51 +1518,16 @@ msgstr ""
"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source image"
-msgstr "Immagine sorgente"
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The source image is available via"
-msgstr "L'immagine sorgente è disponibile da"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#| msgid "Sources:"
+msgid "Sources"
+msgstr "Fonti:"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
-#| "computeroutput>"
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
+"Sources are available from the Debian archive, see <ulink url=\"http://ftp."
+"debian.org/debian-cd/8.0.0/source/\"/> for some download options."
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
-"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -12838,6 +12803,50 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Source image"
+#~ msgstr "Immagine sorgente"
+
+#~ msgid "The source image is available via"
+#~ msgstr "L'immagine sorgente è disponibile da"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~| "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+#~| "computeroutput>"
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+#~ "computeroutput>"
+
#~ msgid ""
#~ "Replace <computeroutput>squid</computeroutput> with "
#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index fdd40b9..ae69888 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-04-20 17:29+0000\n"
+"POT-Creation-Date: 2015-04-25 23:04+0000\n"
"PO-Revision-Date: 2015-04-19 12:34+0000\n"
"Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -1400,25 +1400,37 @@ msgstr ""
"er tilgjengelig via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
-"iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
+"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
"iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
-"iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
+"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
"iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#| "debian-edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"edu-8.0+edu0~b1-CD.iso ./debian-edu-8.0+edu0~b1-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1440,62 +1452,53 @@ msgstr ""
"via FTP, HTTP eller rsync via:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
-"iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
+"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
"iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
-"iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
+"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
"iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#| "debian-edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </"
+#| "computeroutput>"
msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source image"
-msgstr "Kildebilde"
+#, fuzzy
+#| msgid "Sources:"
+msgid "Sources"
+msgstr "Kilder:"
#. type: Content of: <article><section><section><section><para>
-msgid "The source image is available via"
-msgstr "Kildekodebildet er tilgjengelig via"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+"Sources are available from the Debian archive, see <ulink url=\"http://ftp."
+"debian.org/debian-cd/8.0.0/source/\"/> for some download options."
msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
-"computeroutput>"
-msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
-"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -4708,35 +4711,6 @@ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
-"computeroutput>, keep the cache; a new swap file will be generated and the "
-"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
-"start."
-msgstr ""
-"Erstatte <computeroutput>squid</computeroutput> med <computeroutput>squid3</"
-"computeroutput>, behold hurtiglageret; en ny vekselminnefil genereres, og "
-"vekselminneindeksen bygges opp igjen ved første start av "
-"<computeroutput>squid3</computeroutput>."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i «s#/var/spool/squid#/var/spool/squid3#»/etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
"in case it has been modified."
@@ -9811,10 +9785,20 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nye egenskaper i Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 8.0+edu0 Codename Jessie released 2015-XX-YY"
msgid ""
-"New features for Debian Edu 8.0+edu0 Codename Jessie released 2015-XX-YY"
+"New features for Debian Edu 8.0+edu0~b1 Codename Jessie released 2015-04-25"
msgstr "Nye egenskaper i Debian Edu 8.0+edu0 kodenavn Jessie utgitt 2015-XX-YY"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"This is the first beta release of Debian Edu 8.0+edu0. No major changes are "
+"expected for the final release. Please report feedback to <ulink url="
+"\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
msgstr "Installasjonsendringer"
@@ -9834,7 +9818,9 @@ msgid "Software updates"
msgstr "Programvareoppdateringer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Jessie 8.0, eg:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Jessie 8.0, eg:"
+msgid "Everything which is new in Debian 8 Jessie, eg:"
msgstr "Alt som er nytt i Debian Jessie 8.0, for eksempel:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9847,9 +9833,13 @@ msgstr ""
"droppet. Eldste som støttes er: i586 (som Intel Pentium og AMD K5)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6"
msgid ""
-"Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6"
+"Desktop environments KDE Plasma Workspace 4.11.13, GNOME 3.14, Xfce 4.10, "
+"LXDE 0.5.6"
msgstr ""
"Skrivebordsmiljøet KDE «Plasma» 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6"
@@ -9858,9 +9848,13 @@ msgid "new optional desktop environment: MATE 1.8"
msgstr "Nytt valgfritt skrivebordsmiljø: MATE 1.8"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "KDE \"Plasma\" is installed by default; to choose one of the others see "
+#| "this manual."
msgid ""
-"KDE \"Plasma\" is installed by default; to choose one of the others see this "
-"manual."
+"KDE Plasma Workspace is installed by default; to choose one of the others "
+"see this manual."
msgstr ""
"KDE «Plasma» er installert som standard, for å velge et av de andre gjør du "
"som beskrevet annet sted i denne håndboken"
@@ -9874,7 +9868,9 @@ msgid "LibreOffice 4.3.3"
msgstr "LibreOffice 4.3.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 14.07"
+#, fuzzy
+#| msgid "Educational toolbox GCompris 14.07"
+msgid "Educational toolbox GCompris 14.12"
msgstr "Pedagogisk verktøykasse GCompris 14.07"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9907,8 +9903,14 @@ msgstr ""
"Debian Jessie omfatter omtrent 42 000 pakker tilgjengelig for installasjon"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"More information about Debian Jessie 8.0 is provided in the <ulink url="
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Jessie 8.0 is provided in the <ulink url="
+#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</"
+#| "ulink> and the <ulink url=\"http://www.debian.org/releases/jessie/"
+#| "installmanual\">installation manual</ulink>."
+msgid ""
+"More information about Debian 8 Jessie is provided in the <ulink url="
"\"http://www.debian.org/releases/jessie/releasenotes\">release notes</ulink> "
"and the <ulink url=\"http://www.debian.org/releases/jessie/installmanual"
"\">installation manual</ulink>."
@@ -10078,10 +10080,15 @@ msgid "Translation copyright and authors"
msgstr "Opphavsrett for oversettere"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
+#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
+#| "2012, 2013) and is released under the GPL v2 or any later version."
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
-"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
-"and is released under the GPL v2 or any later version."
+"Rafael Rivas (2009, 2010, 2011, 2012, 2015) and Norman Garcia (2010, 2012, "
+"2013) and is released under the GPL v2 or any later version."
msgstr ""
"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009-2012) og Norman Garcia (2010-2013), og er utgitt under "
@@ -10123,10 +10130,15 @@ msgstr ""
"senere versjon. Nyt!"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) "
+#| "and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) and "
-"is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
+"and is released under the GPL v2 or any later version."
msgstr ""
"Den italienske oversettelsen er gjort av Claudio Carboncini med opphavsrett "
"2007, og Beatrice Torracca, og er utgitt under GPLv2 eller senere versjoner."
@@ -10146,9 +10158,13 @@ msgstr ""
"senere versjon. Nyt!"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) "
+#| "and is released under the GPL v2 or any later version."
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
-"is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
+"and is released under the GPL v2 or any later version."
msgstr ""
"Opphavsretten for den danske oversettelsen tilhører Joe Hansen (2012, 2013, "
"2014), og er utgitt under GPL v2 eller en senere versjon."
@@ -10313,7 +10329,7 @@ msgstr ""
"språk, hvis det ikke finnes allerede, og hvordan oppdatere oversettelser. "
#. <remark>
-#. status ignore</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 "
@@ -12615,3 +12631,58 @@ msgstr ""
"Mer informasjon om de gamle utgavene kan du finne på <ulink url='http://"
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+
+#~ msgid "Source image"
+#~ msgstr "Kildebilde"
+
+#~ msgid "The source image is available via"
+#~ msgstr "Kildekodebildet er tilgjengelig via"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+#~ "computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+#~ "computeroutput>"
+
+#~ msgid ""
+#~ "Replace <computeroutput>squid</computeroutput> with "
+#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
+#~ "will be generated and the cache index be rebuilt upon first "
+#~ "<computeroutput>squid3</computeroutput> start."
+#~ msgstr ""
+#~ "Erstatte <computeroutput>squid</computeroutput> med "
+#~ "<computeroutput>squid3</computeroutput>, behold hurtiglageret; en ny "
+#~ "vekselminnefil genereres, og vekselminneindeksen bygges opp igjen ved "
+#~ "første start av <computeroutput>squid3</computeroutput>."
+
+#~ msgid ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+#~ msgstr ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i «s#/var/spool/squid#/var/spool/squid3#»/etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 4f8a97d..105e965 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-04-20 17:29+0000\n"
+"POT-Creation-Date: 2015-04-25 23:04+0000\n"
"PO-Revision-Date: 2015-04-20 20:41+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -1460,9 +1460,6 @@ msgstr ""
"internet nodig voor de installatie. Het image wordt beschikbaar gesteld via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
@@ -1471,9 +1468,6 @@ msgstr ""
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
@@ -1482,9 +1476,6 @@ msgstr ""
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0~b1-CD.iso ./debian-edu-8.0+edu0~b1-CD.iso </computeroutput>"
@@ -1509,9 +1500,6 @@ msgstr ""
"andere images kunt u het downloaden via FTP, HTTP of rsync vanaf:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
@@ -1520,9 +1508,6 @@ msgstr ""
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
@@ -1531,10 +1516,6 @@ msgstr ""
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </"
-#| "computeroutput>"
msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
@@ -1543,48 +1524,16 @@ msgstr ""
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source image"
-msgstr "Het image met de broncode"
+#, fuzzy
+#| msgid "Sources:"
+msgid "Sources"
+msgstr "Bronnen:"
#. type: Content of: <article><section><section><section><para>
-msgid "The source image is available via"
-msgstr "U vindt het image met de broncode via"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
-#| "computeroutput>"
msgid ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
+"Sources are available from the Debian archive, see <ulink url=\"http://ftp."
+"debian.org/debian-cd/8.0.0/source/\"/> for some download options."
msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -10300,8 +10249,6 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nieuwe functionaliteit in Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 8.0+edu0 Codename Jessie released 2015-XX-YY"
msgid ""
"New features for Debian Edu 8.0+edu0~b1 Codename Jessie released 2015-04-25"
msgstr ""
@@ -10339,7 +10286,6 @@ msgid "Software updates"
msgstr "Bijwerkingen van programmatuur"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Everything which is new in Debian Jessie 8.0, eg:"
msgid "Everything which is new in Debian 8 Jessie, eg:"
msgstr "Alles wat nieuw is in Debian Jessie 8, bijvoorbeeld:"
@@ -10354,9 +10300,6 @@ msgstr ""
"het type i586 (zoals Intel Pentium en AMD K5)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-#| "0.5.6"
msgid ""
"Desktop environments KDE Plasma Workspace 4.11.13, GNOME 3.14, Xfce 4.10, "
"LXDE 0.5.6"
@@ -10369,9 +10312,6 @@ msgid "new optional desktop environment: MATE 1.8"
msgstr "nieuwe optionele bureaubladomgeving: MATE 1.8"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "KDE \"Plasma\" is installed by default; to choose one of the others see "
-#| "this manual."
msgid ""
"KDE Plasma Workspace is installed by default; to choose one of the others "
"see this manual."
@@ -10388,7 +10328,6 @@ msgid "LibreOffice 4.3.3"
msgstr "LibreOffice 4.3.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Educational toolbox GCompris 14.07"
msgid "Educational toolbox GCompris 14.12"
msgstr "Gereedschapskist voor het onderwijs GCompris versie 14.12"
@@ -10423,11 +10362,6 @@ msgstr ""
"installatie."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "More information about Debian Jessie 8.0 is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/jessie/"
-#| "installmanual\">installation manual</ulink>."
msgid ""
"More information about Debian 8 Jessie is provided in the <ulink url="
"\"http://www.debian.org/releases/jessie/releasenotes\">release notes</ulink> "
@@ -10605,10 +10539,6 @@ msgid "Translation copyright and authors"
msgstr "Auteursrechten en auteurs van vertalingen"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
-#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
-#| "2012, 2013) and is released under the GPL v2 or any later version."
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012, 2015) and Norman Garcia (2010, 2012, "
@@ -10655,10 +10585,6 @@ msgstr ""
"de licentie GPL v2 of enige latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) "
-#| "and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
@@ -10684,9 +10610,6 @@ msgstr ""
"de licentie GPL v2 of enige latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) "
-#| "and is released under the GPL v2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
"and is released under the GPL v2 or any later version."
@@ -13262,6 +13185,49 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Source image"
+#~ msgstr "Het image met de broncode"
+
+#~ msgid "The source image is available via"
+#~ msgstr "U vindt het image met de broncode via"
+
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+
+#~| msgid ""
+#~| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-8.0+edu0~b1-source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</"
+#~ "ulink>"
+
+#~| msgid ""
+#~| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~| "debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+#~| "computeroutput>"
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#~ "debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB."
+#~ "iso</computeroutput>"
+
#~ msgid ""
#~ "Replace <computeroutput>squid</computeroutput> with "
#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index f2e44a9..9f849c5 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-20 17:29+0000\n"
+"POT-Creation-Date: 2015-04-25 23:04+0000\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"
@@ -1102,30 +1102,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Source image"
+msgid "Sources"
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid "The source image is available via"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-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-8.0+edu0~b1-"
-"source-USB.iso\">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</"
-"computeroutput>"
+"Sources are available from the Debian archive, see <ulink url=\"http://ftp."
+"debian.org/debian-cd/8.0.0/source/\"/> for some download options."
msgstr ""
#. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 6266db2..701d000 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -463,18 +463,11 @@
</para></listitem></itemizedlist>
</section>
-<section id="Installation--Source_image">
-<title>Source image
+<section id="Installation--Sources">
+<title>Sources
</title>
-<para>The source image is available via
+<para>Sources are available from the Debian archive, see <ulink url="http://ftp.debian.org/debian-cd/8.0.0/source/"/> for some download options.
</para>
-<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-source-USB.iso">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>
-</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-source-USB.iso">debian-edu-8.0+edu0~b1-source-USB.iso</ulink>
-</para>
-<para><computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0~b1-source-USB.iso ./debian-edu-8.0+edu0~b1-source-USB.iso</computeroutput>
-</para></listitem></itemizedlist>
</section>
</section>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list