[debian-edu-commits] debian-edu/debian-edu-doc.git (#1525) - master (branch) updated: 1.5_20130706_7.1-5-g9b1280e
Holger Levsen
holger at alioth.debian.org
Tue Jul 9 18:43:48 UTC 2013
The branch, master has been updated
via 9b1280e1095c67dc02a1995d8167b8bc70aa5f8e (commit)
from 69743640623403ae089bfb52c57f80ec9fbe6a44 (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 9b1280e1095c67dc02a1995d8167b8bc70aa5f8e
Author: Holger Levsen <holger at layer-acht.org>
Date: Tue Jul 9 20:43:33 2013 +0200
Updated from the wiki
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
documentation/audacity/audacity-manual.pot | 2 +-
.../debian-edu-squeeze-manual.pot | 2 +-
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386821 -> 386741 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386919 -> 386841 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386862 -> 386783 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386858 -> 386779 bytes
.../debian-edu-wheezy-manual.da.po | 389 +++++++++++++------
.../debian-edu-wheezy-manual.de.po | 399 ++++++++++++++------
.../debian-edu-wheezy-manual.es.po | 274 ++++++++------
.../debian-edu-wheezy-manual.fr.po | 399 ++++++++++++++------
.../debian-edu-wheezy-manual.it.po | 383 +++++++++++++------
.../debian-edu-wheezy-manual.nb.po | 239 +++++++-----
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 177 ++++-----
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 101 ++---
documentation/debian-edu-wheezy/fixme-status.txt | 2 +-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386821 -> 386741 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386919 -> 386841 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386862 -> 386783 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386858 -> 386779 bytes
documentation/rosegarden/rosegarden-manual.pot | 2 +-
21 files changed, 1595 insertions(+), 776 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6f10149..69644e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ debian-edu-doc (1.5~20130707~7.1) UNRELEASED; urgency=low
* Update manuals and images from the wiki.
[ Wolfgang Schweer ]
- * Add missing German image.
+ * Add a missing German image.
-- Holger Levsen <holger at debian.org> Sun, 07 Jul 2013 15:52:37 +0200
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index 0722f9f..e38c567 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 17:14+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\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"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index f6d2bde..9fc44a0 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 17:13+0300\n"
+"POT-Creation-Date: 2013-07-09 20:36+0300\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"
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 26d4ddd..0feece5 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index b4df9d9..cf263d4 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index 01968b3..d4a3b56 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 1d16a31..7d4f49a 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 62b6bd3..db94e7d 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-07-07 17:13+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\n"
"PO-Revision-Date: 2013-02-15 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -78,17 +78,29 @@ msgstr ""
# engelsk fejl kludret første sætning.
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Immediatly after installation a school server running all services needed "
+#| "for a school network is set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>), just "
+#| "waiting for users and machines being added via GOsa², a comfortable Web-"
+#| "UI, or any other LDAP editor. A netbooting environment is prepared using "
+#| "PXE, so after initial installation of the main server from CD, DVD or "
+#| "usbstick all other machines can be installed via the network, this "
+#| "includes \"roaming workstations\" (ones that can be taken away from the "
+#| "school network, usually laptops or netbooks) as well as PXE booting for "
+#| "diskless machines like tradional thin-clients."
msgid ""
"Immediatly after installation a school server running all services needed "
"for a school network is set up (see the next chapter <link linkend="
"\"Architecture\">details of the architecture of this setup</link>), just "
"waiting for users and machines being added via GOsa², a comfortable Web-UI, "
"or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, DVD or usbstick all "
-"other machines can be installed via the network, this includes \"roaming "
-"workstations\" (ones that can be taken away from the school network, usually "
-"laptops or netbooks) as well as PXE booting for diskless machines like "
-"tradional thin-clients."
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive all other machines can be installed via the network, this "
+"includes \"roaming workstations\" (ones that can be taken away from the "
+"school network, usually laptops or netbooks) as well as PXE booting for "
+"diskless machines like tradional thin-clients."
msgstr ""
"Umiddelbart efter installationen af en skoleserver - der kører alle "
"tjenester krævet for et skolenetværk - sættes dette netværk op (se det næste "
@@ -855,11 +867,17 @@ msgid "Administration"
msgstr "Administration"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed by means of a Skolelinux CD or "
+#| "DVD will be administrable from a central computer, most likely the "
+#| "server. It will be possible to log in to all machines via SSH, and "
+#| "thereby have full access to the machines."
msgid ""
-"All the Linux machines that are installed by means of a Skolelinux CD or DVD "
-"will be administrable from a central computer, most likely the server. It "
-"will be possible to log in to all machines via SSH, and thereby have full "
-"access to the machines."
+"All the Linux machines that are installed with the Skolelinux installer will "
+"be administrable from a central computer, most likely the server. It will be "
+"possible to log in to all machines via SSH, and thereby have full access to "
+"the machines."
msgstr ""
"Alle Linuxmaskinerne, som er installeret via en cd eller dvd med Skolelinux, "
"vil kunne administreres fra en central computer, højst sandsynlig serveren. "
@@ -893,25 +911,36 @@ msgid "Installation"
msgstr "Installation"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Currently there are two types of installation media: netinst CD and multi-"
+#| "arch DVD. Both types can also be booted from USB sticks."
msgid ""
-"Currently there are two types of installation media: netinst CD and multi-"
-"arch DVD. Both types can also be booted from USB sticks."
+"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."
msgstr ""
"Aktuelt er der to typer af installationsmedier: netinst cd og flerarkitektur "
"dvd. Begge typer kan også opstartes fra USB-drev."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from a CD/DVD type medium once, "
+#| "and install all other clients over the network by booting from the "
+#| "network."
msgid ""
-"The aim is to be able to install a server from a CD/DVD type medium once, "
-"and install all other clients over the network by booting from the network."
+"The aim is to be able to install a server from any type medium once, and "
+"install all other clients over the network by booting from the network."
msgstr ""
"Formålet er at være i stand til at installere en server fra et cd/dvd-medie "
"en gang og installere alle andre klienter over netværket ved at starte op "
"fra netværket."
#. type: Content of: <article><section><section><section><para>
-msgid "The DVD installation works without access to the Internet."
-msgstr "Dvd-installationen virker uden adgang til internettet."
+msgid ""
+"Only the netinstall image needs access to the Internet during installation."
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -1379,90 +1408,99 @@ msgid ""
msgstr "Hent installationsmediet for Debian Edu 7.1+edu0 kodenavn »Wheezy«"
#. type: Content of: <article><section><section><section><title>
-msgid "DVD for i386, amd64"
-msgstr "Dvd for i386, amd64"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
-"installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP "
-"or rsync via:"
-msgstr ""
-"Dvd ISO-aftrykket for flere arkitekturer er på 4,4 GiB og kan bruges for "
-"installation på amd64- og i386-maskiner. Aftrykket kan hentes over FTP, HTTP "
-"eller rsync via:"
+#, fuzzy
+#| msgid "CD for i386, amd64"
+msgid "netinstall CD image for i386, amd64"
+msgstr "Cd for i386, amd64"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid ""
-#| "FIXME: only the CD download links work currently - the DVD and source DVD "
-#| "download URLs need to be adapted for wheezy still... They currently don't "
-#| "work."
+#| "The netinstall CD, which can be used for installation of i386 and amd64 "
+#| "as well, is available via"
msgid ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs currently don't work, the usbstick image is not mentioned at "
-"all."
+"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"
msgstr ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"Cd'en for netinstall, som også kan bruges for installation af i386 og amd64, "
+"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-7.1+edu0-DVD."
-"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<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/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
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~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<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~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-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-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "CD for i386, amd64"
-msgstr "Cd for i386, amd64"
+msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. It can be downloaded over FTP, "
+#| "HTTP or rsync via:"
msgid ""
-"The netinstall CD, which can be used for installation of i386 and amd64 as "
-"well, is available via"
+"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:"
msgstr ""
-"Cd'en for netinstall, som også kan bruges for installation af i386 og amd64, "
-"er tilgængelig via"
+"Dvd ISO-aftrykket for flere arkitekturer er på 4,4 GiB og kan bruges for "
+"installation på amd64- og i386-maskiner. Aftrykket kan hentes over 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/wheezy/debian-"
+#| "edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-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-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
-"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
@@ -1472,7 +1510,13 @@ msgid "Source DVD"
msgstr "Kilde-dvd"
#. type: Content of: <article><section><section><section><para>
-msgid "The sources are available via"
+msgid "FIXME: the source DVD download URL currently doesn't work"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "The sources are available via"
+msgid "The source DVD is available via"
msgstr "Kilderne er tilgængelige via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1500,7 +1544,9 @@ msgstr ""
"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"
+#, fuzzy
+#| msgid "Request a CD/DVD by mail"
+msgid "Request a CD / DVD by mail"
msgstr "Anmod om en cd/dvd via postvæsenet"
#. type: Content of: <article><section><section><para>
@@ -1752,16 +1798,25 @@ msgstr ""
"tasten i opstartsmenuen."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture DVD defaults to using amd64-installgui on 64-bit "
+#| "x86 machines, and installgui on 32-bit x86 machines."
msgid ""
-"The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 "
-"machines, and installgui on 32-bit x86 machines."
+"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
+"machines."
msgstr ""
"Dvd'en for flere arktitekturer har som standard amd64-installgui på 64-bit "
"x86-maskiner og installgui på 32-bit x86-maskiner."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to boot the amd64 text mode with the multi-architecture DVD, "
+#| "that would be <computeroutput>amd64-install</computeroutput>."
msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture DVD, "
+"If you want to boot the amd64 text mode with the multi-architecture image, "
"that would be <computeroutput>amd64-install</computeroutput>."
msgstr ""
"Hvis du ønsker at opstarte amd64-teksttilstanden med dvd'en for flere "
@@ -1777,8 +1832,14 @@ msgstr ""
"for den grafiske brugerfladeversion på amd64."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+#| "machine you need to manually select <computeroutput>install</"
+#| "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#| "(graphical mode)."
msgid ""
-"If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+"If you want to boot the i386 mode with the multi-arch image on an amd64 "
"machine you need to manually select <computeroutput>install</computeroutput> "
"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
msgstr ""
@@ -1811,8 +1872,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><title>
msgid ""
-"Boot parameters available when installing from CD, not when installing from "
-"DVD"
+"Boot parameters available when installing from the netinstall CD image, not "
+"when installing from the multi-arch image"
msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2101,15 +2162,22 @@ msgstr ""
"forbundet din bærbare til netværket og logget ind med din nye adgangskode)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on DVD installs"
-msgstr "En bemærkning om dvd-installationer"
+msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgstr ""
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
+#| "computeroutput> will only contain sources from the DVD. If you have an "
+#| "Internet connection, we strongly suggest adding the following lines to it "
+#| "so that available security updates can be installed:"
msgid ""
-"After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-"computeroutput> will only contain sources from the DVD. If you have an "
-"Internet connection, we strongly suggest adding the following lines to it so "
-"that available security updates can be installed:"
+"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
+"sources from that image. If you have an Internet connection, we strongly "
+"suggest adding the following lines to it so that available security updates "
+"can be installed:"
msgstr ""
"Efter du har installeret fra en dvd vil <computeroutput>/etc/apt/sources."
"list</computeroutput> kun indeholde bestemte kilder fra dvd'en. Hvis du har "
@@ -2129,8 +2197,12 @@ msgstr ""
"deb http://ftp.skolelinux.org/skolelinux wheezy local"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The DVD only works with KDE desktop installations. If you want to "
+#| "install other desktop options, use the netinst images or PXE installation."
msgid ""
-"The DVD only works with KDE desktop installations. If you want to install "
+"This image only works for KDE desktop installations. If you want to install "
"other desktop options, use the netinst images or PXE installation."
msgstr ""
"Dvd'en virker kun med KDE-skrivebordsinstallationer. Hvis du ønsker at "
@@ -2204,15 +2276,23 @@ msgstr ""
"gøres som standard."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB sticks instead of CD/DVDs"
+#, fuzzy
+#| msgid "Installation using USB sticks instead of CD/DVDs"
+msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
msgstr "Installation med brug af USB-drev i stedet for cd'er og dvd'er"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Since the Squeeze release it is possible to directly copy the CD/DVD "
+#| "<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
+#| "them. Simply execute a command like this, just adapting the file and "
+#| "device names to your needs:"
msgid ""
-"Since the Squeeze release it is possible to directly copy the CD/DVD "
-"<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
-"them. Simply execute a command like this, just adapting the file and device "
-"names to your needs:"
+"Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
+"<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
+"known as \"USB sticks\") and boot from them. Simply execute a command like "
+"this, just adapting the file and device names to your needs:"
msgstr ""
"Siden udgivelsen af Squeeze er det muligt direkte at kopiere "
"<computeroutput>.iso</computeroutput>-aftrykket fra cd/dvd til et USB-drev "
@@ -2228,9 +2308,13 @@ msgstr ""
"bs=1024</computeroutput>"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Depending on which image you choose, the USB stick will behave just like "
+#| "a CD or DVD."
msgid ""
-"Depending on which image you choose, the USB stick will behave just like a "
-"CD or DVD."
+"Depending on which image you choose, the USB flash drive will behave just "
+"like a CD or Blue-ray disc."
msgstr ""
"Afhængig af hvilket billede du vælger, så vil USB-drevet opføre sig på samme "
"måde som en cd eller dvd."
@@ -2421,17 +2505,24 @@ msgstr ""
"eksempler på sådanne indstillinger."
#. type: Content of: <article><section><section><section><title>
-msgid "Custom CD/DVDs"
-msgstr "Tilpassede cd'er/dvd'er"
+msgid "Custom images"
+msgstr ""
# engelsk fejl lille d i Debian
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
-"\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, which "
-"has a modular design and other nice features. <ulink url=\"http://wiki."
-"debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you to define "
-"answers to the questions normally asked."
+#, fuzzy
+#| msgid ""
+#| "Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
+#| "\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, "
+#| "which has a modular design and other nice features. <ulink url=\"http://"
+#| "wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you "
+#| "to define answers to the questions normally asked."
+msgid ""
+"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
msgstr ""
"Oprettelse af tilpassede cd'er eller dvd'er kan være ret nemt, da vi bruger "
"<ulink url=\"http://wiki.debian.org/DebianInstaller/"
@@ -3516,7 +3607,9 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network."
+"modified though to suite your network: Rename each new system, activate DHCP "
+"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
+"following screenshots show how this looks in practice:"
msgstr ""
"Hvis maskinerne er opstartet som tynde klienter/diskløse arbejdsstationer "
"eller er blevet installeret med brug af nogle af netværksprofilerne, kan "
@@ -3526,10 +3619,6 @@ msgstr ""
"tilhører det dynamiske IP-interval. Disse systemer kan så ændres så de "
"passer til dit netværk. Et par skærmbilleder viser hvordan dette gøres."
-#. type: Content of: <article><section><section><para>
-msgid "The following screenshots show how this looks in practice:"
-msgstr ""
-
#. type: CDATA
#, fuzzy, no-wrap
msgid ""
@@ -5115,7 +5204,9 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Upgrading with a CD or DVD ROM"
+#, fuzzy
+#| msgid "Upgrading with a CD or DVD ROM"
+msgid "Upgrading with a CD or similar image"
msgstr "Opgradering med en cd eller dvd-rom"
#. type: Content of: <article><section><section><para>
@@ -5129,8 +5220,13 @@ msgstr ""
"medie, så følg disse trin:"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom "
+#| "command:"
msgid ""
-"Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:"
+"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"apt-cdrom command:"
msgstr ""
"Indsæt cd'en/dvd-rommen i drevet, monter den og brug kommandoen apt-cdrom:"
@@ -5281,21 +5377,33 @@ msgid "Easy access to USB drives and CDROMs/DVDs"
msgstr "Nem adgang til USB-drev og cd-rom'er/dvd'er"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a (diskless) workstation, "
+#| "a popup window appears asking what to do with it, just like in any other "
+#| "normal installation."
msgid ""
-"When users insert a USB drive or DVD/CDROM into a (diskless) workstation, a "
-"popup window appears asking what to do with it, just like in any other "
-"normal installation."
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
msgstr ""
"Når brugere indsætter et USB-drev eller en dvd/cdrom til en (diskløs) "
"arbejdsstation, så vises et pop op-vindue på samme måde som i enhver anden "
"normal installation."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a thin client there is "
+#| "only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
msgid ""
-"When users insert a USB drive or DVD/CDROM into a thin client there is only "
-"a notify-window showing up for a few seconds. The media is automatically "
-"mounted and it is possible to access it browsing to the /media/$user folder. "
-"This is quite difficult for many non experienced users."
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
msgstr ""
"Når brugere indsætter et USB-drev eller en dvd/cdrom i en tynd klient, så er "
"der kun et påmindelsesvindue, der vises i et par sekunder. Mediet monteres "
@@ -5318,9 +5426,16 @@ msgstr ""
"giver nem adgang)."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM/DVD or whatever media is connected to the thin client. This "
+#| "might come in handy if users want to edit files directly on their plugged "
+#| "in media."
msgid ""
"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM/"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
"DVD or whatever media is connected to the thin client. This might come in "
"handy if users want to edit files directly on their plugged in media."
msgstr ""
@@ -8436,9 +8551,9 @@ msgstr "Introduktion til tynde klienter og diskløse arbejdsstationer"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If working on a diskless client, you don't have a Kerberos TGT by default. "
-"To get one, open up a terminal and execute <computeroutput>kinit</"
-"computeroutput>. Enter your password and the ticket will be granted."
+"If working on a diskless workstation, you don't have a Kerberos TGT by "
+"default. To get one, click the credentials button in the system tray. Enter "
+"your password and the ticket will be granted."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -8769,6 +8884,12 @@ msgstr ""
"\"http://www.debian.org/releases/wheezy/installmanual\">installationsmanual</"
"ulink> for yderligere detaljer."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Programopdateringer"
@@ -10235,10 +10356,15 @@ msgstr ""
# engelsk fejl to ..
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <computeroutput>.iso</computeroutput> images can directly be copied "
+#| "onto USB sticks, for example by using <computeroutput>dd</computeroutput> "
+#| "or even <computeroutput>cat</computeroutput>.."
msgid ""
"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"USB flash drives, for example by using <computeroutput>dd</computeroutput> "
+"or even <computeroutput>cat</computeroutput>.."
msgstr ""
"Aftrykket <computeroutput>.iso</computeroutput> kan direkte kopieres til USB-"
"drev, for eksempel ved at bruge <computeroutput>dd</computeroutput> eller "
@@ -11308,6 +11434,53 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "The DVD installation works without access to the Internet."
+#~ msgstr "Dvd-installationen virker uden adgang til internettet."
+
+#~ msgid "DVD for i386, amd64"
+#~ msgstr "Dvd for i386, amd64"
+
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: only the CD download links work currently - the DVD and source "
+#~| "DVD download URLs need to be adapted for wheezy still... They currently "
+#~| "don't work."
+#~ msgid ""
+#~ "FIXME: only the CD download links work currently - the DVD and source DVD "
+#~ "download URLs currently don't work, the usbstick image is not mentioned "
+#~ "at all."
+#~ msgstr ""
+#~ "FIXME: only the CD download links work currently - the DVD and source DVD "
+#~ "download URLs need to be adapted for wheezy still... They currently don't "
+#~ "work."
+
+#~ msgid ""
+#~ "<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/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-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>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+
+#~ msgid "A note on DVD installs"
+#~ msgstr "En bemærkning om dvd-installationer"
+
+#~ msgid "Custom CD/DVDs"
+#~ msgstr "Tilpassede cd'er/dvd'er"
+
#~ msgid ""
#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
#~ "png)."
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 bcacf2e..b0c601b 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-07-07 17:13+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\n"
"PO-Revision-Date: 2013-07-05 22:12+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -89,17 +89,29 @@ msgstr ""
"konfiguriertes Schulnetzwerk bereit stellt."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Immediatly after installation a school server running all services needed "
+#| "for a school network is set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>), just "
+#| "waiting for users and machines being added via GOsa², a comfortable Web-"
+#| "UI, or any other LDAP editor. A netbooting environment is prepared using "
+#| "PXE, so after initial installation of the main server from CD, DVD or "
+#| "usbstick all other machines can be installed via the network, this "
+#| "includes \"roaming workstations\" (ones that can be taken away from the "
+#| "school network, usually laptops or netbooks) as well as PXE booting for "
+#| "diskless machines like tradional thin-clients."
msgid ""
"Immediatly after installation a school server running all services needed "
"for a school network is set up (see the next chapter <link linkend="
"\"Architecture\">details of the architecture of this setup</link>), just "
"waiting for users and machines being added via GOsa², a comfortable Web-UI, "
"or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, DVD or usbstick all "
-"other machines can be installed via the network, this includes \"roaming "
-"workstations\" (ones that can be taken away from the school network, usually "
-"laptops or netbooks) as well as PXE booting for diskless machines like "
-"tradional thin-clients."
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive all other machines can be installed via the network, this "
+"includes \"roaming workstations\" (ones that can be taken away from the "
+"school network, usually laptops or netbooks) as well as PXE booting for "
+"diskless machines like tradional thin-clients."
msgstr ""
"Unmittelbar nach der Installation steht ein Schulserver zur Verfügung, auf "
"dem alle für ein Schulnetzwerk notwendigen Dienste laufen (Details dazu im "
@@ -878,11 +890,17 @@ msgid "Administration"
msgstr "Administration"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed by means of a Skolelinux CD or "
+#| "DVD will be administrable from a central computer, most likely the "
+#| "server. It will be possible to log in to all machines via SSH, and "
+#| "thereby have full access to the machines."
msgid ""
-"All the Linux machines that are installed by means of a Skolelinux CD or DVD "
-"will be administrable from a central computer, most likely the server. It "
-"will be possible to log in to all machines via SSH, and thereby have full "
-"access to the machines."
+"All the Linux machines that are installed with the Skolelinux installer will "
+"be administrable from a central computer, most likely the server. It will be "
+"possible to log in to all machines via SSH, and thereby have full access to "
+"the machines."
msgstr ""
"Alle Linux-Rechner, die mit einer Skolelinux-CD oder -DVD installiert "
"wurden, können von einem zentralen Computer, üblicherweise dem Hauptserver, "
@@ -916,24 +934,35 @@ msgid "Installation"
msgstr "Installation"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Currently there are two types of installation media: netinst CD and multi-"
+#| "arch DVD. Both types can also be booted from USB sticks."
msgid ""
-"Currently there are two types of installation media: netinst CD and multi-"
-"arch DVD. Both types can also be booted from USB sticks."
+"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."
msgstr ""
"Gegenwärtig gibt es zwei Arten von Installationsmedien: »Netinst-CD« und "
"»Multiarch-DVD«. Beide können auch von einem USB-Stick gebootet werden "
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from a CD/DVD type medium once, "
+#| "and install all other clients over the network by booting from the "
+#| "network."
msgid ""
-"The aim is to be able to install a server from a CD/DVD type medium once, "
-"and install all other clients over the network by booting from the network."
+"The aim is to be able to install a server from any type medium once, and "
+"install all other clients over the network by booting from the network."
msgstr ""
"Die Absicht ist, einmalig einen Server per CD/DVD installieren zu können und "
"daran anschließend alle anderen Clients über das Netzwerk via PXE-Boot."
#. type: Content of: <article><section><section><section><para>
-msgid "The DVD installation works without access to the Internet."
-msgstr "Die Installation per DVD benötigt keinen Internetzugang."
+msgid ""
+"Only the netinstall image needs access to the Internet during installation."
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -1417,90 +1446,99 @@ msgstr ""
"»Wheezy«"
#. type: Content of: <article><section><section><section><title>
-msgid "DVD for i386, amd64"
-msgstr "DVD für i386 und amd64"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
-"installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP "
-"or rsync via:"
-msgstr ""
-"Das für i386- und amd64-Prozessorarchitektur geeignete DVD-ISO-Image ist 4,4 "
-"GiB groß. Es kann folgendermaßen mittels FTP, HTTP oder rsync "
-"heruntergeladen werden:"
+#, fuzzy
+#| msgid "CD for i386, amd64"
+msgid "netinstall CD image for i386, amd64"
+msgstr "CD für i386 und amd64"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid ""
-#| "FIXME: only the CD download links work currently - the DVD and source DVD "
-#| "download URLs need to be adapted for wheezy still... They currently don't "
-#| "work."
+#| "The netinstall CD, which can be used for installation of i386 and amd64 "
+#| "as well, is available via"
msgid ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs currently don't work, the usbstick image is not mentioned at "
-"all."
+"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"
msgstr ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs need to be adapted for wheezy still... They currently don't "
-"work."
+"Die Netinstall-CD zur Installation von Rechnern mit i386- oder amd64-"
+"Prozessorarchitektur ist erhältlich mittels"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
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/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<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/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
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~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<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~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-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-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "CD for i386, amd64"
-msgstr "CD für i386 und amd64"
+msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. It can be downloaded over FTP, "
+#| "HTTP or rsync via:"
msgid ""
-"The netinstall CD, which can be used for installation of i386 and amd64 as "
-"well, is available via"
+"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:"
msgstr ""
-"Die Netinstall-CD zur Installation von Rechnern mit i386- oder amd64-"
-"Prozessorarchitektur ist erhältlich mittels"
+"Das für i386- und amd64-Prozessorarchitektur geeignete DVD-ISO-Image ist 4,4 "
+"GiB groß. Es kann folgendermaßen mittels FTP, HTTP oder rsync "
+"heruntergeladen werden:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+#| "edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-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-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
-"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
@@ -1510,7 +1548,13 @@ msgid "Source DVD"
msgstr "DVD mit Quelltexten"
#. type: Content of: <article><section><section><section><para>
-msgid "The sources are available via"
+msgid "FIXME: the source DVD download URL currently doesn't work"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "The sources are available via"
+msgid "The source DVD is available via"
msgstr "Die Quelltexte sind erhältlich mittels"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1538,7 +1582,9 @@ msgstr ""
"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"
+#, fuzzy
+#| msgid "Request a CD/DVD by mail"
+msgid "Request a CD / DVD by mail"
msgstr "Bestellung einer CD/DVD auf dem Postweg"
#. type: Content of: <article><section><section><para>
@@ -1789,16 +1835,25 @@ msgstr ""
"die Tabulator-Taste gedrückt wird."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture DVD defaults to using amd64-installgui on 64-bit "
+#| "x86 machines, and installgui on 32-bit x86 machines."
msgid ""
-"The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 "
-"machines, and installgui on 32-bit x86 machines."
+"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
+"machines."
msgstr ""
"Die Multiarch-DVD führt auf x86-64-Bit-Rechnern voreingestellt »amd64-"
"installgui« und auf x86-32-Bit-Rechnern »installgui« aus."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to boot the amd64 text mode with the multi-architecture DVD, "
+#| "that would be <computeroutput>amd64-install</computeroutput>."
msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture DVD, "
+"If you want to boot the amd64 text mode with the multi-architecture image, "
"that would be <computeroutput>amd64-install</computeroutput>."
msgstr ""
"Wenn Sie das amd64-Installationsprogramm im Text-Modus mit der Multiarch-DVD "
@@ -1813,8 +1868,14 @@ msgstr ""
"um zur amd64-Expertenversion mit graphischer Benutzeroberfläche zu gelangen."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+#| "machine you need to manually select <computeroutput>install</"
+#| "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#| "(graphical mode)."
msgid ""
-"If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+"If you want to boot the i386 mode with the multi-arch image on an amd64 "
"machine you need to manually select <computeroutput>install</computeroutput> "
"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
msgstr ""
@@ -1845,9 +1906,13 @@ msgstr ""
"der Proxy des Hauptservers benutzt wird."
#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "Boot parameters available when installing from CD, not when installing "
+#| "from DVD"
msgid ""
-"Boot parameters available when installing from CD, not when installing from "
-"DVD"
+"Boot parameters available when installing from the netinstall CD image, not "
+"when installing from the multi-arch image"
msgstr ""
"Boot-Parameter, die bei einer Installation von CD. aber nicht von DVD, "
"verfügbar sind "
@@ -2158,15 +2223,22 @@ msgstr ""
"neuen Passwort angemeldet haben.)"
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on DVD installs"
-msgstr "Eine Bemerkung zur DVD-Installation"
+msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgstr ""
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
+#| "computeroutput> will only contain sources from the DVD. If you have an "
+#| "Internet connection, we strongly suggest adding the following lines to it "
+#| "so that available security updates can be installed:"
msgid ""
-"After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-"computeroutput> will only contain sources from the DVD. If you have an "
-"Internet connection, we strongly suggest adding the following lines to it so "
-"that available security updates can be installed:"
+"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
+"sources from that image. If you have an Internet connection, we strongly "
+"suggest adding the following lines to it so that available security updates "
+"can be installed:"
msgstr ""
"Wenn Sie von einer DVD installieren, enthält die Datei <computeroutput>/etc/"
"apt/sources.list</computeroutput> nur Quellen von der DVD. Wenn Sie eine "
@@ -2186,8 +2258,12 @@ msgstr ""
"deb http://ftp.skolelinux.org/skolelinux wheezy local"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The DVD only works with KDE desktop installations. If you want to "
+#| "install other desktop options, use the netinst images or PXE installation."
msgid ""
-"The DVD only works with KDE desktop installations. If you want to install "
+"This image only works for KDE desktop installations. If you want to install "
"other desktop options, use the netinst images or PXE installation."
msgstr ""
"Die DVD kann nur für Installationen mit der graphischen Arbeitsumgebung KDE "
@@ -2262,15 +2338,23 @@ msgstr ""
"voreingestellt durchgeführt."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB sticks instead of CD/DVDs"
+#, fuzzy
+#| msgid "Installation using USB sticks instead of CD/DVDs"
+msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
msgstr "Installation per USB-Stick anstelle von CD/DVD"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Since the Squeeze release it is possible to directly copy the CD/DVD "
+#| "<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
+#| "them. Simply execute a command like this, just adapting the file and "
+#| "device names to your needs:"
msgid ""
-"Since the Squeeze release it is possible to directly copy the CD/DVD "
-"<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
-"them. Simply execute a command like this, just adapting the file and device "
-"names to your needs:"
+"Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
+"<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
+"known as \"USB sticks\") and boot from them. Simply execute a command like "
+"this, just adapting the file and device names to your needs:"
msgstr ""
"Seit dem Squeeze-Release ist es möglich, die CD/DVD <computeroutput>.iso</"
"computeroutput> Images auf einen USB-Stick zu kopieren und davon zu booten. "
@@ -2286,9 +2370,13 @@ msgstr ""
"bs=1024</computeroutput>"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Depending on which image you choose, the USB stick will behave just like "
+#| "a CD or DVD."
msgid ""
-"Depending on which image you choose, the USB stick will behave just like a "
-"CD or DVD."
+"Depending on which image you choose, the USB flash drive will behave just "
+"like a CD or Blue-ray disc."
msgstr ""
"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder DVD "
"verhalten."
@@ -2479,16 +2567,23 @@ msgstr ""
"Arbeitsfläche sind dafür Beispiele."
#. type: Content of: <article><section><section><section><title>
-msgid "Custom CD/DVDs"
-msgstr "Angepasste CD/DVDs"
+msgid "Custom images"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
-"\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, which "
-"has a modular design and other nice features. <ulink url=\"http://wiki."
-"debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you to define "
-"answers to the questions normally asked."
+#, fuzzy
+#| msgid ""
+#| "Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
+#| "\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, "
+#| "which has a modular design and other nice features. <ulink url=\"http://"
+#| "wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you "
+#| "to define answers to the questions normally asked."
+msgid ""
+"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
msgstr ""
"Angepasste CDs oder DVDs zu erstellen ist recht einfach, da das <ulink url="
"\"http://wiki.debian.org/DebianInstaller/\">Debian-Installationsprogramm</"
@@ -3598,7 +3693,9 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network."
+"modified though to suite your network: Rename each new system, activate DHCP "
+"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
+"following screenshots show how this looks in practice:"
msgstr ""
"Wenn die Maschinen als Thin Clients bzw. Diskless Workstations gestartet "
"oder wenn sie unter Verwendung eines der Netzwerkprofile installiert wurden, "
@@ -3611,10 +3708,6 @@ msgstr ""
"anschließend aber so bearbeitet werden, dass sie zu Ihrem Netzwerk passen. "
"Einige Bilder zeigen, wie dies erfolgen könnte."
-#. type: Content of: <article><section><section><para>
-msgid "The following screenshots show how this looks in practice:"
-msgstr ""
-
#. type: CDATA
#, no-wrap
msgid ""
@@ -5250,7 +5343,9 @@ msgstr ""
"non-free."
#. type: Content of: <article><section><section><title>
-msgid "Upgrading with a CD or DVD ROM"
+#, fuzzy
+#| msgid "Upgrading with a CD or DVD ROM"
+msgid "Upgrading with a CD or similar image"
msgstr "Upgrade mit einer CD- oder einer DVD-ROM"
#. type: Content of: <article><section><section><para>
@@ -5265,8 +5360,13 @@ msgstr ""
"Schritte aus:"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom "
+#| "command:"
msgid ""
-"Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:"
+"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"apt-cdrom command:"
msgstr ""
"Legen Sie die CD/DVD-ROM in das Laufwerk, hängen Sie die CD/DVD-ROM ein und "
"benutzen Sie das Kommando apt-cdrom:"
@@ -5422,10 +5522,15 @@ msgid "Easy access to USB drives and CDROMs/DVDs"
msgstr "Einfacher Zugriff auf USB-Laufwerke und CD-ROMs/DVDs"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a (diskless) workstation, "
+#| "a popup window appears asking what to do with it, just like in any other "
+#| "normal installation."
msgid ""
-"When users insert a USB drive or DVD/CDROM into a (diskless) workstation, a "
-"popup window appears asking what to do with it, just like in any other "
-"normal installation."
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
msgstr ""
"Wenn Benutzer an einem Arbeitsplatzrechner oder einer Diskless Workstation "
"ein USB-Laufwerk anschließen oder eine DVD/CD-ROM einlegen, erscheint ein "
@@ -5433,11 +5538,18 @@ msgstr ""
"normalen Installation."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a thin client there is "
+#| "only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
msgid ""
-"When users insert a USB drive or DVD/CDROM into a thin client there is only "
-"a notify-window showing up for a few seconds. The media is automatically "
-"mounted and it is possible to access it browsing to the /media/$user folder. "
-"This is quite difficult for many non experienced users."
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
msgstr ""
"Wenn Benutzer ein USB-Laufwerk an ein Terminal anschließen oder dort eine "
"DVD/CD-ROM in ein Laufwerk einlegen, dann erscheint lediglich für einige "
@@ -5463,9 +5575,16 @@ msgstr ""
"wodurch ein einfacher Zugriff gegeben ist.)"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM/DVD or whatever media is connected to the thin client. This "
+#| "might come in handy if users want to edit files directly on their plugged "
+#| "in media."
msgid ""
"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM/"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
"DVD or whatever media is connected to the thin client. This might come in "
"handy if users want to edit files directly on their plugged in media."
msgstr ""
@@ -8676,10 +8795,16 @@ msgstr ""
"Kerberos-Ticket zum Lesen von Email auf Diskless Workstations anfordern"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If working on a diskless client, you don't have a Kerberos TGT by "
+#| "default. To get one, open up a terminal and execute "
+#| "<computeroutput>kinit</computeroutput>. Enter your password and the "
+#| "ticket will be granted."
msgid ""
-"If working on a diskless client, you don't have a Kerberos TGT by default. "
-"To get one, open up a terminal and execute <computeroutput>kinit</"
-"computeroutput>. Enter your password and the ticket will be granted."
+"If working on a diskless workstation, you don't have a Kerberos TGT by "
+"default. To get one, click the credentials button in the system tray. Enter "
+"your password and the ticket will be granted."
msgstr ""
"Wenn Sie an einer Diskless Workstation arbeiten, steht Ihnen nicht "
"unmittelbar ein Kerberos TGT zur Verfügung. Um dieses zu bekommen, klicken "
@@ -9031,6 +9156,12 @@ msgstr ""
"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual\">Debian-"
"Installationshandbuch</ulink> für weitere Informationen."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Aktualisierung von Software"
@@ -10522,10 +10653,15 @@ msgstr ""
"des Debian-Edu-Menüs."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <computeroutput>.iso</computeroutput> images can directly be copied "
+#| "onto USB sticks, for example by using <computeroutput>dd</computeroutput> "
+#| "or even <computeroutput>cat</computeroutput>.."
msgid ""
"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"USB flash drives, for example by using <computeroutput>dd</computeroutput> "
+"or even <computeroutput>cat</computeroutput>.."
msgstr ""
"Die <computeroutput>ISO</computeroutput>-Images können mittels "
"<computeroutput>dd</computeroutput> (oder sogar <computeroutput>cat</"
@@ -11619,6 +11755,53 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid "The DVD installation works without access to the Internet."
+#~ msgstr "Die Installation per DVD benötigt keinen Internetzugang."
+
+#~ msgid "DVD for i386, amd64"
+#~ msgstr "DVD für i386 und amd64"
+
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: only the CD download links work currently - the DVD and source "
+#~| "DVD download URLs need to be adapted for wheezy still... They currently "
+#~| "don't work."
+#~ msgid ""
+#~ "FIXME: only the CD download links work currently - the DVD and source DVD "
+#~ "download URLs currently don't work, the usbstick image is not mentioned "
+#~ "at all."
+#~ msgstr ""
+#~ "FIXME: only the CD download links work currently - the DVD and source DVD "
+#~ "download URLs need to be adapted for wheezy still... They currently don't "
+#~ "work."
+
+#~ msgid ""
+#~ "<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/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-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>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+
+#~ msgid "A note on DVD installs"
+#~ msgstr "Eine Bemerkung zur DVD-Installation"
+
+#~ msgid "Custom CD/DVDs"
+#~ msgstr "Angepasste CD/DVDs"
+
#~ msgid ""
#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
#~ "png)."
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 51e2cb5..af01ed7 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-07-07 17:13+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\n"
"PO-Revision-Date: 2012-06-16 18:34-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -106,11 +106,11 @@ msgid ""
"\"Architecture\">details of the architecture of this setup</link>), just "
"waiting for users and machines being added via GOsa², a comfortable Web-UI, "
"or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, DVD or usbstick all "
-"other machines can be installed via the network, this includes \"roaming "
-"workstations\" (ones that can be taken away from the school network, usually "
-"laptops or netbooks) as well as PXE booting for diskless machines like "
-"tradional thin-clients."
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive all other machines can be installed via the network, this "
+"includes \"roaming workstations\" (ones that can be taken away from the "
+"school network, usually laptops or netbooks) as well as PXE booting for "
+"diskless machines like tradional thin-clients."
msgstr ""
"Inmediatamente después de la instalación, el servidor de la escuela "
"ejecutará todos los servicios necesarios para que la red escolar sea "
@@ -1011,10 +1011,10 @@ msgstr "Administración"
#| "server. It will be possible to login to all machines by ssh, and thereby "
#| "have full access to the machines"
msgid ""
-"All the Linux machines that are installed by means of a Skolelinux CD or DVD "
-"will be administrable from a central computer, most likely the server. It "
-"will be possible to log in to all machines via SSH, and thereby have full "
-"access to the machines."
+"All the Linux machines that are installed with the Skolelinux installer will "
+"be administrable from a central computer, most likely the server. It will be "
+"possible to log in to all machines via SSH, and thereby have full access to "
+"the machines."
msgstr ""
"Todas las máquinas linux que se instalan por medio del CD o DVD de "
"Skolelinux se pueden administrar desde un ordenador central, es decir el "
@@ -1061,8 +1061,9 @@ msgstr "Instalación"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
-"Currently there are two types of installation media: netinst CD and multi-"
-"arch DVD. Both types can also be booted from USB sticks."
+"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."
msgstr ""
"Actualmente hay dos medios de instalación: instalación por red desde un CD e "
"instalación multi arquitectura desde un DVD. Ambos medios pueden ser "
@@ -1075,16 +1076,17 @@ msgstr ""
#| "clients over the network by booting all other machines from the network. "
#| "The DVD installation works without access to the Internet."
msgid ""
-"The aim is to be able to install a server from a CD/DVD type medium once, "
-"and install all other clients over the network by booting from the network."
+"The aim is to be able to install a server from any type medium once, and "
+"install all other clients over the network by booting from the network."
msgstr ""
"La idea es poder instalar un servidor desde CD/DVD, e instalar los clientes "
"por la red arrancando todas las demás máquinas a través de la red. La "
"instalación del DVD funciona sin acceder a Internet."
#. type: Content of: <article><section><section><section><para>
-msgid "The DVD installation works without access to the Internet."
-msgstr "La instalación desde DVD funciona sin acceso a Internet."
+msgid ""
+"Only the netinstall image needs access to the Internet during installation."
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -1722,54 +1724,44 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
#| msgid "DVDs for i386, amd64"
-msgid "DVD for i386, amd64"
+msgid "netinstall CD image for i386, amd64"
msgstr "DVDs para i386, amd64 "
#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid ""
-#| "The multiarch DVD ISO image is 4.4 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. To download it, use any of these "
-#| "methods:"
-msgid ""
-"The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
-"installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP "
-"or rsync via:"
-msgstr ""
-"La imagen multiarquitecturas tiene 4,4 Gb. y puede ser utilizada en equipos "
-"con arquitecturas i386 y amd64. Para descargarlo puede utilizar cualquiera "
-"de estos métodos:"
-
-#. type: Content of: <article><section><section><section><para>
+#| "The netinstall CD, which can be used for installation of i386 and amd64 "
+#| "as well, is available via"
msgid ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs currently don't work, the usbstick image is not mentioned at "
-"all."
+"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"
msgstr ""
+"El CD de instalación por red, que puede ser utilizado para arquitecturas "
+"i386 y amd64, estan disponibles vía:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "<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>"
+#| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
-"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.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>"
+"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
-#| "<ulink url=\"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>"
+#| "<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-DVD."
-"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.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>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
+"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1777,25 +1769,31 @@ 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-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "DVDs for i386, amd64"
-msgid "CD for i386, amd64"
-msgstr "DVDs para i386, amd64 "
+msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multiarch DVD ISO image is 4.4 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. To download it, use any of these "
+#| "methods:"
msgid ""
-"The netinstall CD, which can be used for installation of i386 and amd64 as "
-"well, is available via"
+"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:"
msgstr ""
-"El CD de instalación por red, que puede ser utilizado para arquitecturas "
-"i386 y amd64, estan disponibles vía:"
+"La imagen multiarquitecturas tiene 4,4 Gb. y puede ser utilizada en equipos "
+"con arquitecturas i386 y amd64. Para descargarlo puede utilizar cualquiera "
+"de estos métodos:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1804,7 +1802,7 @@ msgstr ""
#| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1816,7 +1814,7 @@ msgstr ""
#| "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~a3-"
-"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"USB.iso\">debian-edu-7.1+edu0~a3-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>"
@@ -1828,7 +1826,7 @@ msgstr ""
#| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -1839,9 +1837,13 @@ msgid "Source DVD"
msgstr "Recursos"
#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: the source DVD download URL currently doesn't work"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid "The Sources are available via"
-msgid "The sources are available via"
+msgid "The source DVD is available via"
msgstr "Los archivos fuente estan disponibles vía: "
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1885,7 +1887,9 @@ msgstr ""
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
#. type: Content of: <article><section><section><title>
-msgid "Request a CD/DVD by mail"
+#, fuzzy
+#| msgid "Request a CD/DVD by mail"
+msgid "Request a CD / DVD by mail"
msgstr "Solicita un CD/DVD por correo"
#. type: Content of: <article><section><section><para>
@@ -2219,8 +2223,9 @@ msgstr ""
#| "The multiarch DVD defaults to use amd64-installgui on x86 64-bits "
#| "machines, and installgui on x86 32-bits machines."
msgid ""
-"The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 "
-"machines, and installgui on 32-bit x86 machines."
+"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
+"machines."
msgstr ""
"El DVD Multiarquitectura tiene como predeterminado, el modo de instalación "
"amd64-modografico en ordenadores x86 / 64 bits, e instalación gráfica en x86 "
@@ -2232,7 +2237,7 @@ msgstr ""
#| "If you want to boot the amd64 text mode with the multiarch DVD it would "
#| "be <computeroutput>amd64-install</computeroutput>."
msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture DVD, "
+"If you want to boot the amd64 text mode with the multi-architecture image, "
"that would be <computeroutput>amd64-install</computeroutput>."
msgstr ""
"Si desea iniciar en modo texto para un equipo amd64, seleccione en el DVD "
@@ -2254,7 +2259,7 @@ msgstr ""
#| "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
#| "(graphical mode)."
msgid ""
-"If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+"If you want to boot the i386 mode with the multi-arch image on an amd64 "
"machine you need to manually select <computeroutput>install</computeroutput> "
"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
msgstr ""
@@ -2280,8 +2285,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><title>
msgid ""
-"Boot parameters available when installing from CD, not when installing from "
-"DVD"
+"Boot parameters available when installing from the netinstall CD image, not "
+"when installing from the multi-arch image"
msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2650,8 +2655,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on DVD installs"
-msgstr "Una nota sobre instalación por DVD"
+msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgstr ""
#. type: Content of: <article><section><section><section><section><para>
#, fuzzy
@@ -2661,10 +2666,11 @@ msgstr "Una nota sobre instalación por DVD"
#| "you have an internet connection we strongly suggest adding the following "
#| "lines to it so that available (security) updates can be installed:"
msgid ""
-"After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-"computeroutput> will only contain sources from the DVD. If you have an "
-"Internet connection, we strongly suggest adding the following lines to it so "
-"that available security updates can be installed:"
+"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
+"sources from that image. If you have an Internet connection, we strongly "
+"suggest adding the following lines to it so that available security updates "
+"can be installed:"
msgstr ""
"After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
"computeroutput> will only contain sources from the DVD. If you have an "
@@ -2684,7 +2690,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"The DVD only works with KDE desktop installations. If you want to install "
+"This image only works for KDE desktop installations. If you want to install "
"other desktop options, use the netinst images or PXE installation."
msgstr ""
@@ -2779,7 +2785,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
#| msgid "Installation using USBsticks instead of CD/DVDs"
-msgid "Installation using USB sticks instead of CD/DVDs"
+msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
msgstr "Instalación utilizando memorias usb en lugar de CD/DVDs"
#. type: Content of: <article><section><section><section><para>
@@ -2789,10 +2795,10 @@ msgstr "Instalación utilizando memorias usb en lugar de CD/DVDs"
#| "images to an USBstick and boot from them. Simply execute a command like "
#| "this, just adopt the file- and devicename to your needs:"
msgid ""
-"Since the Squeeze release it is possible to directly copy the CD/DVD "
-"<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
-"them. Simply execute a command like this, just adapting the file and device "
-"names to your needs:"
+"Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
+"<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
+"known as \"USB sticks\") and boot from them. Simply execute a command like "
+"this, just adapting the file and device names to your needs:"
msgstr ""
"Desde el lanzamiento de Squeeze, será posible copiar directamente las "
"imágenes de CD/DVD a un usbstick e iniciar desde ellos. Basta con ejecutar "
@@ -2813,8 +2819,8 @@ msgstr ""
#| "Depending which image you choose, the USBstick will behave just like a CD "
#| "or DVD."
msgid ""
-"Depending on which image you choose, the USB stick will behave just like a "
-"CD or DVD."
+"Depending on which image you choose, the USB flash drive will behave just "
+"like a CD or Blue-ray disc."
msgstr ""
"Dependiendo de la imágen seleccionada, el usbstick se comportará como un CD "
"o DVD."
@@ -2983,8 +2989,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Custom CD/DVDs"
-msgstr "CD/DVDs Personalizados"
+msgid "Custom images"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -2995,11 +3001,11 @@ msgstr "CD/DVDs Personalizados"
#| "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> "
#| "allows you to define answers to the questions normally asked."
msgid ""
-"Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
-"\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, which "
-"has a modular design and other nice features. <ulink url=\"http://wiki."
-"debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you to define "
-"answers to the questions normally asked."
+"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
msgstr ""
"Crear CDs o DVDs personalizados es bastante fácil desde que se utiliza "
"<ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
@@ -4155,11 +4161,9 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "The following screenshots show how this looks in practice:"
+"modified though to suite your network: Rename each new system, activate DHCP "
+"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
+"following screenshots show how this looks in practice:"
msgstr ""
#. type: CDATA
@@ -5636,7 +5640,9 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Upgrading with a CD or DVD ROM"
+#, fuzzy
+#| msgid "Upgrading with a CD or DVD ROM"
+msgid "Upgrading with a CD or similar image"
msgstr "Actualizar con un CD o DVD ROM"
#. type: Content of: <article><section><section><para>
@@ -5647,8 +5653,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom "
+#| "command:"
msgid ""
-"Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:"
+"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"apt-cdrom command:"
msgstr "Insertar el CD/DVD en la unidad, montarlo y usar el comando apt-cdrom:"
#. type: CDATA
@@ -5770,17 +5781,17 @@ msgstr "Fácil acceso a dispositivos USB y CDROMs/DVDs"
#. type: Content of: <article><section><section><para>
msgid ""
-"When users insert a USB drive or DVD/CDROM into a (diskless) workstation, a "
-"popup window appears asking what to do with it, just like in any other "
-"normal installation."
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"When users insert a USB drive or DVD/CDROM into a thin client there is only "
-"a notify-window showing up for a few seconds. The media is automatically "
-"mounted and it is possible to access it browsing to the /media/$user folder. "
-"This is quite difficult for many non experienced users."
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -5796,7 +5807,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM/"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
"DVD or whatever media is connected to the thin client. This might come in "
"handy if users want to edit files directly on their plugged in media."
msgstr ""
@@ -8326,9 +8337,9 @@ msgstr "Clientes ligeros vs Puestos sin disco"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If working on a diskless client, you don't have a Kerberos TGT by default. "
-"To get one, open up a terminal and execute <computeroutput>kinit</"
-"computeroutput>. Enter your password and the ticket will be granted."
+"If working on a diskless workstation, you don't have a Kerberos TGT by "
+"default. To get one, click the credentials button in the system tray. Enter "
+"your password and the ticket will be granted."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -8668,6 +8679,12 @@ msgstr ""
"Más información puede ser encontrada en el <ulink url=\"http://www.debian."
"org/releases/wheezy/installmanual\">manual del instalador Debian</ulink>."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr ""
@@ -9873,8 +9890,8 @@ msgstr ""
#, fuzzy
msgid ""
"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"USB flash drives, for example by using <computeroutput>dd</computeroutput> "
+"or even <computeroutput>cat</computeroutput>.."
msgstr ""
"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
"esta imagen como un archivo <computeroutput>dia</computeroutput>."
@@ -11000,6 +11017,53 @@ msgstr ""
"Más información sobre lanzamientos anteriores puede ser encontrado en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "The DVD installation works without access to the Internet."
+#~ msgstr "La instalación desde DVD funciona sin acceso a Internet."
+
+#, fuzzy
+#~| msgid "DVDs for i386, amd64"
+#~ msgid "DVD for i386, amd64"
+#~ msgstr "DVDs para i386, amd64 "
+
+#, fuzzy
+#~| msgid ""
+#~| "<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>"
+#~ 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>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<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>"
+#~ 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>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<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-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/"
+#~ "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
+
+#~ msgid "A note on DVD installs"
+#~ msgstr "Una nota sobre instalación por DVD"
+
+#~ msgid "Custom CD/DVDs"
+#~ msgstr "CD/DVDs Personalizados"
+
#, fuzzy
#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
#~ msgid ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 99135aa..bee8995 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-07-07 17:13+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\n"
"PO-Revision-Date: 2013-05-14 00:39+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -86,17 +86,29 @@ msgstr ""
"configuré."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Immediatly after installation a school server running all services needed "
+#| "for a school network is set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>), just "
+#| "waiting for users and machines being added via GOsa², a comfortable Web-"
+#| "UI, or any other LDAP editor. A netbooting environment is prepared using "
+#| "PXE, so after initial installation of the main server from CD, DVD or "
+#| "usbstick all other machines can be installed via the network, this "
+#| "includes \"roaming workstations\" (ones that can be taken away from the "
+#| "school network, usually laptops or netbooks) as well as PXE booting for "
+#| "diskless machines like tradional thin-clients."
msgid ""
"Immediatly after installation a school server running all services needed "
"for a school network is set up (see the next chapter <link linkend="
"\"Architecture\">details of the architecture of this setup</link>), just "
"waiting for users and machines being added via GOsa², a comfortable Web-UI, "
"or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, DVD or usbstick all "
-"other machines can be installed via the network, this includes \"roaming "
-"workstations\" (ones that can be taken away from the school network, usually "
-"laptops or netbooks) as well as PXE booting for diskless machines like "
-"tradional thin-clients."
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive all other machines can be installed via the network, this "
+"includes \"roaming workstations\" (ones that can be taken away from the "
+"school network, usually laptops or netbooks) as well as PXE booting for "
+"diskless machines like tradional thin-clients."
msgstr ""
"Immédiatement après l'installation, un serveur faisant fonctionner tous les "
"services pour le réseau de l'école est configuré (consultez le chapitre "
@@ -882,11 +894,17 @@ msgid "Administration"
msgstr "Administration"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed by means of a Skolelinux CD or "
+#| "DVD will be administrable from a central computer, most likely the "
+#| "server. It will be possible to log in to all machines via SSH, and "
+#| "thereby have full access to the machines."
msgid ""
-"All the Linux machines that are installed by means of a Skolelinux CD or DVD "
-"will be administrable from a central computer, most likely the server. It "
-"will be possible to log in to all machines via SSH, and thereby have full "
-"access to the machines."
+"All the Linux machines that are installed with the Skolelinux installer will "
+"be administrable from a central computer, most likely the server. It will be "
+"possible to log in to all machines via SSH, and thereby have full access to "
+"the machines."
msgstr ""
"Toutes les machines Linux installées au moyen d'un CD ou DVD Skolelinux "
"seront administrables depuis un ordinateur central, très probablement le "
@@ -921,26 +939,37 @@ msgid "Installation"
msgstr "Installation"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Currently there are two types of installation media: netinst CD and multi-"
+#| "arch DVD. Both types can also be booted from USB sticks."
msgid ""
-"Currently there are two types of installation media: netinst CD and multi-"
-"arch DVD. Both types can also be booted from USB sticks."
+"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."
msgstr ""
"Deux types de supports d'installation sont actuellement disponibles : le CD "
"d'installation par le réseau et le DVD multiarchitecture. Ces deux types "
"peuvent également être amorcés à partir de clés USB."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from a CD/DVD type medium once, "
+#| "and install all other clients over the network by booting from the "
+#| "network."
msgid ""
-"The aim is to be able to install a server from a CD/DVD type medium once, "
-"and install all other clients over the network by booting from the network."
+"The aim is to be able to install a server from any type medium once, and "
+"install all other clients over the network by booting from the network."
msgstr ""
"L'objectif est de pouvoir installer un serveur à partir d'un CD ou DVD une "
"seule fois, et d'installer tous les autres postes clients par le réseau en "
"amorçant à partir de ce dernier."
#. type: Content of: <article><section><section><section><para>
-msgid "The DVD installation works without access to the Internet."
-msgstr "L'installation à partir du DVD fonctionne sans accès à Internet."
+msgid ""
+"Only the netinstall image needs access to the Internet during installation."
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -1435,81 +1464,78 @@ msgstr ""
"« Wheezy »"
#. type: Content of: <article><section><section><section><title>
-msgid "DVD for i386, amd64"
-msgstr "DVD pour i386 et amd64"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
-"installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP "
-"or rsync via:"
-msgstr ""
-"L'image ISO multiarchitecture a une taille de 4.4 Gio et peut être utilisée "
-"pour l'installation de machines amd64 et i386. Elle peut être téléchargée en "
-"utilisant FTP, HTTP ou rsync :"
+#, fuzzy
+#| msgid "CD for i386, amd64"
+msgid "netinstall CD image for i386, amd64"
+msgstr "CD pour i386 et amd64"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid ""
-#| "FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-#| "still... They currently don't work. CD download URL (debian-"
-#| "edu~7.0+edu0~a0-CD.iso) should work."
+#| "The netinstall CD, which can be used for installation of i386 and amd64 "
+#| "as well, is available via"
msgid ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs currently don't work, the usbstick image is not mentioned at "
-"all."
+"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"
msgstr ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"Le CD d'installation par le réseau, qui peut être utilisé pour installer des "
+"machines i386 et amd64 est disponible :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.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/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-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-7.0.0+r0-"
-#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.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~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
+"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+#| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "CD for i386, amd64"
-msgstr "CD pour i386 et amd64"
+msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. It can be downloaded over FTP, "
+#| "HTTP or rsync via:"
msgid ""
-"The netinstall CD, which can be used for installation of i386 and amd64 as "
-"well, is available via"
+"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:"
msgstr ""
-"Le CD d'installation par le réseau, qui peut être utilisé pour installer des "
-"machines i386 et amd64 est disponible :"
+"L'image ISO multiarchitecture a une taille de 4.4 Gio et peut être utilisée "
+"pour l'installation de machines amd64 et i386. Elle peut être téléchargée en "
+"utilisant FTP, HTTP ou rsync :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1518,7 +1544,7 @@ msgstr ""
#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
@@ -1530,7 +1556,7 @@ msgstr ""
#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
-"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
@@ -1542,7 +1568,7 @@ msgstr ""
#| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
@@ -1552,7 +1578,13 @@ msgid "Source DVD"
msgstr "DVD des sources :"
#. type: Content of: <article><section><section><section><para>
-msgid "The sources are available via"
+msgid "FIXME: the source DVD download URL currently doesn't work"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "The sources are available via"
+msgid "The source DVD is available via"
msgstr "Les sources sont disponibles :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1593,7 +1625,9 @@ msgstr ""
"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
#. type: Content of: <article><section><section><title>
-msgid "Request a CD/DVD by mail"
+#, fuzzy
+#| msgid "Request a CD/DVD by mail"
+msgid "Request a CD / DVD by mail"
msgstr "Demande d'un CD/DVD par courrier"
#. type: Content of: <article><section><section><para>
@@ -1857,16 +1891,25 @@ msgstr ""
"sur la <emphasis>touche tabulation</emphasis> dans le menu de démarrage."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture DVD defaults to using amd64-installgui on 64-bit "
+#| "x86 machines, and installgui on 32-bit x86 machines."
msgid ""
-"The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 "
-"machines, and installgui on 32-bit x86 machines."
+"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
+"machines."
msgstr ""
"Par défaut, le DVD multiarchitecture utilise amd64-installgui sur les "
"machines x86 64 bits et installgui sur les machines x86 32 bits."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to boot the amd64 text mode with the multi-architecture DVD, "
+#| "that would be <computeroutput>amd64-install</computeroutput>."
msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture DVD, "
+"If you want to boot the amd64 text mode with the multi-architecture image, "
"that would be <computeroutput>amd64-install</computeroutput>."
msgstr ""
"Si vous voulez amorcer le mode texte amd64 avec le DVD multiarchitecture, "
@@ -1881,8 +1924,14 @@ msgstr ""
"computeroutput> pour activer la version graphique sur amd64."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+#| "machine you need to manually select <computeroutput>install</"
+#| "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#| "(graphical mode)."
msgid ""
-"If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+"If you want to boot the i386 mode with the multi-arch image on an amd64 "
"machine you need to manually select <computeroutput>install</computeroutput> "
"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
msgstr ""
@@ -1915,8 +1964,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><title>
msgid ""
-"Boot parameters available when installing from CD, not when installing from "
-"DVD"
+"Boot parameters available when installing from the netinstall CD image, not "
+"when installing from the multi-arch image"
msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2238,15 +2287,22 @@ msgstr ""
"authentifié avec le nouveau mot de passe)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on DVD installs"
-msgstr "Note concernant l'installation depuis un DVD"
+msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgstr ""
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
+#| "computeroutput> will only contain sources from the DVD. If you have an "
+#| "Internet connection, we strongly suggest adding the following lines to it "
+#| "so that available security updates can be installed:"
msgid ""
-"After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-"computeroutput> will only contain sources from the DVD. If you have an "
-"Internet connection, we strongly suggest adding the following lines to it so "
-"that available security updates can be installed:"
+"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
+"sources from that image. If you have an Internet connection, we strongly "
+"suggest adding the following lines to it so that available security updates "
+"can be installed:"
msgstr ""
"Si vous effectuez l'installation depuis un DVD, <computeroutput>/etc/apt/"
"sources.list</computeroutput> ne contiendra que les sources du DVD. Si vous "
@@ -2265,8 +2321,12 @@ msgstr ""
"deb http://ftp.skolelinux.org/skolelinux wheezy local"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The DVD only works with KDE desktop installations. If you want to "
+#| "install other desktop options, use the netinst images or PXE installation."
msgid ""
-"The DVD only works with KDE desktop installations. If you want to install "
+"This image only works for KDE desktop installations. If you want to install "
"other desktop options, use the netinst images or PXE installation."
msgstr ""
"Le DVD ne permet d'installer que l'environnement de bureau KDE. Si vous "
@@ -2339,15 +2399,23 @@ msgstr ""
"chroots combinés à chaque fois, c'est pour cela que cela est fait par défaut."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB sticks instead of CD/DVDs"
+#, fuzzy
+#| msgid "Installation using USB sticks instead of CD/DVDs"
+msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
msgstr "Installation depuis une clé USB au lieu d'un CD ou d'un DVD."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Since the Squeeze release it is possible to directly copy the CD/DVD "
+#| "<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
+#| "them. Simply execute a command like this, just adapting the file and "
+#| "device names to your needs:"
msgid ""
-"Since the Squeeze release it is possible to directly copy the CD/DVD "
-"<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
-"them. Simply execute a command like this, just adapting the file and device "
-"names to your needs:"
+"Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
+"<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
+"known as \"USB sticks\") and boot from them. Simply execute a command like "
+"this, just adapting the file and device names to your needs:"
msgstr ""
"Depuis la sortie de Squeeze, il est possible de copier les images "
"<computeroutput>ISO</computeroutput> des CD ou DVD sur une clé USB et de "
@@ -2363,9 +2431,13 @@ msgstr ""
"bs=1024</computeroutput>"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Depending on which image you choose, the USB stick will behave just like "
+#| "a CD or DVD."
msgid ""
-"Depending on which image you choose, the USB stick will behave just like a "
-"CD or DVD."
+"Depending on which image you choose, the USB flash drive will behave just "
+"like a CD or Blue-ray disc."
msgstr ""
"En fonction de l'image que vous choisissez, la clé USB se comportera "
"exactement comme un CD ou un DVD."
@@ -2562,16 +2634,23 @@ msgstr ""
"sont des exemples de ce type de configuration."
#. type: Content of: <article><section><section><section><title>
-msgid "Custom CD/DVDs"
-msgstr "CD/DVD personnalisés"
+msgid "Custom images"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
-"\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, which "
-"has a modular design and other nice features. <ulink url=\"http://wiki."
-"debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you to define "
-"answers to the questions normally asked."
+#, fuzzy
+#| msgid ""
+#| "Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
+#| "\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, "
+#| "which has a modular design and other nice features. <ulink url=\"http://"
+#| "wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you "
+#| "to define answers to the questions normally asked."
+msgid ""
+"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
msgstr ""
"La création de CD ou DVD personnalisés est assez facile, puisque nous "
"utilisons l'<ulink url=\"http://wiki.debian.org/DebianInstaller/"
@@ -3805,7 +3884,9 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network."
+"modified though to suite your network: Rename each new system, activate DHCP "
+"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
+"following screenshots show how this looks in practice:"
msgstr ""
"Si les machines ont démarré comme clients légers ou stations de travail sans "
"disque, ou ont été installées en utilisant n'importe quel profil réseau, le "
@@ -3816,10 +3897,6 @@ msgstr ""
"peuvent ensuite être modifiés pour s'adapter à votre réseau. Quelques "
"captures d'écrans montrent comment cela peut être fait."
-#. type: Content of: <article><section><section><para>
-msgid "The following screenshots show how this looks in practice:"
-msgstr ""
-
#. type: CDATA
#, fuzzy, no-wrap
#| msgid ""
@@ -5500,7 +5577,9 @@ msgstr ""
"trois sections : main, contrib et non-free."
#. type: Content of: <article><section><section><title>
-msgid "Upgrading with a CD or DVD ROM"
+#, fuzzy
+#| msgid "Upgrading with a CD or DVD ROM"
+msgid "Upgrading with a CD or similar image"
msgstr "Mettre à jour avec un CD ou DVD"
#. type: Content of: <article><section><section><para>
@@ -5519,8 +5598,13 @@ msgstr ""
"mais seulement un support physique, suivez ces étapes :"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom "
+#| "command:"
msgid ""
-"Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:"
+"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"apt-cdrom command:"
msgstr ""
"Insérez le CD ou DVD dans le lecteur, montez-le et utilisez la commande apt-"
"cdrom :"
@@ -5674,21 +5758,33 @@ msgid "Easy access to USB drives and CDROMs/DVDs"
msgstr "Accès facile aux disques USB et aux CD et DVD"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a (diskless) workstation, "
+#| "a popup window appears asking what to do with it, just like in any other "
+#| "normal installation."
msgid ""
-"When users insert a USB drive or DVD/CDROM into a (diskless) workstation, a "
-"popup window appears asking what to do with it, just like in any other "
-"normal installation."
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
msgstr ""
"Quand les utilisateurs insèrent un disque USB, un CD ou un DVD dans une "
"station de travail (sans disque dur), une fenêtre apparaît et demande quoi "
"faire avec, comme dans toute autre installation."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a thin client there is "
+#| "only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
msgid ""
-"When users insert a USB drive or DVD/CDROM into a thin client there is only "
-"a notify-window showing up for a few seconds. The media is automatically "
-"mounted and it is possible to access it browsing to the /media/$user folder. "
-"This is quite difficult for many non experienced users."
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
msgstr ""
"Quand les utilisateurs insèrent un disque USB, un CD ou un DVD dans un "
"client léger, seule une fenêtre de notification apparaît pour quelques "
@@ -5714,9 +5810,16 @@ msgstr ""
"le bureau permettant un accès facile)."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM/DVD or whatever media is connected to the thin client. This "
+#| "might come in handy if users want to edit files directly on their plugged "
+#| "in media."
msgid ""
"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM/"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
"DVD or whatever media is connected to the thin client. This might come in "
"handy if users want to edit files directly on their plugged in media."
msgstr ""
@@ -8962,9 +9065,9 @@ msgstr "Introduction aux clients légers et stations de travail sans disque dur"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If working on a diskless client, you don't have a Kerberos TGT by default. "
-"To get one, open up a terminal and execute <computeroutput>kinit</"
-"computeroutput>. Enter your password and the ticket will be granted."
+"If working on a diskless workstation, you don't have a Kerberos TGT by "
+"default. To get one, click the credentials button in the system tray. Enter "
+"your password and the ticket will be granted."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -9312,6 +9415,12 @@ msgstr ""
"\"http://www.debian.org/releases/wheezy/installmanual\">manuel "
"d'installation</ulink> pour plus de détails."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Mises à jour des logiciels"
@@ -10828,10 +10937,15 @@ msgstr ""
"ajouté au groupe <computeroutput>teachers</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <computeroutput>.iso</computeroutput> images can directly be copied "
+#| "onto USB sticks, for example by using <computeroutput>dd</computeroutput> "
+#| "or even <computeroutput>cat</computeroutput>.."
msgid ""
"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"USB flash drives, for example by using <computeroutput>dd</computeroutput> "
+"or even <computeroutput>cat</computeroutput>.."
msgstr ""
"Les images <computeroutput>.iso</computeroutput> peuvent être copiées "
"directement sur des clés USB en utilisant par exemple <computeroutput>dd</"
@@ -11945,6 +12059,65 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid "The DVD installation works without access to the Internet."
+#~ msgstr "L'installation à partir du DVD fonctionne sans accès à Internet."
+
+#~ msgid "DVD for i386, amd64"
+#~ msgstr "DVD pour i386 et amd64"
+
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: the DVD and source DVD download URLs need to be adapted for "
+#~| "wheezy still... They currently don't work. CD download URL (debian-"
+#~| "edu~7.0+edu0~a0-CD.iso) should work."
+#~ msgid ""
+#~ "FIXME: only the CD download links work currently - the DVD and source DVD "
+#~ "download URLs currently don't work, the usbstick image is not mentioned "
+#~ "at all."
+#~ msgstr ""
+#~ "FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
+#~ "still... They currently don't work. CD download URL (debian-"
+#~ "edu~7.0+edu0~a0-CD.iso) should work."
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#~| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+#~ msgid ""
+#~ "<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/debian-edu-7.0.0+r0-"
+#~ "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#~| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+#~ msgid ""
+#~ "<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=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#~ "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~| "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+#~ msgid ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+
+#~ msgid "A note on DVD installs"
+#~ msgstr "Note concernant l'installation depuis un DVD"
+
+#~ msgid "Custom CD/DVDs"
+#~ msgstr "CD/DVD personnalisés"
+
#, fuzzy
#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
#~ msgid ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 85fbab1..b0d1468 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-07-07 17:13+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\n"
"PO-Revision-Date: 2013-05-12 17:17+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -79,17 +79,29 @@ msgstr ""
"completamente configurata di una scuola."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Immediatly after installation a school server running all services needed "
+#| "for a school network is set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>), just "
+#| "waiting for users and machines being added via GOsa², a comfortable Web-"
+#| "UI, or any other LDAP editor. A netbooting environment is prepared using "
+#| "PXE, so after initial installation of the main server from CD, DVD or "
+#| "usbstick all other machines can be installed via the network, this "
+#| "includes \"roaming workstations\" (ones that can be taken away from the "
+#| "school network, usually laptops or netbooks) as well as PXE booting for "
+#| "diskless machines like tradional thin-clients."
msgid ""
"Immediatly after installation a school server running all services needed "
"for a school network is set up (see the next chapter <link linkend="
"\"Architecture\">details of the architecture of this setup</link>), just "
"waiting for users and machines being added via GOsa², a comfortable Web-UI, "
"or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, DVD or usbstick all "
-"other machines can be installed via the network, this includes \"roaming "
-"workstations\" (ones that can be taken away from the school network, usually "
-"laptops or netbooks) as well as PXE booting for diskless machines like "
-"tradional thin-clients."
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive all other machines can be installed via the network, this "
+"includes \"roaming workstations\" (ones that can be taken away from the "
+"school network, usually laptops or netbooks) as well as PXE booting for "
+"diskless machines like tradional thin-clients."
msgstr ""
"Immediatamente dopo l'installazione è configurato un server della scuola che "
"esegue tutti i servizi necessari per la rete scolastica (vedere il prossimo "
@@ -851,11 +863,17 @@ msgid "Administration"
msgstr "Amministrazione"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed by means of a Skolelinux CD or "
+#| "DVD will be administrable from a central computer, most likely the "
+#| "server. It will be possible to log in to all machines via SSH, and "
+#| "thereby have full access to the machines."
msgid ""
-"All the Linux machines that are installed by means of a Skolelinux CD or DVD "
-"will be administrable from a central computer, most likely the server. It "
-"will be possible to log in to all machines via SSH, and thereby have full "
-"access to the machines."
+"All the Linux machines that are installed with the Skolelinux installer will "
+"be administrable from a central computer, most likely the server. It will be "
+"possible to log in to all machines via SSH, and thereby have full access to "
+"the machines."
msgstr ""
"Tutte le macchine linux che sono installate con un CD o un DVD Skolelinux, "
"saranno amministrate da un computer centrale, probabilmente il server. Sarà "
@@ -889,26 +907,37 @@ msgid "Installation"
msgstr "Installazione"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Currently there are two types of installation media: netinst CD and multi-"
+#| "arch DVD. Both types can also be booted from USB sticks."
msgid ""
-"Currently there are two types of installation media: netinst CD and multi-"
-"arch DVD. Both types can also be booted from USB sticks."
+"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."
msgstr ""
"Attualmente ci sono due tipi di supporti di installazione: CD netinst e "
"multi- arch DVD. Entrambi i tipi possono essere avviati anche da chiavetta "
"USB. "
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from a CD/DVD type medium once, "
+#| "and install all other clients over the network by booting from the "
+#| "network."
msgid ""
-"The aim is to be able to install a server from a CD/DVD type medium once, "
-"and install all other clients over the network by booting from the network."
+"The aim is to be able to install a server from any type medium once, and "
+"install all other clients over the network by booting from the network."
msgstr ""
"L'obiettivo è quello di essere in grado di installare un server da un CD/DVD "
"una volta e installare tutti gli altri clienti della rete mediante il boot "
"da rete."
#. type: Content of: <article><section><section><section><para>
-msgid "The DVD installation works without access to the Internet."
-msgstr "L'installazione da DVD non richiede l'accesso a Internet."
+msgid ""
+"Only the netinstall image needs access to the Internet during installation."
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -1381,86 +1410,99 @@ msgstr ""
"Wheezy"
#. type: Content of: <article><section><section><section><title>
-msgid "DVD for i386, amd64"
-msgstr "DVD per i386 e amd64"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
-"installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP "
-"or rsync via:"
-msgstr ""
-"L'immagine multiarchitettura del dvd ISO è grande 4.4 GiB epuò essere usato "
-"sia per l'installazione di macchine amd64 e i386. Per fare il download via "
-"FTP, HTTP o rsync:"
+#, fuzzy
+#| msgid "CD for i386, amd64"
+msgid "netinstall CD image for i386, amd64"
+msgstr "CD per i386 e amd64"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
+#| msgid ""
+#| "The netinstall CD, which can be used for installation of i386 and amd64 "
+#| "as well, is available via"
msgid ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs currently don't work, the usbstick image is not mentioned at "
-"all."
+"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"
msgstr ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"Il CD netinstall, che può essere usato per l'installazione i386 e amd64 è "
+"disponibile a "
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
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/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<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/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
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~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<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~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-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-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "CD for i386, amd64"
-msgstr "CD per i386 e amd64"
+msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. It can be downloaded over FTP, "
+#| "HTTP or rsync via:"
msgid ""
-"The netinstall CD, which can be used for installation of i386 and amd64 as "
-"well, is available via"
+"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:"
msgstr ""
-"Il CD netinstall, che può essere usato per l'installazione i386 e amd64 è "
-"disponibile a "
+"L'immagine multiarchitettura del dvd ISO è grande 4.4 GiB epuò essere usato "
+"sia per l'installazione di macchine amd64 e i386. Per fare il download via "
+"FTP, HTTP o rsync:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+#| "edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-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-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
-"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
@@ -1470,7 +1512,13 @@ msgid "Source DVD"
msgstr "Source DVD"
#. type: Content of: <article><section><section><section><para>
-msgid "The sources are available via"
+msgid "FIXME: the source DVD download URL currently doesn't work"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "The sources are available via"
+msgid "The source DVD is available via"
msgstr "I sorgenti sono disponibili via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1498,7 +1546,9 @@ msgstr ""
"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"
+#, fuzzy
+#| msgid "Request a CD/DVD by mail"
+msgid "Request a CD / DVD by mail"
msgstr "Richiesta di un CD/DVD con mail"
#. type: Content of: <article><section><section><para>
@@ -1752,16 +1802,25 @@ msgstr ""
"<emphasis>il tasto tab</emphasis> nel menu di boot."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture DVD defaults to using amd64-installgui on 64-bit "
+#| "x86 machines, and installgui on 32-bit x86 machines."
msgid ""
-"The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 "
-"machines, and installgui on 32-bit x86 machines."
+"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
+"machines."
msgstr ""
"L'installazione di default del DVD usa amd64-installgui su macchine x86 64-"
"bit, e installgui su macchine x86 32-bit."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to boot the amd64 text mode with the multi-architecture DVD, "
+#| "that would be <computeroutput>amd64-install</computeroutput>."
msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture DVD, "
+"If you want to boot the amd64 text mode with the multi-architecture image, "
"that would be <computeroutput>amd64-install</computeroutput>."
msgstr ""
"Se si vuole installare in modo testo l'architettura amd64 con il DVD "
@@ -1777,8 +1836,14 @@ msgstr ""
"<computeroutput>amd64-expertgui</computeroutput>."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+#| "machine you need to manually select <computeroutput>install</"
+#| "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#| "(graphical mode)."
msgid ""
-"If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+"If you want to boot the i386 mode with the multi-arch image on an amd64 "
"machine you need to manually select <computeroutput>install</computeroutput> "
"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
msgstr ""
@@ -1810,8 +1875,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><title>
msgid ""
-"Boot parameters available when installing from CD, not when installing from "
-"DVD"
+"Boot parameters available when installing from the netinstall CD image, not "
+"when installing from the multi-arch image"
msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2110,15 +2175,22 @@ msgstr ""
"rete e connessi con la nuova password)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on DVD installs"
-msgstr "Una nota sull'installazione da DVD"
+msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgstr ""
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
+#| "computeroutput> will only contain sources from the DVD. If you have an "
+#| "Internet connection, we strongly suggest adding the following lines to it "
+#| "so that available security updates can be installed:"
msgid ""
-"After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-"computeroutput> will only contain sources from the DVD. If you have an "
-"Internet connection, we strongly suggest adding the following lines to it so "
-"that available security updates can be installed:"
+"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
+"sources from that image. If you have an Internet connection, we strongly "
+"suggest adding the following lines to it so that available security updates "
+"can be installed:"
msgstr ""
"Se si installa da un DVD <computeroutput>/etc/apt/sources.list</"
"computeroutput> conterrà come sorgente solo il DVD. Se si ha un collegamento "
@@ -2138,8 +2210,12 @@ msgstr ""
"deb http://ftp.skolelinux.org/skolelinux wheezy local"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The DVD only works with KDE desktop installations. If you want to "
+#| "install other desktop options, use the netinst images or PXE installation."
msgid ""
-"The DVD only works with KDE desktop installations. If you want to install "
+"This image only works for KDE desktop installations. If you want to install "
"other desktop options, use the netinst images or PXE installation."
msgstr ""
"Il DVD installa solo il desktop KDE. Se si desidera installarealtri desktop, "
@@ -2210,15 +2286,23 @@ msgstr ""
"sempre un chroot combinato come da impostazione predefinita. "
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB sticks instead of CD/DVDs"
+#, fuzzy
+#| msgid "Installation using USB sticks instead of CD/DVDs"
+msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
msgstr "Installazione da penna USB invece che CD/DVD"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Since the Squeeze release it is possible to directly copy the CD/DVD "
+#| "<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
+#| "them. Simply execute a command like this, just adapting the file and "
+#| "device names to your needs:"
msgid ""
-"Since the Squeeze release it is possible to directly copy the CD/DVD "
-"<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
-"them. Simply execute a command like this, just adapting the file and device "
-"names to your needs:"
+"Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
+"<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
+"known as \"USB sticks\") and boot from them. Simply execute a command like "
+"this, just adapting the file and device names to your needs:"
msgstr ""
"Dal rilascio di Squeeze è possibile copiare direttamente l'immagine "
"<computeroutput>.iso</computeroutput> su una penna USB e avviare da questa. "
@@ -2234,9 +2318,13 @@ msgstr ""
"bs=1024</computeroutput>"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Depending on which image you choose, the USB stick will behave just like "
+#| "a CD or DVD."
msgid ""
-"Depending on which image you choose, the USB stick will behave just like a "
-"CD or DVD."
+"Depending on which image you choose, the USB flash drive will behave just "
+"like a CD or Blue-ray disc."
msgstr ""
"A seconda dell'immagine scelta, la penna USB si comporterà esattamente come "
"un CD o DVD."
@@ -2422,16 +2510,23 @@ msgstr ""
"di tastiera e il desktop sono esempi di queste impostazioni."
#. type: Content of: <article><section><section><section><title>
-msgid "Custom CD/DVDs"
-msgstr "CD/DVD personalizzati"
+msgid "Custom images"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
-"\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, which "
-"has a modular design and other nice features. <ulink url=\"http://wiki."
-"debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you to define "
-"answers to the questions normally asked."
+#, fuzzy
+#| msgid ""
+#| "Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
+#| "\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, "
+#| "which has a modular design and other nice features. <ulink url=\"http://"
+#| "wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you "
+#| "to define answers to the questions normally asked."
+msgid ""
+"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
msgstr ""
"Creare una versione personalizzata del CD o del DVD è possibile abbastanza "
"facilmente, usando <ulink url=\"http://wiki.debian.org/DebianInstaller/"
@@ -3524,7 +3619,9 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network."
+"modified though to suite your network: Rename each new system, activate DHCP "
+"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
+"following screenshots show how this looks in practice:"
msgstr ""
"Se le macchine sono avviate come thin client/diskless workstations o sono "
"state installate usando uno dei profili di rete, lo script "
@@ -3535,10 +3632,6 @@ msgstr ""
"sistemi possono poi essere modificati sulla base della vostra rete. Alcuni "
"screenshots mostrano come questo può essere fatto."
-#. type: Content of: <article><section><section><para>
-msgid "The following screenshots show how this looks in practice:"
-msgstr ""
-
#. type: CDATA
#, fuzzy, no-wrap
msgid ""
@@ -5142,7 +5235,9 @@ msgstr ""
"free."
#. type: Content of: <article><section><section><title>
-msgid "Upgrading with a CD or DVD ROM"
+#, fuzzy
+#| msgid "Upgrading with a CD or DVD ROM"
+msgid "Upgrading with a CD or similar image"
msgstr "Aggiornamento da CD o DVD"
#. type: Content of: <article><section><section><para>
@@ -5156,8 +5251,13 @@ msgstr ""
"fisico, occorre seguire questi passi:"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom "
+#| "command:"
msgid ""
-"Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:"
+"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"apt-cdrom command:"
msgstr ""
"Inserire il CD/DVD-ROM nel drive, montarlo e usare il comando apt-cdrom:"
@@ -5307,21 +5407,33 @@ msgid "Easy access to USB drives and CDROMs/DVDs"
msgstr "Accesso facile a drive USB e CDROM/DVD"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a (diskless) workstation, "
+#| "a popup window appears asking what to do with it, just like in any other "
+#| "normal installation."
msgid ""
-"When users insert a USB drive or DVD/CDROM into a (diskless) workstation, a "
-"popup window appears asking what to do with it, just like in any other "
-"normal installation."
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
msgstr ""
"Quando gli utenti inseriscono un drive USB o DVD/CDROM dentro una (diskless) "
"workstation, si attiva una finestra popup che chiede cosa si vuole fare, "
"come in ogni altra normale installazione."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a thin client there is "
+#| "only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
msgid ""
-"When users insert a USB drive or DVD/CDROM into a thin client there is only "
-"a notify-window showing up for a few seconds. The media is automatically "
-"mounted and it is possible to access it browsing to the /media/$user folder. "
-"This is quite difficult for many non experienced users."
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
msgstr ""
"Quando gli utenti inseriscono un componente usb o un DVD/CDROM in un thin "
"client viene mostrata una finestra popup per pochi secondi. Il supporto è "
@@ -5345,9 +5457,16 @@ msgstr ""
"permettendo un accesso facilitato)."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM/DVD or whatever media is connected to the thin client. This "
+#| "might come in handy if users want to edit files directly on their plugged "
+#| "in media."
msgid ""
"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM/"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
"DVD or whatever media is connected to the thin client. This might come in "
"handy if users want to edit files directly on their plugged in media."
msgstr ""
@@ -8504,9 +8623,9 @@ msgstr "Cambiare il modo kiosk sulle workstation diskless"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If working on a diskless client, you don't have a Kerberos TGT by default. "
-"To get one, open up a terminal and execute <computeroutput>kinit</"
-"computeroutput>. Enter your password and the ticket will be granted."
+"If working on a diskless workstation, you don't have a Kerberos TGT by "
+"default. To get one, click the credentials button in the system tray. Enter "
+"your password and the ticket will be granted."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -8844,6 +8963,12 @@ msgstr ""
"maggiori dettagli <ulink url=\"http://www.debian.org/releases/wheezy/"
"installmanual\">installation manual</ulink>."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Aggiornamenti software"
@@ -10317,10 +10442,15 @@ msgstr ""
"al gruppo <computeroutput>teachers</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <computeroutput>.iso</computeroutput> images can directly be copied "
+#| "onto USB sticks, for example by using <computeroutput>dd</computeroutput> "
+#| "or even <computeroutput>cat</computeroutput>.."
msgid ""
"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"USB flash drives, for example by using <computeroutput>dd</computeroutput> "
+"or even <computeroutput>cat</computeroutput>.."
msgstr ""
"L'immagine <computeroutput>.iso</computeroutput> può essere direttamente "
"copiata su penna USB usando <computeroutput>dd</computeroutput> o anche "
@@ -11399,6 +11529,49 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "The DVD installation works without access to the Internet."
+#~ msgstr "L'installazione da DVD non richiede l'accesso a Internet."
+
+#~ msgid "DVD for i386, amd64"
+#~ msgstr "DVD per i386 e amd64"
+
+#, fuzzy
+#~ msgid ""
+#~ "FIXME: only the CD download links work currently - the DVD and source DVD "
+#~ "download URLs currently don't work, the usbstick image is not mentioned "
+#~ "at all."
+#~ msgstr ""
+#~ "FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
+#~ "still... They currently don't work. CD download URL (debian-"
+#~ "edu~7.0+edu0~a0-CD.iso) should work."
+
+#~ msgid ""
+#~ "<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/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-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>"
+#~ msgstr ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+
+#~ msgid "A note on DVD installs"
+#~ msgstr "Una nota sull'installazione da DVD"
+
+#~ msgid "Custom CD/DVDs"
+#~ msgstr "CD/DVD personalizzati"
+
#~ msgid ""
#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
#~ "png)."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index d03fd39..df22103 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-07-07 17:13+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -86,11 +86,11 @@ msgid ""
"\"Architecture\">details of the architecture of this setup</link>), just "
"waiting for users and machines being added via GOsa², a comfortable Web-UI, "
"or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, DVD or usbstick all "
-"other machines can be installed via the network, this includes \"roaming "
-"workstations\" (ones that can be taken away from the school network, usually "
-"laptops or netbooks) as well as PXE booting for diskless machines like "
-"tradional thin-clients."
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive all other machines can be installed via the network, this "
+"includes \"roaming workstations\" (ones that can be taken away from the "
+"school network, usually laptops or netbooks) as well as PXE booting for "
+"diskless machines like tradional thin-clients."
msgstr ""
#. type: Content of: <article><section><para>
@@ -852,10 +852,10 @@ msgstr "Administrasjon"
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid ""
-"All the Linux machines that are installed by means of a Skolelinux CD or DVD "
-"will be administrable from a central computer, most likely the server. It "
-"will be possible to log in to all machines via SSH, and thereby have full "
-"access to the machines."
+"All the Linux machines that are installed with the Skolelinux installer will "
+"be administrable from a central computer, most likely the server. It will be "
+"possible to log in to all machines via SSH, and thereby have full access to "
+"the machines."
msgstr ""
"Alle linuxmaskinene som er installert ved hjelp av en Skolelinux-CD eller "
"DVD vil være satt opp til å administreres fra en sentral maskin, mest trolig "
@@ -891,23 +891,25 @@ msgstr "Installasjon"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Currently there are two types of installation media: netinst CD and multi-"
-"arch DVD. Both types can also be booted from USB sticks."
+"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."
msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
-"The aim is to be able to install a server from a CD/DVD type medium once, "
-"and install all other clients over the network by booting from the network."
+"The aim is to be able to install a server from any type medium once, and "
+"install all other clients over the network by booting from the network."
msgstr ""
"Målet er å gjøre det mulig å installere en tjener fra CD/DVD, og så "
"installere klienter over nettverket ved å starte opp alle andre maskiner fra "
"nettverket. DVD-installasjonen fungerer uten tilgang til Internett."
#. type: Content of: <article><section><section><section><para>
-msgid "The DVD installation works without access to the Internet."
-msgstr "DVD-installasjonen fungerer uten tilgang til Internet."
+msgid ""
+"Only the netinstall image needs access to the Internet during installation."
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -1397,32 +1399,23 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
-msgid "DVD for i386, amd64"
+msgid "netinstall CD image for i386, amd64"
msgstr "DVDer for i386, amd64 og powerpc"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
-"The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
-"installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP "
-"or rsync via:"
-msgstr ""
-"ISO-bildet av en DVD for flere arkitekturer er 4.4 GiB stort, og kan bli "
-"brukt for innstallasjoner av amd64 og i386 maskiner. For å laste det ned, "
-"bruk en av disse metodene:"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs currently don't work, the usbstick image is not mentioned at "
-"all."
+"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"
msgstr ""
+"Nettinstallasjons CD, som kan brukes for i386, and64 og powerpc maskiner, 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-7.1+edu0-DVD."
-"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
"source-DVD.iso</computeroutput>"
@@ -1430,40 +1423,42 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
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~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
msgstr ""
-"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
-"source-DVD.iso</computeroutput>"
+"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-msgid "CD for i386, amd64"
-msgstr "DVDer for i386, amd64 og powerpc"
+msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
-"The netinstall CD, which can be used for installation of i386 and amd64 as "
-"well, is available via"
+"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:"
msgstr ""
-"Nettinstallasjons CD, som kan brukes for i386, and64 og powerpc maskiner, er "
-"tilgjengelig via"
+"ISO-bildet av en DVD for flere arkitekturer er 4.4 GiB stort, og kan bli "
+"brukt for innstallasjoner av amd64 og i386 maskiner. For å laste det ned, "
+"bruk en av disse metodene:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
"source-DVD.iso</computeroutput>"
@@ -1472,7 +1467,7 @@ msgstr ""
#, fuzzy
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
-"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
msgstr ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1481,7 +1476,7 @@ msgstr ""
#, fuzzy
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1492,8 +1487,12 @@ msgid "Source DVD"
msgstr "Kilder:"
#. type: Content of: <article><section><section><section><para>
+msgid "FIXME: the source DVD download URL currently doesn't work"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
#, fuzzy
-msgid "The sources are available via"
+msgid "The source DVD is available via"
msgstr "Kildekoden er tilgjengelig via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1524,7 +1523,9 @@ msgstr ""
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
#. type: Content of: <article><section><section><title>
-msgid "Request a CD/DVD by mail"
+#, fuzzy
+#| msgid "Request a CD/DVD by mail"
+msgid "Request a CD / DVD by mail"
msgstr "Be om en CD/DVD i posten"
#. type: Content of: <article><section><section><para>
@@ -1793,8 +1794,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 "
-"machines, and installgui on 32-bit x86 machines."
+"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
+"machines."
msgstr ""
"FlerarkitekturDVDen bruker amd64-installgui på x86 64-bit maskiner og "
"installgui på x86 32-bit maskiner."
@@ -1802,7 +1804,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture DVD, "
+"If you want to boot the amd64 text mode with the multi-architecture image, "
"that would be <computeroutput>amd64-install</computeroutput>."
msgstr ""
"Hvis du vil starte opp i amd64 tekstmodus med flerarkitekturDVDen, må du "
@@ -1819,7 +1821,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+"If you want to boot the i386 mode with the multi-arch image on an amd64 "
"machine you need to manually select <computeroutput>install</computeroutput> "
"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
msgstr ""
@@ -1844,8 +1846,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><title>
msgid ""
-"Boot parameters available when installing from CD, not when installing from "
-"DVD"
+"Boot parameters available when installing from the netinstall CD image, not "
+"when installing from the multi-arch image"
msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2129,16 +2131,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on DVD installs"
-msgstr "En kommenar om DVD-installasjon"
+msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgstr ""
#. type: Content of: <article><section><section><section><section><para>
#, fuzzy
msgid ""
-"After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-"computeroutput> will only contain sources from the DVD. If you have an "
-"Internet connection, we strongly suggest adding the following lines to it so "
-"that available security updates can be installed:"
+"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
+"sources from that image. If you have an Internet connection, we strongly "
+"suggest adding the following lines to it so that available security updates "
+"can be installed:"
msgstr ""
"Hvis du installerer fra en DVD vil <computeroutput>/etc/apt/sources.list</"
"computeroutput> bare inneholde kilder fra DVDen. Hvis du har en "
@@ -2159,7 +2162,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"The DVD only works with KDE desktop installations. If you want to install "
+"This image only works for KDE desktop installations. If you want to install "
"other desktop options, use the netinst images or PXE installation."
msgstr ""
@@ -2234,15 +2237,15 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
-msgid "Installation using USB sticks instead of CD/DVDs"
+msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
msgstr "Installasjon er mulig enten fra en CD eller en DVD."
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Since the Squeeze release it is possible to directly copy the CD/DVD "
-"<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
-"them. Simply execute a command like this, just adapting the file and device "
-"names to your needs:"
+"Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
+"<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
+"known as \"USB sticks\") and boot from them. Simply execute a command like "
+"this, just adapting the file and device names to your needs:"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -2256,8 +2259,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Depending on which image you choose, the USB stick will behave just like a "
-"CD or DVD."
+"Depending on which image you choose, the USB flash drive will behave just "
+"like a CD or Blue-ray disc."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -2443,17 +2446,17 @@ msgstr ""
"eksempler på slike innstillinger."
#. type: Content of: <article><section><section><section><title>
-msgid "Custom CD/DVDs"
-msgstr "Tilpassede CD/DVD-plater"
+msgid "Custom images"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
-"Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
-"\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, which "
-"has a modular design and other nice features. <ulink url=\"http://wiki."
-"debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you to define "
-"answers to the questions normally asked."
+"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
msgstr ""
"Å lage tilpassede CDer eller DVD-plater er ganske enkelt, siden vi "
"benytter<ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
@@ -3565,11 +3568,9 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "The following screenshots show how this looks in practice:"
+"modified though to suite your network: Rename each new system, activate DHCP "
+"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
+"following screenshots show how this looks in practice:"
msgstr ""
#. type: CDATA
@@ -5144,7 +5145,7 @@ 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 ""
#. type: Content of: <article><section><section><para>
@@ -5156,7 +5157,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:"
+"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"apt-cdrom command:"
msgstr ""
#. type: CDATA
@@ -5301,9 +5303,9 @@ msgstr "Enkel tilgang til USB-enheter og CD-ROM(er)/DVD(er)"
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid ""
-"When users insert a USB drive or DVD/CDROM into a (diskless) workstation, a "
-"popup window appears asking what to do with it, just like in any other "
-"normal installation."
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
msgstr ""
"Når brukere setter en USB-disk eller DVD/CD i en (diskløs) arbeidsstasjon. "
"så spretter det opp et vindu med spørsmål om hva du vil gjøre. Akkurat som "
@@ -5312,10 +5314,10 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid ""
-"When users insert a USB drive or DVD/CDROM into a thin client there is only "
-"a notify-window showing up for a few seconds. The media is automatically "
-"mounted and it is possible to access it browsing to the /media/$user folder. "
-"This is quite difficult for many non experienced users."
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
msgstr ""
"Når brukere setter inn en usb-enhet eller DVD/CDROM i en tynnklient, vil det "
"ikke dukke opp en dialogboks slik de er vant til fra sitt vanlige "
@@ -5336,7 +5338,7 @@ msgstr ""
#, fuzzy
msgid ""
"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM/"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
"DVD or whatever media is connected to the thin client. This might come in "
"handy if users want to edit files directly on their plugged in media."
msgstr ""
@@ -8250,9 +8252,9 @@ msgstr "Endre kioskmodus på halvtykke arbeidstasjoner"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If working on a diskless client, you don't have a Kerberos TGT by default. "
-"To get one, open up a terminal and execute <computeroutput>kinit</"
-"computeroutput>. Enter your password and the ticket will be granted."
+"If working on a diskless workstation, you don't have a Kerberos TGT by "
+"default. To get one, click the credentials button in the system tray. Enter "
+"your password and the ticket will be granted."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -8611,6 +8613,12 @@ msgstr ""
"Mer informasjon kan man finne i <ulink url=\"http://www.debian.org/releases/"
"squeeze/installmanual\"> manualen til Debian Installer</ulink>."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr ""
@@ -10028,8 +10036,8 @@ msgstr ""
#, fuzzy
msgid ""
"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"USB flash drives, for example by using <computeroutput>dd</computeroutput> "
+"or even <computeroutput>cat</computeroutput>.."
msgstr ""
"I Squeeze Debian Edu har vi byttet til <computeroutput>powerdns</"
"computeroutput> som navneserver. Det er imidlertid mulig å forsette å bruke "
@@ -10986,6 +10994,43 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid "The DVD installation works without access to the Internet."
+#~ msgstr "DVD-installasjonen fungerer uten tilgang til Internet."
+
+#, fuzzy
+#~ msgid "DVD for i386, amd64"
+#~ msgstr "DVDer for i386, amd64 og powerpc"
+
+#, fuzzy
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+#~ msgstr ""
+#~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+#~ msgstr ""
+#~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#~ "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
+
+#~ msgid "A note on DVD installs"
+#~ msgstr "En kommenar om DVD-installasjon"
+
+#~ msgid "Custom CD/DVDs"
+#~ msgstr "Tilpassede CD/DVD-plater"
+
#, fuzzy
#~ msgid ""
#~ "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index b17b360..7e1dea0 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-07-07 17:13+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\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"
@@ -71,11 +71,11 @@ msgid ""
"\"Architecture\">details of the architecture of this setup</link>), just "
"waiting for users and machines being added via GOsa², a comfortable Web-UI, "
"or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, DVD or usbstick all "
-"other machines can be installed via the network, this includes \"roaming "
-"workstations\" (ones that can be taken away from the school network, usually "
-"laptops or netbooks) as well as PXE booting for diskless machines like "
-"tradional thin-clients."
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive all other machines can be installed via the network, this "
+"includes \"roaming workstations\" (ones that can be taken away from the "
+"school network, usually laptops or netbooks) as well as PXE booting for "
+"diskless machines like tradional thin-clients."
msgstr ""
#. type: Content of: <article><section><para>
@@ -656,10 +656,10 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"All the Linux machines that are installed by means of a Skolelinux CD or DVD "
-"will be administrable from a central computer, most likely the server. It "
-"will be possible to log in to all machines via SSH, and thereby have full "
-"access to the machines."
+"All the Linux machines that are installed with the Skolelinux installer will "
+"be administrable from a central computer, most likely the server. It will be "
+"possible to log in to all machines via SSH, and thereby have full access to "
+"the machines."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -683,18 +683,20 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Currently there are two types of installation media: netinst CD and multi-"
-"arch DVD. Both types can also be booted from USB sticks."
+"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."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The aim is to be able to install a server from a CD/DVD type medium once, "
-"and install all other clients over the network by booting from the network."
+"The aim is to be able to install a server from any type medium once, and "
+"install all other clients over the network by booting from the network."
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid "The DVD installation works without access to the Internet."
+msgid ""
+"Only the netinstall image needs access to the Internet during installation."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -1034,67 +1036,61 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "DVD for i386, amd64"
+msgid "netinstall CD image for i386, amd64"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
-"installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP "
-"or rsync via:"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"FIXME: only the CD download links work currently - the DVD and source DVD "
-"download URLs currently don't work, the usbstick image is not mentioned at "
-"all."
+"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"
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-DVD."
-"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-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-DVD."
-"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-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-"
-"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "CD for i386, amd64"
+msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The netinstall CD, which can be used for installation of i386 and amd64 as "
-"well, is available via"
+"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:"
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~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-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~a3-"
-"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
+"USB.iso\">debian-edu-7.1+edu0~a3-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~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1102,7 +1098,11 @@ msgid "Source DVD"
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid "The sources are available via"
+msgid "FIXME: the source DVD download URL currently doesn't work"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "The source DVD is available via"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1124,7 +1124,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Request a CD/DVD by mail"
+msgid "Request a CD / DVD by mail"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -1323,13 +1323,14 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 "
-"machines, and installgui on 32-bit x86 machines."
+"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
+"machines."
msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture DVD, "
+"If you want to boot the amd64 text mode with the multi-architecture image, "
"that would be <computeroutput>amd64-install</computeroutput>."
msgstr ""
@@ -1341,7 +1342,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
+"If you want to boot the i386 mode with the multi-arch image on an amd64 "
"machine you need to manually select <computeroutput>install</computeroutput> "
"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
msgstr ""
@@ -1363,8 +1364,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><title>
msgid ""
-"Boot parameters available when installing from CD, not when installing from "
-"DVD"
+"Boot parameters available when installing from the netinstall CD image, not "
+"when installing from the multi-arch image"
msgstr ""
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -1577,15 +1578,16 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on DVD installs"
+msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-"computeroutput> will only contain sources from the DVD. If you have an "
-"Internet connection, we strongly suggest adding the following lines to it so "
-"that available security updates can be installed:"
+"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
+"sources from that image. If you have an Internet connection, we strongly "
+"suggest adding the following lines to it so that available security updates "
+"can be installed:"
msgstr ""
#. type: CDATA
@@ -1598,7 +1600,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"The DVD only works with KDE desktop installations. If you want to install "
+"This image only works for KDE desktop installations. If you want to install "
"other desktop options, use the netinst images or PXE installation."
msgstr ""
@@ -1653,15 +1655,15 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB sticks instead of CD/DVDs"
+msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Since the Squeeze release it is possible to directly copy the CD/DVD "
-"<computeroutput>.iso</computeroutput> images to a USB stick and boot from "
-"them. Simply execute a command like this, just adapting the file and device "
-"names to your needs:"
+"Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
+"<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
+"known as \"USB sticks\") and boot from them. Simply execute a command like "
+"this, just adapting the file and device names to your needs:"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -1672,8 +1674,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Depending on which image you choose, the USB stick will behave just like a "
-"CD or DVD."
+"Depending on which image you choose, the USB flash drive will behave just "
+"like a CD or Blue-ray disc."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1794,16 +1796,16 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Custom CD/DVDs"
+msgid "Custom images"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
-"\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, which "
-"has a modular design and other nice features. <ulink url=\"http://wiki."
-"debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows you to define "
-"answers to the questions normally asked."
+"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -2660,11 +2662,9 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "The following screenshots show how this looks in practice:"
+"modified though to suite your network: Rename each new system, activate DHCP "
+"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
+"following screenshots show how this looks in practice:"
msgstr ""
#. type: CDATA
@@ -3836,7 +3836,7 @@ 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 ""
#. type: Content of: <article><section><section><para>
@@ -3848,7 +3848,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:"
+"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"apt-cdrom command:"
msgstr ""
#. type: CDATA
@@ -3959,17 +3960,17 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"When users insert a USB drive or DVD/CDROM into a (diskless) workstation, a "
-"popup window appears asking what to do with it, just like in any other "
-"normal installation."
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"When users insert a USB drive or DVD/CDROM into a thin client there is only "
-"a notify-window showing up for a few seconds. The media is automatically "
-"mounted and it is possible to access it browsing to the /media/$user folder. "
-"This is quite difficult for many non experienced users."
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3985,7 +3986,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM/"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
"DVD or whatever media is connected to the thin client. This might come in "
"handy if users want to edit files directly on their plugged in media."
msgstr ""
@@ -6273,9 +6274,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If working on a diskless client, you don't have a Kerberos TGT by default. "
-"To get one, open up a terminal and execute <computeroutput>kinit</"
-"computeroutput>. Enter your password and the ticket will be granted."
+"If working on a diskless workstation, you don't have a Kerberos TGT by "
+"default. To get one, click the credentials button in the system tray. Enter "
+"your password and the ticket will be granted."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -6533,6 +6534,12 @@ msgid ""
"for more details."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr ""
@@ -7618,8 +7625,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
-"USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
-"<computeroutput>cat</computeroutput>.."
+"USB flash drives, for example by using <computeroutput>dd</computeroutput> "
+"or even <computeroutput>cat</computeroutput>.."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index ab79dd0..6a1202e 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -19,7 +19,7 @@
</title>
<para>Debian Edu aka Skolelinux is a Linux distribution based on Debian providing an out-of-the box environment of a completely configured school network.
</para>
-<para>Immediatly after installation a school server running all services needed for a school network is set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>), just waiting for users and machines being added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment is prepared using PXE, so after initial installation of the main server from CD, DVD or usbstick all other machines can be installed via the network, this includes "roaming workstations" (ones that can be taken away from the school network, usually laptops or netbooks) as well as PXE booting for diskless machines like tradional thin-clients.
+<para>Immediatly after installation a school server running all services needed for a school network is set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>), just waiting for users and machines being added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment is prepared using PXE, so after initial installation of the main server from CD, Blue-ray disc or USB flash drive all other machines can be installed via the network, this includes "roaming workstations" (ones that can be taken away from the school network, usually laptops or netbooks) as well as PXE booting for diskless machines like tradional thin-clients.
</para>
<para>Several educational applications like celestia, drgeo, gcompris, kalzium, kgeography, solfege and scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe.
</para>
@@ -257,7 +257,7 @@
<section id="Architecture--Administration">
<title>Administration
</title>
-<para>All the Linux machines that are installed by means of a Skolelinux CD or DVD will be administrable from a central computer, most likely the server. It will be possible to log in to all machines via SSH, and thereby have full access to the machines.
+<para>All the Linux machines that are installed with the Skolelinux installer will be administrable from a central computer, most likely the server. It will be possible to log in to all machines via SSH, and thereby have full access to the machines.
</para>
<para>We use cfengine to edit configuration files. These files are updated from the server to the clients. In order to change the client configuration, it suffices to edit the server configuration and let the automation distribute the changes.
</para>
@@ -267,11 +267,11 @@
<section id="Architecture--Installation">
<title>Installation
</title>
-<para>Currently there are two types of installation media: netinst CD and multi-arch DVD. Both types can also be booted from USB sticks.
+<para>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.
</para>
-<para>The aim is to be able to install a server from a CD/DVD type medium once, and install all other clients over the network by booting from the network.
+<para>The aim is to be able to install a server from any type medium once, and install all other clients over the network by booting from the network.
</para>
-<para>The DVD installation works without access to the Internet.
+<para>Only the netinstall image needs access to the Internet during installation.
</para>
<para>The installation should not ask any questions, with the exception of desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, workstation, thin client server). All other configuration will be set up automatically with reasonable values, to be changed from a central location by the system administrator subsequent to the installation.
</para>
@@ -426,41 +426,41 @@
<title>Download the installation media for Debian Edu 7.1+edu0 Codename "Wheezy"
</title>
-<section id="Installation--DVD_for_i386.2C_amd64">
-<title>DVD for i386, amd64
+<section id="Installation--netinstall_CD_image_for_i386.2C_amd64">
+<title>netinstall CD image for i386, amd64
</title>
-<para>The multi-architecture DVD ISO image is 4.4 GiB large and can be used for installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP or rsync via:
-</para>
-<para>
-FIXME: only the CD download links work currently - the DVD and source DVD download URLs currently don't work, the usbstick image is not mentioned at all.
+<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/debian-edu-7.1+edu0-DVD.iso">debian-edu-7.1+edu0-DVD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0~a3-CD.iso">debian-edu-7.1+edu0~a3-CD.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD.iso">debian-edu-7.1+edu0-DVD.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-CD.iso">debian-edu-7.1+edu0~a3-CD.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>
</para></listitem></itemizedlist>
</section>
-<section id="Installation--CD_for_i386.2C_amd64">
-<title>CD for i386, amd64
+<section id="Installation--USB_flash_drive_.2BAC8_Blue-ray_disc_ISO_image_for_i386_and_amd64">
+<title>USB flash drive / Blue-ray disc ISO image for i386 and amd64
</title>
-<para>The netinstall CD, which can be used for installation of i386 and amd64 as well, is available via
+<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~a3-CD.iso">debian-edu-7.1+edu0~a3-CD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0~a3-USB.iso">debian-edu-7.1+edu0~a3-USB.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-CD.iso">debian-edu-7.1+edu0~a3-CD.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-USB.iso">debian-edu-7.1+edu0~a3-USB.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>
</para></listitem></itemizedlist>
</section>
<section id="Installation--Source_DVD">
<title>Source DVD
</title>
-<para>The sources are available via
+<para>
+FIXME: the source DVD download URL currently doesn't work
+</para>
+<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-source-DVD.iso">debian-edu-7.1+edu0-source-DVD.iso</ulink>
@@ -472,8 +472,8 @@ FIXME: only the CD download links work currently - the DVD and source DVD downlo
</section>
</section>
-<section id="Installation--Request_a_CD.2BAC8DVD_by_mail">
-<title>Request a CD/DVD by mail
+<section id="Installation--Request_a_CD_.2BAC8_DVD_by_mail">
+<title>Request a CD / DVD by mail
</title>
<para>For those without a fast Internet connection, we can offer a CD or DVD sent for the cost of the CD or DVD and shipping. Just send an email to <ulink url="mailto:cd at skolelinux.no">cd at skolelinux.no</ulink> and we will discuss the payment details (for shipping and media) <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:)</phrase></textobject></inlinemediaobject> Remember to include the address you want the CD or DVD to be sent to in the email.
</para>
@@ -544,16 +544,16 @@ FIXME: only the CD download links work currently - the DVD and source DVD downlo
</para>
<itemizedlist>
<listitem>
-<para>The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines.
+<para>The multi-architecture USB flash drive / Blue-ray disc image defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines.
</para></listitem>
<listitem>
-<para>If you want to boot the amd64 text mode with the multi-architecture DVD, that would be <computeroutput>amd64-install</computeroutput>.
+<para>If you want to boot the amd64 text mode with the multi-architecture image, that would be <computeroutput>amd64-install</computeroutput>.
</para></listitem>
<listitem>
<para>Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to get the GUI version on amd64.
</para></listitem>
<listitem>
-<para>If you want to boot the i386 mode with the multi-arch DVD on an amd64 machine you need to manually select <computeroutput>install</computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> (graphical mode).
+<para>If you want to boot the i386 mode with the multi-arch image on an amd64 machine you need to manually select <computeroutput>install</computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> (graphical mode).
</para></listitem>
<listitem>
<para>You can use an existing HTTP proxy service on the network to speed up the installation of the main server profile from CD. Add <computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot parameter.
@@ -563,8 +563,8 @@ FIXME: only the CD download links work currently - the DVD and source DVD downlo
</para></listitem></itemizedlist>
</section>
-<section id="Installation--Boot_parameters_available_when_installing_from_CD.2C_not_when_installing_from_DVD">
-<title>Boot parameters available when installing from CD, not when installing from DVD
+<section id="Installation--Boot_parameters_available_when_installing_from_the_netinstall_CD_image.2C_not_when_installing_from_the_multi-arch_image">
+<title>Boot parameters available when installing from the netinstall CD image, not when installing from the multi-arch image
</title>
<itemizedlist>
<listitem>
@@ -669,14 +669,14 @@ FIXME: only the CD download links work currently - the DVD and source DVD downlo
</para>
</section>
-<section id="Installation--A_note_on_DVD_installs">
-<title>A note on DVD installs
+<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blue-ray_disc_image_installs">
+<title>A note on multi-arch USB flash drive / Blue-ray disc image installs
</title>
-<para>After you install from a DVD, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from the DVD. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed:
+<para>After you install from the multi-arch USB flash drive / Blue-ray disc image, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from that image. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed:
</para><screen><![CDATA[deb http://ftp.debian.org/debian/ wheezy main
deb http://security.debian.org/ wheezy/updates main
deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
-<para>The DVD only works with KDE desktop installations. If you want to install other desktop options, use the netinst images or PXE installation.
+<para>This image only works for KDE desktop installations. If you want to install other desktop options, use the netinst images or PXE installation.
</para>
</section>
@@ -701,14 +701,14 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
</section>
</section>
-<section id="Installation--Installation_using_USB_sticks_instead_of_CD.2BAC8DVDs">
-<title>Installation using USB sticks instead of CD/DVDs
+<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blue-ray_discs">
+<title>Installation using USB flash drives instead of CD / Blue-ray discs
</title>
-<para>Since the Squeeze release it is possible to directly copy the CD/DVD <computeroutput>.iso</computeroutput> images to a USB stick and boot from them. Simply execute a command like this, just adapting the file and device names to your needs:
+<para>Since the Squeeze release it is possible to directly copy the CD/DVD/BD <computeroutput>.iso</computeroutput> images to a USB flash drive (also known as "USB sticks") and boot from them. Simply execute a command like this, just adapting the file and device names to your needs:
</para>
<para><computeroutput>sudo dd if=debian-edu-amd64-i386-XXX.iso of=/dev/sdX bs=1024</computeroutput>
</para>
-<para>Depending on which image you choose, the USB stick will behave just like a CD or DVD.
+<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blue-ray disc.
</para>
</section>
@@ -748,10 +748,10 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
</section>
</section>
-<section id="Installation--Custom_CD.2BAC8DVDs">
-<title>Custom CD/DVDs
+<section id="Installation--Custom_images">
+<title>Custom images
</title>
-<para>Creating custom CDs or DVDs can be quite easy since we use the <ulink url="http://wiki.debian.org/DebianInstaller/">debian installer</ulink>, which has a modular design and other nice features. <ulink url="http://wiki.debian.org/DebianInstaller/Preseed">Preseeding</ulink> allows you to define answers to the questions normally asked.
+<para>Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use the <ulink url="http://wiki.debian.org/DebianInstaller/">debian installer</ulink>, which has a modular design and other nice features. <ulink url="http://wiki.debian.org/DebianInstaller/Preseed">Preseeding</ulink> allows you to define answers to the questions normally asked.
</para>
<para>So all you need to do is to create a preseeding file with your answers (this is described in the appendix of the debian installer manual) and <ulink url="http://wiki.debian.org/DebianInstaller/Modify/CD">remaster the CD/DVD</ulink>.
</para>
@@ -1084,9 +1084,7 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
</para>
<para>To assign a host with the MAC address 52:54:00:12:34:10 a static IP address in GOsa² you have to enter the MAC address, the hostname and the IP; alternatively you might click the <computeroutput>Propose ip</computeroutput> button which will show the first free fixed address in 10.0.0.0/8, most probably something like 10.0.0.2 if you add the first machine this way. It may be better to first think about your network: For example you could use 10.0.0.x with x>10 and x<50 for servers, and x>100 for workstations. Don't forget to activate the just added system. With the exception of the main server all systems will then have a matching icon.
</para>
-<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suite your network.
-</para>
-<para>The following screenshots show how this looks in practice:
+<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suite your network: Rename each new system, activate DHCP and DNS, add it to netgroups, if needed; reboot the system afterwards. The following screenshots show how this looks in practice:
</para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations
info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.
@@ -1603,12 +1601,12 @@ apt-get update]]></screen>
</para>
</section>
-<section id="Administration--Upgrading_with_a_CD_or_DVD_ROM">
-<title>Upgrading with a CD or DVD ROM
+<section id="Administration--Upgrading_with_a_CD_or_similar_image">
+<title>Upgrading with a CD or similar image
</title>
<para>If you want to upgrade from one version to another (for example from Wheezy 7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only physical media, follow these steps:
</para>
-<para>Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:
+<para>Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the apt-cdrom command:
</para><screen><![CDATA[mount /media/cdrom
apt-cdrom add -m]]></screen>
<para>To quote the apt-cdrom(8) man page:
@@ -1673,13 +1671,13 @@ apt-get upgrade]]></screen>
<section id="Administration--Easy_access_to_USB_drives_and_CDROMs.2BAC8DVDs">
<title>Easy access to USB drives and CDROMs/DVDs
</title>
-<para>When users insert a USB drive or DVD/CDROM into a (diskless) workstation, a popup window appears asking what to do with it, just like in any other normal installation.
+<para>When users insert a USB drive or a DVD / CDROM into a (diskless) workstation, a popup window appears asking what to do with it, just like in any other normal installation.
</para>
-<para>When users insert a USB drive or DVD/CDROM into a thin client there is only a notify-window showing up for a few seconds. The media is automatically mounted and it is possible to access it browsing to the /media/$user folder. This is quite difficult for many non experienced users.
+<para>When users insert a USB drive or a DVD / CDROM into a thin client there is only a notify-window showing up for a few seconds. The media is automatically mounted and it is possible to access it browsing to the /media/$user folder. This is quite difficult for many non experienced users.
</para>
<para>It is possible to have the default KDE file manager Dolphin showing up if KDE (or LDXE, if installed in parallel to KDE) is in use as desktop environment. To configure this, simply execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal server. (When using Gnome, device icons will be placed on the desktop allowing easy access).
</para>
-<para>In addition the following script could be used to create the symlink "media" for all users in their home folder for easy access to USB drives, CDROM/DVD or whatever media is connected to the thin client. This might come in handy if users want to edit files directly on their plugged in media.
+<para>In addition the following script could be used to create the symlink "media" for all users in their home folder for easy access to USB drives, CDROM / DVD or whatever media is connected to the thin client. This might come in handy if users want to edit files directly on their plugged in media.
</para><screen><![CDATA[ #!/bin/bash
home_path="/skole/tjener/home0"
shared_folder="media"
@@ -2767,7 +2765,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
<section id="Users--Obtaining_a_Kerberos_ticket_to_read_email_on_diskless_workstations">
<title>Obtaining a Kerberos ticket to read email on diskless workstations
</title>
-<para>If working on a diskless client, you don't have a Kerberos TGT by default. To get one, open up a terminal and execute <computeroutput>kinit</computeroutput>. Enter your password and the ticket will be granted.
+<para>If working on a diskless workstation, you don't have a Kerberos TGT by default. To get one, click the credentials button in the system tray. Enter your password and the ticket will be granted.
</para>
</section>
</section>
@@ -2933,6 +2931,9 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
<itemizedlist>
<listitem>
<para>New version of debian-installer from Debian Wheezy, see <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink> for more details.
+</para></listitem>
+<listitem>
+<para>The DVD image was dropped, instead we added a USB flash drive / Blue-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD.
</para></listitem></itemizedlist>
</section>
@@ -3449,7 +3450,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
<para>Since root logins are no longer allowed when using gdm/kdm, a user in LDAP is set up during installation of the Main Server. This user is up as GOsa² administrator and is also granted sudo access. The Debian Edu menu reordering has been enabled as well, by adding the user also to the <computeroutput>teachers</computeroutput> group.
</para></listitem>
<listitem>
-<para>The <computeroutput>.iso</computeroutput> images can directly be copied onto USB sticks, for example by using <computeroutput>dd</computeroutput> or even <computeroutput>cat</computeroutput>..
+<para>The <computeroutput>.iso</computeroutput> images can directly be copied onto USB flash drives, for example by using <computeroutput>dd</computeroutput> or even <computeroutput>cat</computeroutput>..
</para></listitem>
<listitem>
<para>New roaming workstation profile for laptops.
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index 58ca398..2c4fc45 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -1,6 +1,6 @@
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
-FIXME: only the CD download links work currently - the DVD and source DVD download URLs currently don't work, the usbstick image is not mentioned at all.
+FIXME: the source DVD download URL currently doesn't work
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/NetworkClients
FIXME: it would be even better to first/also explain user groups for Windows with GOsa² (and then show an example for the command line)
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 26d4ddd..0feece5 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index b4df9d9..cf263d4 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index 01968b3..d4a3b56 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 1d16a31..7d4f49a 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 9c59264..06ab117 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 17:14+0300\n"
+"POT-Creation-Date: 2013-07-09 20:37+0300\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"
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