Package: release.debian.org Severity: normal Tags: jessie User: release.debian.org@packages.debian.org Usertags: pu Hi, please accept debian-edu-doc/1.6~20160910+deb8u2 into jessie-pu, which I'm uploading atm as it only contains documentation updates plus an updated package description in debian/control and updated debian/copyright (included, because it's updated by scripts…) +debian-edu-doc (1.6~20160910+deb8u2) jessie; urgency=medium + + [ Holger Levsen ] + * Update Debian Edu Jessie and Wheezy manuals from the wiki. + * Update debian/copyright from the wiki using the update-copyright + target. + * Update package descriptions for debian-edu-doc-(nl|nb) to reflect the + contents shipped in those packages. + + [ Jessie Manual translation updates ] + * German: Wolfgang Schweer. + * Dutch: Frans Spiesschaert. + * Norwegian Bokmål: Ingrid Yrvin and Ole-Erik Yrvin. + + [ Wheezy Manual translation updates ] + * German: Wolfgang Schweer. + * Norwegian Bokmål: Ingrid Yrvin and Ole-Erik Yrvin. + * Dutch: Frans Spiesschaert. + + -- Holger Levsen <holger@debian.org> Sat, 10 Sep 2016 12:27:08 +0200 $ debdiff debian-edu-doc_1.6~20160528+deb8u1.dsc debian-edu-doc_1.6~20160910+deb8u2.dsc|diffstat /tmp/Qy0zi3vQFN/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/images/de/worldmap.png |binary /tmp/Qy0zi3vQFN/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/images/es/worldmap.png |binary /tmp/Qy0zi3vQFN/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/images/fr/worldmap.png |binary /tmp/Qy0zi3vQFN/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/images/worldmap.png |binary /tmp/Qy0zi3vQFN/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/images/de/worldmap.png |binary /tmp/Qy0zi3vQFN/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/images/es/worldmap.png |binary /tmp/Qy0zi3vQFN/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/images/fr/worldmap.png |binary /tmp/Qy0zi3vQFN/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/images/worldmap.png |binary debian-edu-doc-1.6~20160910+deb8u2/debian/changelog | 21 debian-edu-doc-1.6~20160910+deb8u2/debian/control | 7 debian-edu-doc-1.6~20160910+deb8u2/debian/copyright | 12 debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po | 164 ++++-- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po | 132 ++--- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po | 115 ++-- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po | 169 ++++-- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po | 177 +++++-- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po | 243 +++++----- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po | 159 +++--- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot | 71 +- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml | 53 +- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po | 76 ++- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po | 82 +-- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po | 69 +- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po | 72 ++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po | 92 ++- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po | 150 +++--- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po | 98 ++-- debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot | 40 - debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml | 34 - 29 files changed, 1203 insertions(+), 833 deletions(-) The debdiff is also attached… Thanks for your work on Jessie point releases! -- cheers, Holger
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/debian/changelog debian-edu-doc-1.6~20160910+deb8u2/debian/changelog
--- debian-edu-doc-1.6~20160528+deb8u1/debian/changelog 2016-05-28 17:44:22.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/debian/changelog 2016-09-10 12:29:10.000000000 +0200
@@ -1,3 +1,24 @@
+debian-edu-doc (1.6~20160910+deb8u2) jessie; urgency=medium
+
+ [ Holger Levsen ]
+ * Update Debian Edu Jessie and Wheezy manuals from the wiki.
+ * Update debian/copyright from the wiki using the update-copyright
+ target.
+ * Update package descriptions for debian-edu-doc-(nl|nb) to reflect the
+ contents shipped in those packages.
+
+ [ Jessie Manual translation updates ]
+ * German: Wolfgang Schweer.
+ * Dutch: Frans Spiesschaert.
+ * Norwegian Bokmål: Ingrid Yrvin and Ole-Erik Yrvin.
+
+ [ Wheezy Manual translation updates ]
+ * German: Wolfgang Schweer.
+ * Norwegian Bokmål: Ingrid Yrvin and Ole-Erik Yrvin.
+ * Dutch: Frans Spiesschaert.
+
+ -- Holger Levsen <holger@debian.org> Sat, 10 Sep 2016 12:27:08 +0200
+
debian-edu-doc (1.6~20160528+deb8u1) jessie; urgency=medium
[ Holger Levsen ]
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/debian/control debian-edu-doc-1.6~20160910+deb8u2/debian/control
--- debian-edu-doc-1.6~20160528+deb8u1/debian/control 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/debian/control 2016-09-10 12:29:10.000000000 +0200
@@ -54,8 +54,9 @@
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
Description: Dutch documentation from the Debian Edu project
- The Dutch version of the manual for the Wheezy based release of
- the Debian Edu / Skolelinux project is included in this package.
+ The Dutch version of the manual for the Wheezy and Jessie based release of
+ the Debian Edu / Skolelinux project is included in this package, as well as
+ the Rosegarden and Audacity manuals.
.
Debian Edu is a Debian project to make the best distribution for educational
purposes. Skolelinux is the name of the Custom Debian Distribution which is
@@ -90,7 +91,7 @@
Description: Bokmål documentation from the Debian Edu project
The Bokmål version of the manual for the Wheezy and Jessie based release of
the Debian Edu / Skolelinux project is included in this package, as well as
- the Rosegarden manual.
+ the Rosegarden and Audacity manuals.
.
Debian Edu is a Debian project to make the best distribution for educational
purposes. Skolelinux is the name of the Custom Debian Distribution which is
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/debian/copyright debian-edu-doc-1.6~20160910+deb8u2/debian/copyright
--- debian-edu-doc-1.6~20160528+deb8u1/debian/copyright 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/debian/copyright 2016-09-10 12:29:10.000000000 +0200
@@ -113,7 +113,7 @@
2010 Ole-Anders Andreassen
2010 Jan Roar Rød
2014 Ole-Erik Yrvin
- 2014, 2015 Ingrid Yrvin
+ 2014, 2015, 2016 Ingrid Yrvin
2014 Hans Arthur Kielland Aanesen
2014 Knut Yrvin
2014 FourFire Le'bard
@@ -133,18 +133,18 @@
2009 Franziska Teichert
2009 Philipp Hübner
2009, 2010 Andreas Mundt
- 2012, 2013, 2014, 2015 Wolfgang Schweer
+ 2012, 2013, 2014, 2015, 2016 Wolfgang Schweer
License: GPL-2+
Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
-Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Claudio Carboncini
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Claudio Carboncini
2013, 2014 Beatrice Torracca
License: GPL-2+
Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
Copyright: 2008 Christophe Masson
2010 Olivier Vitrat
- 2012, 2013, 2014, 2015 Cédric Boutillier
+ 2012, 2013, 2014, 2015, 2016 Cédric Boutillier
2012 Jean-Paul Guilloneau
2012 David Prévot
2012 Thomas Vincent
@@ -152,11 +152,11 @@
License: GPL-2+
Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
-Copyright: 2012, 2013, 2014, 2015 Joe Hansen
+Copyright: 2012, 2013, 2014, 2015, 2016 Joe Hansen
License: GPL-2+
Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
-Copyright: 2014, 2015 Frans Spiesschaert
+Copyright: 2014, 2015, 2016 Frans Spiesschaert
License: GPL-2+
Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po 2016-05-27 15:35:32.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po 2016-09-10 12:26:05.000000000 +0200
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-09-02 15:15+0200\n"
"PO-Revision-Date: 2016-05-25 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -83,10 +83,10 @@
"to be used. Only users and machines need to be added via GOsa², a "
"comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
"PXE has also been prepared, 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 traditional thin-clients."
+"from CD, Blu-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 traditional 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 "
@@ -1417,12 +1417,18 @@
"edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr "USB-drev/blue-ray-disk ISO-aftryk for i386 og amd64"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Please note that internet access "
+#| "during installation is needed. Like the others it can be downloaded over "
+#| "FTP, HTTP or rsync via:"
msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
"during installation is needed. Like the others it can be downloaded over "
"FTP, HTTP or rsync via:"
@@ -1461,9 +1467,14 @@
msgstr "Kilder"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Sources are available from the Debian archive, see <ulink url=\"http://";
+#| "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+#| "options."
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://";
-"cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
"Kilder er tilgængelige fra Debianarkivet, se <ulink url=\"http://cdimage.";
@@ -1723,11 +1734,11 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
-"USB-drevet for flere arktitekturer / Blue-ray-diskaftrykket har som standard "
+"USB-drevet for flere arktitekturer / Blu-ray-diskaftrykket 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>
@@ -2084,13 +2095,13 @@
"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 multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
"En kort bemærkning om USB-drev for flere arkitekturer / blue-ray-aftryk"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 "
@@ -2106,12 +2117,10 @@
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
msgstr ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on CD installs"
@@ -2188,7 +2197,7 @@
"gøres som standard."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr "Installation med brug af USB-drev i stedet for cd'er/blue-ray-diske"
#. type: Content of: <article><section><section><section><para>
@@ -2214,7 +2223,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"Afhængig af hvilket aftryk du vælger, så vil USB-drevet opføre sig på samme "
"måde som en cd eller blue-ray."
@@ -2394,7 +2403,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 "
@@ -2745,8 +2754,8 @@
"\"https://bugs.debian.org/791562#\";>791562</ulink>."
msgstr ""
"Kør <computeroutput>sudo debian-edu-nscd-netgroup-cache disable</"
-"computeroutput> i en terminal for at omgå en Debianfejl <ulink url="
-"\"https://bugs.debian.org/791562#\";>791562</ulink>."
+"computeroutput> i en terminal for at omgå en Debianfejl <ulink url=\"https://";
+"bugs.debian.org/791562#\">791562</ulink>."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -5411,7 +5420,7 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
"Indsæt cd/dvd/blue-ray/USB-drev, monter den og brug kommandoen apt-cdrom:"
@@ -6549,14 +6558,25 @@
msgstr "For at bruge www.deb-multimedia.org så udfør følgende:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -7688,9 +7708,16 @@
"netværket, sammen med alt andet."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note: Since such ten-year-old thin clients may also have trouble running "
+#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+#| "issues, you may consider running thin clients with at least 128 MB RAM, "
+#| "or upgrade the hardware, which will also give you the benefit of being "
+#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -7996,12 +8023,22 @@
"Kerberos i Wheezy også blev konfigureret for Samba!"
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+#, fuzzy
+#| msgid ""
+#| "You should hopefully find an example smb.conf in your preferred language "
+#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
+#| "debian-edu-config/examples/</computeroutput>. The source file is in "
+#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
+#| "computeroutput>; look for a file with the appropriate code in the "
+#| "filename (the German translation, for example, will be named "
+#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
+#| "the config file are a lot of explanations which you should have a look at."
+msgid ""
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -10011,11 +10048,20 @@
"version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+#| "2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+#| "Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid "
+#| "Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
+#| "(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and "
+#| "Ragnar Wisløff (2014) and is released under the GPL v2 or any later "
+#| "version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"(2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
"(2014) and is released under the GPL v2 or any later version."
msgstr ""
@@ -10027,13 +10073,22 @@
"Wisløff (2014) og er udgivet under GPL version 2 eller enhver senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
+#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
+#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
+#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
+#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
+#| "Wolfgang Schweer (2012, 2013, 2014, 2015) and is released under the GPL "
+#| "v2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
-"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"(2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later "
"version."
msgstr ""
"Den tyske oversættelse er underlagt ophavsretten af Holger Levsen (2007), "
@@ -10045,19 +10100,31 @@
"eller enhver senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
+"2014) and is released under the GPL v2 or any later version."
msgstr ""
"Den italiensk oversættelse Claudio Carboncini (2007, 2008, 2009, 2010, 2011, "
"2012, 2013, 2014, 2015) og Beatrice Torracca (2013, 2014) og er udgivet "
"under GPL version 2 eller en senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-"
+#| "Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and "
+#| "the French l10n team (2009, 2010, 2012) and is released under the GPL v2 "
+#| "or any later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
"version."
@@ -10069,17 +10136,25 @@
"eller enhver senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013, "
"2014, 2015) og er udgivet under GPL version 2 eller enhver senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
+#| "and is released under the GPL v2 or any later version."
msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
-"is released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"Den hollandske oversættelse er underlagt ophavsretten af Frans Spiesschaert "
"(2014, 2015) og er udgivet under GPL version 2 eller enhver senere version."
@@ -11089,10 +11164,10 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
-"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blue-ray-"
+"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blu-ray-"
"diskaftryk, som opfører sig som dvd-aftrykket, men er for stort til at kunne "
"være på en dvd."
@@ -12545,4 +12620,3 @@
msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
-
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po 2016-09-10 12:26:05.000000000 +0200
@@ -1,8 +1,8 @@
# translation of debian-edu-jessie-manual.pot to german
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Holger Levsen and others
+# Copyright (C) 2007- 2016 Holger Levsen and others
# Source URL: http://wiki.debian.org/DebianEdu/Documentation/Jessie/
#
-# Wolfgang Schweer <wschweer@arcor.de>, 2012-2015.
+# Wolfgang Schweer <wschweer@arcor.de>, 2012-2016.
# Andreas B. Mundt <andi.mundt@web.de>, 2009, 2010.
# Holger Levsen <holger@layer-acht.org>, 2007.
# RalfGesellensetter <ralf@skolelinux.de>, 2007, 2009.
@@ -16,8 +16,8 @@
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 13:05+0200\n"
-"PO-Revision-Date: 2016-05-23 13:50+0200\n"
+"POT-Creation-Date: 2016-09-02 15:15+0200\n"
+"PO-Revision-Date: 2016-08-14 10:00+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer@arcor.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
@@ -26,7 +26,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.7.6\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -94,10 +94,10 @@
"to be used. Only users and machines need to be added via GOsa², a "
"comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
"PXE has also been prepared, 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 traditional thin-clients."
+"from CD, Blu-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 traditional thin-clients."
msgstr ""
"Unmittelbar nach der Installation eines Schulservers stehen alle für ein "
"Schulnetzwerk notwendigen Dienste zur Verfügung (siehe Details dazu im "
@@ -107,7 +107,7 @@
"werden, was mit der komfortablen Weboberfläche von GOsa² oder einem anderen "
"LDAP-Editor erfolgen kann. Eine Umgebung für das Booten über das Netzwerk "
"mittels PXE wurde ebenfalls vorbereitet; damit können nach der anfänglichen "
-"Installation des Hauptservers von CD, Blue-ray Disc oder USB-Stick alle "
+"Installation des Hauptservers von CD, Blu-ray Disc oder USB-Stick alle "
"anderen Rechner über das Netz installiert werden - eingeschlossen mobile "
"Arbeitsplatzrechner (also solche, die ausserhalb des Netzwerks benutzt "
"werden können wie Laptops und Netbooks). Auch das Booten mittels PXE für "
@@ -1471,18 +1471,18 @@
"edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "USB-Stick / Blue-ray Disc ISO-Image für i386 und amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "USB-Stick / Blu-ray Disc ISO-Image für i386 und amd64"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
"during installation is needed. Like the others it can be downloaded over "
"FTP, HTTP or rsync via:"
msgstr ""
"Das für i386- und amd64-Prozessorarchitektur geeignete Multi-Arch-ISO-Image "
-"ist 5,2 GiB groß. Bitte beachten Sie, das während der Installation eine "
+"ist etwa 5 GiB groß. Bitte beachten Sie, das während der Installation eine "
"Internetverbindung erforderlich ist. Es kann folgendermaßen mittels FTP, "
"HTTP oder rsync heruntergeladen werden:"
@@ -1517,11 +1517,11 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://";
-"cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
"Quellen können aus dem Debian-Archiv bezogen werden; für einige Download-"
-"Optionen siehe <ulink url=\"http://cdimage.debian.org/debian-cd/8.4.0/source/";
+"Optionen siehe <ulink url=\"http://cdimage.debian.org/debian-cd/8.5.0/source/";
"iso-dvd/\"/>."
#. type: Content of: <article><section><section><title>
@@ -1778,11 +1778,11 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
-"Das Multiarch-USB-Stick / Blue-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
+"Das Multiarch-USB-Stick / Blu-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
"voreingestellt »amd64-installgui« und auf x86-32-Bit-Rechnern »installgui« "
"aus."
@@ -2151,20 +2151,20 @@
"neuen Passwort angemeldet haben.)"
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
-"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blue-ray "
+"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blu-ray "
"Disc«"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 einem Multi-Arch-USB-Stick / Blue-ray-Disc-Image installieren, "
+"Wenn Sie von einem Multi-Arch-USB-Stick / Blu-ray-Disc-Image installieren, "
"enthält die Datei <computeroutput>/etc/apt/sources.list</computeroutput> nur "
"Quellen von der DVD. Wenn Sie eine Internetverbindung haben, wird dringend "
"empfohlen, die folgenden Zeilen zu der Datei hinzuzufügen. Damit stellen Sie "
@@ -2174,12 +2174,10 @@
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
msgstr ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on CD installs"
@@ -2256,8 +2254,8 @@
"voreingestellt durchgeführt."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installation per USB-Stick anstelle von CD / Blue-ray Disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installation per USB-Stick anstelle von CD / Blu-ray Disc"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2282,9 +2280,9 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
-"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blue-ray "
+"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blu-ray "
"Disc verhalten."
#. type: Content of: <article><section><section><section><title>
@@ -2464,13 +2462,13 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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, DVDs oder Blue-ray Discs zu erstellen ist recht einfach, da "
+"Angepasste CDs, DVDs oder Blu-ray Discs zu erstellen ist recht einfach, da "
"der <ulink url=\"http://wiki.debian.org/DebianInstaller/\";>Debian-Installer</"
"ulink> verwendet wird, der ein modulares Design und andere schöne "
"Eigenschaften hat. Mit dem sogenannten <ulink url=\"http://wiki.debian.org/";
@@ -5557,10 +5555,10 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
-" Legen Sie die CD / DVD / Blue-ray Disc ein oder stecken Sie den USB-Stick "
+" Legen Sie die CD / DVD / Blu-ray Disc ein oder stecken Sie den USB-Stick "
"ein, hängen Sie das Medium ein und benutzen Sie das Kommando apt-cdrom:"
#. type: CDATA
@@ -6739,9 +6737,9 @@
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6752,7 +6750,7 @@
"# Den Debian-Multimedia-Key ungesichert holen:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
"# Gesichert die Korrektheit des Keys prüfen und diesen gegebenenfalls dem APT-Keyring hinzufügen:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# Das Depot der Datei sources.list hinzufügen - bitte die Homepages wegen Spiegelservern konsultieren!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# Die List der verfügbaren Pakete aktualisieren:\n"
@@ -7900,7 +7898,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -8218,23 +8216,23 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
msgstr ""
"Nach der Installation sollte eine beispielhafte Datei smb.conf in der "
"vorzugsweise verwendeten Sprache auf tjener im Verzeichnis <computeroutput>/"
-"usr/share/debian-edu-config/examples/</computeroutput> zu finden sein. Die "
-"Quelldatei ist in Englisch und heißt <computeroutput>smb-roaming-profiles-en."
-"conf</computeroutput>. Falls sie zum Beispiel ins Deutsche übersetzt wurde, "
-"heißt sie <computeroutput>smb-roaming-profiles-de.conf</computeroutput>. "
-"Innerhalb der Konfigurationsdatei sind eine Menge Erklärungen vorhanden, die "
-"Sie sich ansehen sollten."
+"usr/share/doc/debian-edu-config/examples/</computeroutput> zu finden sein. "
+"Die Quelldatei ist in Englisch und heißt <computeroutput>smb-roaming-"
+"profiles-en.conf</computeroutput>. Falls sie zum Beispiel ins Deutsche "
+"übersetzt wurde, heißt sie <computeroutput>smb-roaming-profiles-de.conf</"
+"computeroutput>. Innerhalb der Konfigurationsdatei sind eine Menge "
+"Erklärungen vorhanden, die Sie sich ansehen sollten."
#. type: Content of: <article><section><section><section><section><title>
msgid "Machine policies for roaming profiles"
@@ -10300,14 +10298,14 @@
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"(2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
"(2014) and is released under the GPL v2 or any later version."
msgstr ""
"Das Copyright der norwegischen Bokmål-Übersetzung liegt bei Petter "
"Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore "
"Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik "
-"Yrvin (2014), Ingrid Yrvin (2014, 2015), Hans Arthur Kielland Aanesen "
+"Yrvin (2014), Ingrid Yrvin (2014, 2015, 2016), Hans Arthur Kielland Aanesen "
"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
"Lauridsen (2014) und Ragnar Wisløff (2014). Sie ist unter der GPL v2 oder "
"einer späteren Version lizenziert."
@@ -10319,7 +10317,7 @@
"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
-"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"(2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later "
"version."
msgstr ""
"Die deutsche Übersetzung wurde erstellt und ist Copyright von Holger Levsen "
@@ -10327,49 +10325,49 @@
"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
"Sicking (2008), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert "
"(2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) und Wolfgang "
-"Schweer (2012, 2013, 2014, 2015). Sie ist unter der GPL v2 oder einer "
+"Schweer (2012, 2013, 2014, 2015, 2016). Sie ist unter der GPL v2 oder einer "
"späteren Version lizenziert."
#. type: Content of: <article><section><para>
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
+"2014) and is released under the GPL v2 or any later version."
msgstr ""
"Die italienische Übersetzung wurde erstellt und ist Copyright von Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) und "
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) und "
"Beatrice Torracca (2013, 2014). Sie ist unter der GPL v2 oder einer späteren "
"Version lizenziert."
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
"version."
msgstr ""
"Die französische Übersetzung wurde von Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) und dem "
"französischen l10n-Team (2009, 2010, 2012) verfasst und ist unter der GPL v2 "
"oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013, 2014, "
-"2015) und ist unter der GPL v2 oder einer späteren Version lizenziert."
+"2015, 2016) und ist unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
-"is released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"Die niederländische Übersetzung wurde verfasst von Frans Spiesschaert (2014, "
-"2015) und ist unter der GPL v2 oder einer späteren Version lizenziert."
+"2015, 2016) und ist unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><title>
msgid "Translations of this document"
@@ -11383,11 +11381,11 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
"Das DVD-Image gibt es nicht mehr, stattdessen haben wir nun ein USB-Stick / "
-"Blue-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
+"Blu-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
"ist, um auf eine DVD zu passen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po 2016-09-10 12:26:05.000000000 +0200
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 13:05+0200\n"
+"POT-Creation-Date: 2016-09-02 15:15+0200\n"
"PO-Revision-Date: 2015-03-30 22:30+0000\n"
"Last-Translator: Rafael Ernesto Rivas <tatotat@gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -93,7 +93,7 @@
#| "\"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 "
+#| "PXE, so after initial installation of the main server from CD, Blu-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 "
@@ -105,10 +105,10 @@
"to be used. Only users and machines need to be added via GOsa², a "
"comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
"PXE has also been prepared, 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 traditional thin-clients."
+"from CD, Blu-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 traditional 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 "
@@ -117,7 +117,7 @@
"para agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
"cómoda, o cualquier otro editor de LDAP. Un ambiente de carga por red es "
"preparado usando PXE, así, después de la instalación inicial del servidor "
-"principal desde CD, Blue-ray o unidad USB, las otras computadoras pueden ser "
+"principal desde CD, Blu-ray o unidad USB, las otras computadoras pueden ser "
"instaladas a través de la red, esto incluye \"estaciones de trabajo "
"itinerantes\" (pueden ser llevadas fuera de la red escolar, usualmente "
"laptops o netbooks) y carga por PXE para computadoras sin disco duro como "
@@ -1463,13 +1463,19 @@
"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr ""
-"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blue-ray "
+"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blu-ray "
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Please note that internet access "
+#| "during installation is needed. Like the others it can be downloaded over "
+#| "FTP, HTTP or rsync via:"
msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
"during installation is needed. Like the others it can be downloaded over "
"FTP, HTTP or rsync via:"
@@ -1525,7 +1531,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://";
-"cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
@@ -1780,7 +1786,7 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
@@ -2135,18 +2141,18 @@
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
-msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blue-ray"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
+msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blu-ray"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 ""
-"Después de instalar desde una imagen multiarquitectura USB / Blue-ray, "
+"Después de instalar desde una imagen multiarquitectura USB / Blu-ray, "
"<computeroutput>/etc/apt/sources.list</computeroutput> contendrá fuentes de "
"esa imagen. Si tiene conexión a Internet, le sugerimos agregar las "
"siguientes lineas para que las actualizaciones de seguridad disponible se "
@@ -2156,12 +2162,10 @@
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
msgstr ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on CD installs"
@@ -2228,8 +2232,8 @@
"chroot combinado y por eso se hace de forma predeterminada."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Instalación utilizando memorias USB lugar de CD / Blue-ray"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Instalación utilizando memorias USB lugar de CD / Blu-ray"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2255,10 +2259,10 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"Dependiendo de la imágen seleccionada, la unidad USB se comportará como un "
-"CD o Blue-ray."
+"CD o Blu-ray."
#. type: Content of: <article><section><section><section><title>
msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2430,19 +2434,19 @@
#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| 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 "
+#| "Creating custom CDs, DVDs or Blu-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."
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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, DVDs o Blue-rays personalizados es bastante fácil, ya que se "
+"Crear CDs, DVDs o Blu-rays personalizados es bastante fácil, ya que se "
"utilizamos el <ulink url=\"http://wiki.debian.org/DebianInstaller/\";>debian "
"installer</ulink>, el cual es de diseño modular, y posee otras "
"características útiles.La <ulink url=\"http://wiki.debian.org/";
@@ -5070,10 +5074,10 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
-"Inserte el CD/DVD/Disco Blueray/Dispositivo USB en la unidad, montelo y use "
+"Inserte el CD/DVD/Disco Blu-ray/Dispositivo USB en la unidad, montelo y use "
"el comando apt-cdrom:"
#. type: CDATA
@@ -5989,14 +5993,25 @@
msgstr "Para usar www.deb-multimedia.org haga lo siguiente:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6878,7 +6893,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -7112,11 +7127,11 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -8794,7 +8809,7 @@
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"(2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
"(2014) and is released under the GPL v2 or any later version."
msgstr ""
@@ -8806,21 +8821,21 @@
"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
-"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"(2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later "
"version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
+"2014) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
"version."
@@ -8828,14 +8843,14 @@
#. type: Content of: <article><section><para>
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
-"is released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><title>
@@ -9568,8 +9583,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-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><itemizedlist><listitem><para>
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po 2016-05-28 17:17:33.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po 2016-09-10 12:26:05.000000000 +0200
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-09-02 15:15+0200\n"
"PO-Revision-Date: 2016-05-28 17:02+0100\n"
"Last-Translator: Cedric Boutillier <boutil@boutil.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -85,10 +85,10 @@
"to be used. Only users and machines need to be added via GOsa², a "
"comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
"PXE has also been prepared, 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 traditional thin-clients."
+"from CD, Blu-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 traditional 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 "
@@ -1470,13 +1470,19 @@
"edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr ""
"image pour clé USB ou disque Blu-ray pour les architectures i386 et amd64"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Please note that internet access "
+#| "during installation is needed. Like the others it can be downloaded over "
+#| "FTP, HTTP or rsync via:"
msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
"during installation is needed. Like the others it can be downloaded over "
"FTP, HTTP or rsync via:"
@@ -1515,9 +1521,14 @@
msgstr "Sources"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Sources are available from the Debian archive, see <ulink url=\"http://";
+#| "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+#| "options."
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://";
-"cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
"Le code source est disponible depuis l'archive Debian. Consultez <ulink url="
@@ -1782,7 +1793,7 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
@@ -2156,14 +2167,14 @@
"authentifié avec le nouveau mot de passe)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
"Une remarque sur les installations à partir de l'image multiarchitecture "
"pour clé USB et disque Blu-ray"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 "
@@ -2179,12 +2190,10 @@
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
msgstr ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on CD installs"
@@ -2260,7 +2269,7 @@
"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 flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr ""
"Installation depuis une clé USB au lieu d'un CD ou d'un disque Blu-ray."
@@ -2287,7 +2296,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"En fonction de l'image que vous choisissez, la clé USB se comportera "
"exactement comme un CD ou un disque Blu-ray."
@@ -2474,7 +2483,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 "
@@ -2823,10 +2832,6 @@
"passer par cette étape) ;"
#. type: Content of: <article><section><section><orderedlist><listitem><para>
-#| msgid ""
-#| "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
-#| "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://";
-#| "bugs.debian.org/779641#\">779641</ulink>)."
msgid ""
"Run <computeroutput>sudo debian-edu-nscd-netgroup-cache disable</"
"computeroutput> in a terminal as a workaround for Debian bug <ulink url="
@@ -5592,7 +5597,7 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
"Insérez le CD, DVD, disque Blu-ray ou périphérique USB, montez-le et "
@@ -6764,14 +6769,25 @@
"Pour utiliser www.deb-multimedia.org, effectuez les opérations suivantes :"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -7939,9 +7955,16 @@
"réseau, comme tout le reste, d'ailleurs."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note: Since such ten-year-old thin clients may also have trouble running "
+#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+#| "issues, you may consider running thin clients with at least 128 MB RAM, "
+#| "or upgrade the hardware, which will also give you the benefit of being "
+#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -8262,12 +8285,22 @@
"depuis que Kerberos dans Wheezy est aussi configuré pour Samba !"
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+#, fuzzy
+#| msgid ""
+#| "You should hopefully find an example smb.conf in your preferred language "
+#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
+#| "debian-edu-config/examples/</computeroutput>. The source file is in "
+#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
+#| "computeroutput>; look for a file with the appropriate code in the "
+#| "filename (the German translation, for example, will be named "
+#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
+#| "the config file are a lot of explanations which you should have a look at."
+msgid ""
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -10352,11 +10385,20 @@
"ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+#| "2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+#| "Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid "
+#| "Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
+#| "(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and "
+#| "Ragnar Wisløff (2014) and is released under the GPL v2 or any later "
+#| "version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"(2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
"(2014) and is released under the GPL v2 or any later version."
msgstr ""
@@ -10369,13 +10411,22 @@
"toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
+#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
+#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
+#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
+#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
+#| "Wolfgang Schweer (2012, 2013, 2014, 2015) and is released under the GPL "
+#| "v2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
-"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"(2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later "
"version."
msgstr ""
"La traduction allemande, dont les droits d'auteur appartiennent à Holger "
@@ -10387,10 +10438,15 @@
"toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
+"2014) and is released under the GPL v2 or any later version."
msgstr ""
"La traduction italienne, dont les droits d'auteur appartiennent à Claudio "
"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) et "
@@ -10398,9 +10454,16 @@
"ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-"
+#| "Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and "
+#| "the French l10n team (2009, 2010, 2012) and is released under the GPL v2 "
+#| "or any later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
"version."
@@ -10412,18 +10475,26 @@
"distribuée sous GPL v2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
"(2012, 2013, 2014, 2015), est distribuée sous GPL v2 ou toute version "
"ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
+#| "and is released under the GPL v2 or any later version."
msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
-"is released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"La traduction danoise, dont les droits d'auteur appartiennent à Frans "
"Spiesschaert (2014, 2015) est distribuée sous GPL v2 ou toute version "
@@ -11208,9 +11279,6 @@
msgstr "Annexe B — À propos des CD/DVD d'installation autonome Debian Edu"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "Debian Edu Live CD/DVDs for Jessie are not available at the moment, but "
-#| "are being worked on..."
msgid ""
"Debian Edu Live CD/DVDs for Jessie are not available at the moment, but "
"might be added eventually."
@@ -11382,7 +11450,6 @@
msgstr "Problèmes connus avec l'image"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid "There are no jessie images yet"
msgid "There are no images yet"
msgstr "Il n'existe pas encore d'images."
@@ -11399,12 +11466,6 @@
msgstr "Téléchargement"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The image is 1.2 GiB and would be (but currently isn't) available via "
-#| "<ulink url=\"ftp://ftp.skolelinux.org/cd-jessie-live/\";>FTP</ulink>, "
-#| "<ulink url=\"http://ftp.skolelinux.org/cd-jessie-live/\";>HTTP</ulink> or "
-#| "rsync from <computeroutput>ftp.skolelinux.org</computeroutput> under "
-#| "<computeroutput>cd-jessie-live/</computeroutput>."
msgid ""
"The image would be (but currently isn't) available via <ulink url=\"ftp://";
"ftp.skolelinux.org/cd-jessie-live/\">FTP</ulink>, <ulink url=\"http://ftp.";
@@ -11452,8 +11513,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
"L'image DVD a été abandonnée, en faveur d'une image pour clé USB ou disque "
"Blu-ray qui se comporte comme celle-ci mais qui est trop grande pour tenir "
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po 2016-05-28 14:56:23.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po 2016-09-10 12:26:05.000000000 +0200
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-09-02 15:15+0200\n"
"PO-Revision-Date: 2016-05-25 19:22+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini@gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian@list.debian.org>\n"
@@ -83,10 +83,10 @@
"to be used. Only users and machines need to be added via GOsa², a "
"comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
"PXE has also been prepared, 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 traditional thin-clients."
+"from CD, Blu-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 traditional 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 "
@@ -95,7 +95,7 @@
"essere usato. Solo utenti e macchine devono essere aggiunti usando GOsa², "
"una comoda interfaccia Web, o da un qualsiasi altro editor LDAP. Dopo "
"l'installazione principale del server da CD un ambiente di avvio dalla rete "
-"è disponibile utilizzando PXE. disco Blue-ray o penna USB, tutte le altre "
+"è disponibile utilizzando PXE. disco Blu-ray o penna USB, tutte le altre "
"macchine possono essere installate via rete, comprese le \"postazioni mobili "
"(roaming)\" (macchine che possono essere scollegate dalla rete della scuola, "
"generalmente laptop o netbook), nonché l'avvio tramite PXE per macchine "
@@ -1442,12 +1442,18 @@
"edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "Immagine per flash drive USB / Blue-ray disc per i386 e amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "Immagine per flash drive USB / Blu-ray disc per i386 e amd64"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Please note that internet access "
+#| "during installation is needed. Like the others it can be downloaded over "
+#| "FTP, HTTP or rsync via:"
msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
"during installation is needed. Like the others it can be downloaded over "
"FTP, HTTP or rsync via:"
@@ -1486,9 +1492,14 @@
msgstr "Sorgenti:"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Sources are available from the Debian archive, see <ulink url=\"http://";
+#| "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+#| "options."
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://";
-"cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
"I sorgenti sono disponibili negli archivi Debian, consultare <ulink url="
@@ -1755,11 +1766,11 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
-"L'immagine multiarchitettura su flash drive USB / Blue-ray disc usa in modo "
+"L'immagine multiarchitettura su flash drive USB / Blu-ray disc usa in modo "
"predefinito amd64-installgui su macchine x86 a 64-bit e installgui su "
"macchine x86 a 32-bit."
@@ -2125,21 +2136,21 @@
"password)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
-"Una nota sull'installazione multi-architettura da flash drive USB / Blue-ray "
+"Una nota sull'installazione multi-architettura da flash drive USB / Blu-ray "
"disc"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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'immarighegine multi-architettura su flash drive USB / "
-"Blue-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
+"Blu-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
"conterrà come sorgente solo quella immagine. Se si ha un collegamento "
"Internet si raccomanda di aggiungere le seguenti righe al file in modo da "
"avere disponibili e installare gli aggiornamenti di sicurezza:"
@@ -2148,12 +2159,10 @@
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
msgstr ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on CD installs"
@@ -2229,8 +2238,8 @@
"sempre un chroot combinato come da impostazione predefinita. "
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installazione da flash drive USB al posto di CD /Blue-ray disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installazione da flash drive USB al posto di CD /Blu-ray disc"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2255,10 +2264,10 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"A seconda dell'immagine scelta, la penna USB si comporterà esattamente come "
-"un CD o Blue-ray disc."
+"un CD o Blu-ray disc."
#. type: Content of: <article><section><section><section><title>
msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2433,13 +2442,13 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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, DVD o Blue-ray è possibile "
+"Creare una versione personalizzata del CD, DVD o Blu-ray è possibile "
"abbastanza facilmente, usando l'<ulink url=\"http://wiki.debian.org/";
"DebianInstaller/\">installatore Debian</ulink>, che ha un progetto modulare "
"e altre interessanti caratteristiche. L'<ulink url=\"http://wiki.debian.org/";
@@ -5478,10 +5487,10 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
-"Inserire il CD/ DVD / Blue-ray disc / drive flash USB, montarlo e usare il "
+"Inserire il CD/ DVD / Blu-ray disc / drive flash USB, montarlo e usare il "
"comando apt-cdrom:"
#. type: CDATA
@@ -6625,14 +6634,25 @@
msgstr "Se si usa www.deb-multimedia.org occorre eseguire i seguenti comandi:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -7778,9 +7798,16 @@
"informazione."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note: Since such ten-year-old thin clients may also have trouble running "
+#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+#| "issues, you may consider running thin clients with at least 128 MB RAM, "
+#| "or upgrade the hardware, which will also give you the benefit of being "
+#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -8088,12 +8115,22 @@
"in wheezy anche kerberos è stato configurato per samba!"
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+#, fuzzy
+#| msgid ""
+#| "You should hopefully find an example smb.conf in your preferred language "
+#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
+#| "debian-edu-config/examples/</computeroutput>. The source file is in "
+#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
+#| "computeroutput>; look for a file with the appropriate code in the "
+#| "filename (the German translation, for example, will be named "
+#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
+#| "the config file are a lot of explanations which you should have a look at."
+msgid ""
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -10133,11 +10170,20 @@
"2012, 2013) rilasciata sotto licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+#| "2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+#| "Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid "
+#| "Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
+#| "(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and "
+#| "Ragnar Wisløff (2014) and is released under the GPL v2 or any later "
+#| "version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"(2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
"(2014) and is released under the GPL v2 or any later version."
msgstr ""
@@ -10150,13 +10196,22 @@
"successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
+#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
+#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
+#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
+#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
+#| "Wolfgang Schweer (2012, 2013, 2014, 2015) and is released under the GPL "
+#| "v2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
-"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"(2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later "
"version."
msgstr ""
"La traduzione tedesca è protetta da copyright di Holger Levsen (2007), "
@@ -10168,19 +10223,31 @@
"successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
+"2014) and is released under the GPL v2 or any later version."
msgstr ""
"La traduzione italiana è protetta da copyright di Claudio Carboncini (2007, "
"2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) e Beatrice Torracca (2013, "
"2014) rilasciata sotto licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-"
+#| "Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and "
+#| "the French l10n team (2009, 2010, 2012) and is released under the GPL v2 "
+#| "or any later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
"version."
@@ -10192,17 +10259,25 @@
"licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"La traduzione in danese è protetta da copyright da Joe Hansen (2012, 2013, "
"2014, 2015) e rilasciata sotto licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
+#| "and is released under the GPL v2 or any later version."
msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
-"is released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"La traduzione in olandese è protetta da copyright da Frans Spiesschaert "
"(2014, 2015) e rilasciata sotto licenza GPL v2 o successiva."
@@ -10353,8 +10428,8 @@
"translations per trovare informazioni su come creare un nuovo file PO per la "
"lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -11214,8 +11289,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
"L'immagine del DVD è stata abbandonata, invece è stata aggiunta un'immagine "
"per flash drive USB / Blu-ray, che si comporta come l'immagine del DVD, ma "
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po 2016-05-27 15:35:32.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po 2016-09-10 12:26:05.000000000 +0200
@@ -11,7 +11,7 @@
# FourFire Le'bard <FourFire@rocketmail.com>, 2014
# Hans Arthur Kielland Aanesen <hans@eprforum.no>, 2014
# Håvard Korsvoll <korsvoll@gmail.com>, 2007-2009
-# Ingrid Yrvin <iyrvin@hagan.no>, 2014-2016
+# Ingrid Yrvin <ingrid.yrvin@gmail.com>, 2014-2016
# Jan Roar Roed <janroed@gmail.com>, 2010
# Knut Yrvin <knut.yrvin@gmail.com>, 2014
# Ole-Erik Yrvin <oeyrvin@gmail.com>, 2014-2016
@@ -21,8 +21,8 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-24 20:50+0200\n"
-"PO-Revision-Date: 2016-05-24 15:16+0000\n"
+"POT-Creation-Date: 2016-09-02 15:15+0200\n"
+"PO-Revision-Date: 2016-08-05 07:55+0000\n"
"Last-Translator: Ingrid Yrvin <ingrid.yrvin@gmail.com>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/debian-";
"edu-skolelinux/debian-edu-doc/language/nb_NO/)\n"
@@ -96,22 +96,21 @@
"to be used. Only users and machines need to be added via GOsa², a "
"comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
"PXE has also been prepared, 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 traditional thin-clients."
-msgstr ""
-"Alle tjenester som trengs for et skolenettverk blir satt opp rett etter "
-"installasjonen av en skoleserver (se neste kapittel <link linkend="
-"\"Architecture\"> for detaljer om arkitektur og oppsett</link>), og systemet "
-"er klart til bruk. Bare brukere og maskiner må legges til via GOsa², et "
-"komfortabelt Web-brukergrensesnitt, eller med en hvilken som helst annen "
-"LDAP-redigerer. Et oppstartsmiljø som bruker PXE er også forberedt, så etter "
-"første installasjon av hovedserveren fra CD, Blue-ray-plate eller en USB-"
-"minnepenn, kan alle andre maskiner installeres via nettverket, medregnet "
-"mobile arbeidsstasjoner (de som kan være tatt bort fra skolens nettverk, "
-"vanligvis bærbare datamaskiner eller netbrett), samt PXE-oppstart for "
-"diskløse maskiner som tradisjonelle tynnklienter."
+"from CD, Blu-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 traditional thin-clients."
+msgstr ""
+"Rett etter installasjonen vil skoletjeneren være satt opp til å kjøre alle "
+"tjenester som trengs i skolenettverket (se neste kapittel <link linkend="
+"\"Architecture\"> detaljer om arkitekturen i dette oppsettet </link>), klar "
+"for at brukere og maskiner blir lagt til via GOsa², og få et velegnet Web-"
+"brukergrensesnitt, eller bruk andre LDAP-redigeringer. Et nettoppstartmiljø "
+"er utarbeidet med PXE slik at, etter første installasjon av hovedtjener fra "
+"en CD, en Blue-ray-plate, eller et USB-minne, kan alle andre maskiner "
+"installeres via nettverket. Dette gjelder også flyttbare arbeidsstasjoner "
+"(som bærbare datamaskiner eller nettbrett), men også tradisjonelle tynne "
+"klienter som lagringsløse maskiner med PXE-oppstart."
#. type: Content of: <article><section><para>
msgid ""
@@ -1429,20 +1428,20 @@
"edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "USB-minnekort/Blu-ray Disk ISO-bilde for i386 og AMD64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "USB-minnepenn / Blu-ray-plate ISO-bilde for i386 og AMD64"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
"during installation is needed. Like the others it can be downloaded over "
"FTP, HTTP or rsync via:"
msgstr ""
-"Multi-arkitektur ISO-bildet er på 5.2 GiB og kan brukes til installasjon av "
-"forskjellige AMD64- og i386-maskiner. Vær oppmerksom på at Internett-tilgang "
-"under installasjon er nødvendig. I likhet med de andre kan bildet lastes ned "
-"via FTP, HTTP eller rsync via:"
+"Multiarkitektur ISO-bildet er omtrent på 5.2 GiB , og kan brukes til "
+"installasjon på AMD64- og i386-maskiner. Vær oppmerksom på at under "
+"installasjonen er Internett-tilgang nødvendig. I likhet med de andre kan "
+"bildet lastes ned via FTP, HTTP eller rsync via:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1475,12 +1474,12 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://";
-"cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
-"Kildene er tilgjengelig fra Debian-arkivet, se <ulink url=\"http://cdimage.";
-"debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for noen "
-"nedlastningsalternativer."
+"For noen nedlastningsalternativer er ressursene tilgjengelige fra Debian-"
+"arkivet, se <ulink url=\"http://cdimage.debian.org/debian-cd/8.5.0/source/";
+"iso-dvd/\"/>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -1738,12 +1737,12 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
-"USB Fler-arkitektur flash-disk/Blue-ray disk-typer er standard for bruk av "
-"AMD64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
+"Multiarkitektur USB-minnepennen / Blu-ray-platebildet bruker som forvalg "
+"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>
@@ -2096,35 +2095,32 @@
"knyttet din bærbare til nettverket og logget inn med det nye passordet)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
-"En merknad om USB-minnepinne- / Blue-ray-installasjon med flerarkitektur-"
-"diskbilder"
+"En merknad for multi-arch USB-minnpinne-/Blu-ray-platebildeinstallasjoner"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 USB minnepinne, vil <computeroutput>/etc/apt/"
-"sources.list</computeroutput> bare inneholde kilder fra minnepinnen. Hvis du "
-"har en Internett-tilkopling, anbefaler vi på det sterkeste å legge til disse "
-"linjene til denne filen, slik at tilgjengelige (sikkerhets)oppdateringer kan "
-"installeres:"
+"Når du har installert fra multi-arch USB-minnpinne-/Blu-ray-platebilde, vil "
+"<computeroutput>/etc/apt/sources.list</computeroutput> bare inneholde "
+"ressurser fra det bildet. Hvis du har en Internett-tilkobling, anbefaler vi "
+"sterkt å legge til følgende linjer, slik at tilgjengelige "
+"sikkerhetsoppdateringer kan installeres:"
#. type: CDATA
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
msgstr ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on CD installs"
@@ -2200,9 +2196,9 @@
"som standard. "
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr ""
-"Installasjon ved bruk av USB-minnepinne i stedet for CD eller Blue-ray-plate"
+"Installasjon ved bruk av USB-minnepinner i stedet for CD/Blu-ray-plater"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2227,10 +2223,10 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
-"Avhengig av hvilket bilde du velger vil USB-minnepinnen oppføre seg som en "
-"CD eller Blue-ray-disk."
+"Avhengig av hvilket bilde du velger, vil USB-minnepinnen oppføre seg akkurat "
+"som en CD eller Blue-ray-plate."
#. type: Content of: <article><section><section><section><title>
msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2403,18 +2399,18 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 ""
-" Å Opprette tilpassede CD-er, DVD-er eller Blu-ray-plater kan være ganske "
-"lett siden vi bruker <ulink url=\"http://wiki.debian.org/DebianInstaller/";
-"\">Debian Installer</ulink>, som har et modulært design og andre fine "
+"Å lage tilpassede CD-er, DVD-er eller Blu-ray-plater kan være ganske enkelt "
+"siden vi bruker <ulink url=\"http://wiki.debian.org/DebianInstaller/";
+"\">Debian Installer</ulink>, som bygger på moduler og har andre fine "
"funksjoner. <ulink url=\"http://wiki.debian.org/DebianInstaller/Preseed";
-"\">Foregående</ulink> tillater deg å fastlegge svar på de spørsmålene som "
-"vanligvis stilles."
+"\">Preseeding</ulink> tillater deg å gi svar på spørsmålene som vanligvis "
+"stilles."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -5410,11 +5406,11 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
-"Sett inn en CD / DVD / Blu-ray plate / USB-minnepenn, monter den og bruk apt-"
-"cdrom kommandoen."
+"Sett inn CD / DVD / Blu-ray-plate / USB-minnepenn, start den, og bruk apt-"
+"cdrom kommandoen:"
#. type: CDATA
#, no-wrap
@@ -6537,14 +6533,25 @@
"nettarkiv, eller du kan legge til"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -7663,17 +7670,16 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
msgstr ""
-"Merk: Å bruke 10 år gamle tynnklienter kan føre til problemer med å kjøre "
-"nyere versjoner av <ulink url=\"http://wiki.debian.org/OpenOffice#";
-"\">OpenOffice</ulink>.org og Firefox/Iceweasel p.g.a. pixmap "
-"mellomlagringsproblemer. Du bør helst kjøre tynneklienter med minst 128 MB "
-"RAM, eller oppgradere maskinvaren. Dette vil også gi deg fordelen av å kunne "
-"kjøre dem som diskløse arbeidsstasjoner."
+"Merk: Siden slike ti år gamle tynne klienter også kan ha problemer med å "
+"kjøre nyere versjoner av LibreOffice og Firefox/Iceweasel på grunn av pixmap "
+"mellomlagringsproblemer, kan du vurdere å kjøre tynne klienter med minst 128 "
+"MB RAM, eller oppgradere maskinvaren, noe som også vil gi deg fordelen av å "
+"kunne bruke dem som diskløse arbeidsstasjoner."
#. type: Content of: <article><section><section><title>
msgid "Replacing LDM with KDM"
@@ -7969,24 +7975,22 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
msgstr ""
-"Allerede levert med innstallsjonen finner du et eksempel smb.conf i ditt "
-"foretrukne språk. Du kan finne oppsettseksempel i en fil på tjeneren under "
-"<computeroutput>/usr/share/debian- edu-config/examples/</computeroutput>. "
-"Kildefilen er på engelsk, og er kalt <computeroutput>smb-roaming-profiles-en."
-"conf</computeroutput>. Hvis den er oversatt til f.eks. tysk, er den navngitt "
-"<computeroutput>smb-roaming-profiles-de.conf</computeroutput>. Så hvis du "
-"søker etter en fil oversatt til ditt språk, se etter landskoden som er en "
-"del av filnavnet. Inni konfigurasjonsfilen er det mange forklaringer som du "
-"bør se på."
+"Du kan finne et eksempel-smb.conf på ditt foretrukne språk levert fra "
+"installasjonen på tjeneren under <computeroutput>/usr/share/debian-edu-"
+"config/examples/</computeroutput>. Kildefilen er på engelsk, og kalles "
+"<computeroutput>smb-roaming-profiles-en.conf</computeroutput>; se etter en "
+"fil med den riktige koden i filnavnet (den tyske oversettelsen, for "
+"eksempel, vil være navngitt <computeroutput>smb-roaming-profiles-de.conf</"
+"computeroutput>). I config-filen er det mange forklaringer som du må se på."
#. type: Content of: <article><section><section><section><section><title>
msgid "Machine policies for roaming profiles"
@@ -10003,17 +10007,16 @@
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"(2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
"(2014) and is released under the GPL v2 or any later version."
msgstr ""
-"Oversettelsen til norsk bokmål er opphavsrettetbeskyttet av Petter "
-"Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore "
-"Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik "
-"Yrvin (2014), Ingrid Yrvin (2014, 2015), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
-"Lauridsen (2014) og Ragnar Wisløff (2014), og er utgitt under GPL2 eller en "
-"senere versjon. Nyt!"
+"Bokmåloversettelsen er opphavsrettsbeskyttet av Petter Reinholdtsen (2007, "
+"2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-"
+"Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014-2016), "
+"Ingrid Yrvin (2014-2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
+"(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) og Ragnar "
+"Wisløff (2014), og er utgitt under GPL v2 eller en senere versjon."
#. type: Content of: <article><section><para>
msgid ""
@@ -10022,56 +10025,56 @@
"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
-"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"(2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later "
"version."
msgstr ""
-"Den tyske oversettelsen er rettighetsbeskyttet av Holger Levsen (2007), "
+"Den tyske oversettelsen er opphavsrettsbeskyttet av Holger Levsen (2007), "
"Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
"Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
"Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) og "
-"Wolfgang Schweer (2012, 2013, 2014, 2015), og er utgitt under GPL2 eller en "
-"senere versjon. Nyt!"
+"Wolfgang Schweer (2012, 2013, 2014, 2015, 2016), og er utgitt under GPL v2 "
+"eller en senere versjon."
#. type: Content of: <article><section><para>
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
+"2014) and is released under the GPL v2 or any later version."
msgstr ""
-"Opphavsretten til den italienske oversettelsen tilhører Claudio Carboncini "
-"(2007-2015) og Beatrice Torracca (2013-2014), og er gitt ut i henhold til "
-"GPL v2 eller en senere utgave."
+"Den italienske oversettelsen er rettighetsbeskyttet av Claudio Carboncini "
+"(2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) og Beatrice "
+"Torracca (2013, 2014), og er utgitt under GPL v2 eller en senere versjon."
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
"version."
msgstr ""
-"Den franske oversettelsen er rettighetsbeskyttet av Christophe Masson "
-"(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), "
-"Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), og "
-"det franske l10n team (2009, 2010, 2012), og er utgitt under GPL2 eller en "
-"senere versjon. Nyt!"
+"Den franske oversettelsen er rettighetsbeskyttet av Christophe Masson "
+"(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, "
+"2016), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent "
+"(2012) og the French l10n team (2009, 2010, 2012), og er utgitt under GPL v2 "
+"eller en senere versjon."
#. type: Content of: <article><section><para>
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
-"Opphavsretten til den danske oversettelsen tilhører Joe Hansen (2012, 2013, "
-"2014, 2015) og er gitt ut i henhold til GPL v2 eller en senere utgave."
+"Den danske oversettelsen er rettighetsbeskyttet av Joe Hansen (2012, 2013, "
+"2014, 2015, 2016), og er utgitt under GPL v2 eller en senere versjon."
#. type: Content of: <article><section><para>
msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
-"is released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
-"Opphavsretten for den nederlandske oversettelsen tilhører Frans Spiesschaert "
-"(2014, 2015), og er utgitt under GPL v2 eller en senere versjon."
+"Den nederlandske oversettelsen er rettighetsbeskyttet av Frans Spiesschaert "
+"(2014, 2015, 2016), og er utgitt under GPL v2 eller en senere versjon."
#. type: Content of: <article><section><title>
msgid "Translations of this document"
@@ -11080,12 +11083,12 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
-"DVD-avtrykket ble droppet, i stedet har vi lagt til en USB-minnepinne / Blue-"
-"ray-plate, som oppfører seg som et DVD-avtrykk, men er for stort til å få "
-"plass på en DVD."
+"DVD-bildet ble droppet, i stedet har vi lagt til bilde på en USB-minnepenn /"
+"Blu-ray-plate, som virker som DVD-bildet, men der bildet var for stort til å "
+"få plass på en DVD."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Everything which is new in Debian Wheezy 7.1, eg:"
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po 2016-05-27 15:35:32.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po 2016-09-10 12:26:05.000000000 +0200
@@ -1,12 +1,12 @@
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the debian-edu-doc package.
# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2015, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
-"PO-Revision-Date: 2016-05-23 17:29+0200\n"
+"POT-Creation-Date: 2016-09-02 15:15+0200\n"
+"PO-Revision-Date: 2016-08-19 20:51+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
"Language: nl\n"
@@ -82,10 +82,10 @@
"to be used. Only users and machines need to be added via GOsa², a "
"comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
"PXE has also been prepared, 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 traditional thin-clients."
+"from CD, Blu-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 traditional thin-clients."
msgstr ""
"Onmiddellijk na de installatie van een schoolserver worden alle diensten die "
"nodig zijn in een schoolnetwerk ingesteld (Raadpleeg het volgende hoofdstuk "
@@ -1485,20 +1485,20 @@
"edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr "USB-stick- / blu-ray-ISO-image voor i386 en amd64"
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
"during installation is needed. Like the others it can be downloaded over "
"FTP, HTTP or rsync via:"
msgstr ""
-"Het multi-achitectuur ISO-image is 5,2 GB groot en is geschikt voor "
-"installaties op zowel amd64- als i386-computers. Hou er rekening mee dat u "
-"toegang tot het internet nodig heeft gedurende de installatie. Zoals de "
-"andere images kunt u het downloaden via FTP, HTTP of rsync vanaf:"
+"Het multi-achitectuur ISO-image is ongeveer 5 GiB groot en kan gebruikt "
+"worden voor installaties op zowel amd64- als i386-computers. Hou er rekening "
+"mee dat u toegang tot het internet nodig heeft gedurende de installatie. "
+"Zoals de andere images kunt u het downloaden via FTP, HTTP of rsync van:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1531,11 +1531,11 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://";
-"cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
"De broncode kunt u vinden in het Debian archief. Raadpleeg <ulink url="
-"\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> voor een "
+"\"http://cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> voor een "
"aantal downloadopties."
#. type: Content of: <article><section><section><title>
@@ -1808,7 +1808,7 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
@@ -2190,14 +2190,14 @@
"aansluit op het schoolnetwerk en u daar aanmeldt met uw nieuwe wachtwoord.)"
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
"Een noot bij installaties met het multi-archimage voor USB-stick / blu-"
"rayschijf"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 "
@@ -2214,12 +2214,10 @@
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
msgstr ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on CD installs"
@@ -2298,7 +2296,7 @@
"de normale werkwijze."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr "Installaties vanaf een USB-stick en niet vanaf een cd / blu-rayschijf"
#. type: Content of: <article><section><section><section><para>
@@ -2325,7 +2323,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"Afhankelijk van het gebruikte image, zal de USB-stick zich gedragen als een "
"cd of een blu-rayschijf."
@@ -2513,7 +2511,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 "
@@ -5663,7 +5661,7 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
"Plaats de cd / dvd / blu-rayschijf / USB-stick in het station, koppel ze aan "
@@ -6865,20 +6863,20 @@
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
"apt-get update"
msgstr ""
-"# De sleutelbos van debian op een veilige manier installeren:\n"
+"# installeer de sleutelbos van debian op een veilige manier:\n"
"apt-get install debian-keyring\n"
-"# de sleutel van deb-multimedia veilig ophalen:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"# haal de sleutel van deb-multimedia op een onveilige manier op:\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# ga op een veilige manier na of de sleutel echt is en voeg hem in voorkomend geval toe aan de sleutelbos die door APT gebruikt wordt:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# voeg de pakketbron toe in het bestand sources.list - gelieve op de homepagina na te gaan of u een spiegelserver kunt gebruiken!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# werk de lijst van beschikbare pakketten bij:\n"
@@ -8058,17 +8056,17 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
msgstr ""
"Noot: aangezien zulke tien jaar oude thin clients ook problemen kunnen "
-"hebben met LibreOffice en Firefox/Iceweasel ten gevolge van het gebruik van "
-"cache door pixmap, moet u overwegen om thin clients uit te rusten met "
-"minstens 128 MB RAM of om de apparatuur op te waarderen, hetgeen ook het "
-"voordeel kan hebben dat u de computers kunt gaan gebruiken als schijfloze "
-"werkstations."
+"hebben met recente versies van LibreOffice en Firefox/Iceweasel ten gevolge "
+"van het gebruik van cache door pixmap, moet u overwegen om thin clients uit "
+"te rusten met minstens 128 MB RAM of om de apparatuur op te waarderen, "
+"hetgeen ook het voordeel kan hebben dat u de computers kunt gaan gebruiken "
+"als schijfloze werkstations."
#. type: Content of: <article><section><section><title>
msgid "Replacing LDM with KDM"
@@ -8383,24 +8381,23 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
msgstr ""
-"Hopelijk werd bij de installatie van tjener ook een voorbeeld van het "
-"bestand smb.conf in de taal van uw voorkeur opgenomen in de map "
-"<computeroutput>/usr/share/debian-edu-config/examples/</computeroutput>. Het "
-"originele bestand is in het Engels en heet <computeroutput>smb-roaming-"
-"profiles-en.conf</computeroutput>; zoek naar een bestand met de passende "
-"taalcode in zijn naam (de Duitse vertaling bijvoorbeeld, zal "
-"<computeroutput>smb-roaming-profiles-de.conf</computeroutput> heten). "
-"Binnenin dat configuratiebestand vindt u een heleboel uitleg die u "
-"aandachtig moet bekijken."
+"Misschien werd bij de installatie van tjener in de map <computeroutput>/usr/"
+"share/doc/debian-edu-config/examples/</computeroutput> ook in de taal van uw "
+"voorkeur een voorbeeld geplaatst van het bestand smb.conf. Het originele "
+"bestand is in het Engels en heet <computeroutput>smb-roaming-profiles-en."
+"conf</computeroutput>; zoek naar een bestand met de passende taalcode in "
+"zijn naam (de Duitse vertaling bijvoorbeeld, zal <computeroutput>smb-roaming-"
+"profiles-de.conf</computeroutput> heten). Binnenin dat configuratiebestand "
+"vindt u een heleboel uitleg die u aandachtig moet bekijken."
#. type: Content of: <article><section><section><section><section><title>
msgid "Machine policies for roaming profiles"
@@ -10482,24 +10479,24 @@
"De auteursrechten van de Spaanse vertaling berusten bij José L. Redrejo "
"Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012, 2015) en Norman "
"Garcia (2010, 2012, 2013). De vertaling is vrijgegeven onder de licentie GPL "
-"v2 of enige latere versie."
+"v2 of een latere versie."
#. type: Content of: <article><section><para>
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"(2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
"(2014) and is released under the GPL v2 or any later version."
msgstr ""
"De auteursrechten van de vertaling naar het Bokmål berusten bij Petter "
"Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore "
"Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik "
-"Yrvin (2014), Ingrid Yrvin (2014), Hans Arthur Kielland Aanesen (2014), Knut "
-"Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) en "
-"Ragnar Wisløff (2014). De vertaling is vrijgegeven onder de licentie GPL v2 "
-"of enige latere versie."
+"Yrvin (2014), Ingrid Yrvin (2014, 2015, 2016), Hans Arthur Kielland Aanesen "
+"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"Lauridsen (2014) en Ragnar Wisløff (2014). De vertaling is vrijgegeven onder "
+"de licentie GPL v2 of een latere versie."
#. type: Content of: <article><section><para>
msgid ""
@@ -10508,7 +10505,7 @@
"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
-"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"(2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later "
"version."
msgstr ""
"De auteursrechten van de Duitse vertaling berusten bij Holger Levsen (2007), "
@@ -10516,51 +10513,51 @@
"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
"Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
"Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) en "
-"Wolfgang Schweer (2012, 2013, 2014, 2015). De vertaling is vrijgegeven onder "
-"de licentie GPL v2 of enige latere versie."
+"Wolfgang Schweer (2012, 2013, 2014, 2015, 2016). De vertaling is vrijgegeven "
+"onder de licentie GPL v2 of een latere versie."
#. type: Content of: <article><section><para>
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
+"2014) and is released under the GPL v2 or any later version."
msgstr ""
"De auteursrechten van de Italiaanse vertaling berusten bij Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) en "
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) en "
"Beatrice Torracca (2013, 2014). De vertaling is vrijgegeven onder de "
-"licentie GPL v2 of enige latere versie."
+"licentie GPL v2 of een latere versie."
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
"version."
msgstr ""
"De auteursrechten van de Franse vertaling berusten bij Christophe Masson "
-"(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), "
-"Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) en "
-"het Franse l10n-team (2009, 2010, 2012). De vertaling is vrijgegeven onder "
-"de licentie GPL v2 of enige latere versie."
+"(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, "
+"2016), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent "
+"(2012) en het Franse l10n-team (2009, 2010, 2012). De vertaling is "
+"vrijgegeven onder de licentie GPL v2 of een latere versie."
#. type: Content of: <article><section><para>
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"De auteursrechten van de Deense vertaling berusten bij Joe Hansen (2012, "
-"2013, 2014, 2015). De vertaling is vrijgegeven onder de licentie GPL v2 of "
-"enige latere versie."
+"2013, 2014, 2015, 2016). De vertaling is vrijgegeven onder de licentie GPL "
+"v2 of een latere versie."
#. type: Content of: <article><section><para>
msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
-"is released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
"De auteursrechten van de Nederlandse vertaling berusten bij Frans "
-"Spiesschaert (2014, 2015). De vertaling is vrijgegeven onder de licentie GPL "
-"v2 of enige latere versie."
+"Spiesschaert (2014, 2015, 2016). De vertaling is vrijgegeven onder de "
+"licentie GPL v2 of een latere versie."
#. type: Content of: <article><section><title>
msgid "Translations of this document"
@@ -10575,7 +10572,7 @@
msgstr ""
"Versies van dit document zijn beschikbaar in het Duits, Italiaans, Frans, "
"Deens, Nederlands en Noors Bokmål. Deze vertalingen zijn volledig. Een "
-"gedeeltelijke vertalinge bestaan in het Spaans. Hier vindt u <ulink url="
+"gedeeltelijke vertaling bestaat in het Spaans. Hier vindt u <ulink url="
"\"http://maintainer.skolelinux.org/debian-edu-doc/\";>online een overzicht "
"van alle talen</ulink>."
@@ -11580,8 +11577,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
"Er is geen dvd-image meer. In de plaats kwam een image voor USB-stick / blu-"
"rayschijf, dat zich als het vroegere dvd-image gedraagt, maar dat te groot "
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot 2016-09-10 12:26:05.000000000 +0200
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-23 13:05+0200\n"
+"POT-Creation-Date: 2016-09-02 15:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,10 +72,10 @@
"to be used. Only users and machines need to be added via GOsa², a "
"comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
"PXE has also been prepared, 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 traditional thin-clients."
+"from CD, Blu-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 traditional thin-clients."
msgstr ""
#. type: Content of: <article><section><para>
@@ -1072,12 +1072,12 @@
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
"during installation is needed. Like the others it can be downloaded over "
"FTP, HTTP or rsync via:"
@@ -1108,7 +1108,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://";
-"cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
+"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
@@ -1312,7 +1312,7 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
@@ -1568,12 +1568,12 @@
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 "
@@ -1584,8 +1584,7 @@
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian/ jessie main \n"
-"deb http://security.debian.org/ jessie/updates main \n"
-"deb http://ftp.skolelinux.org/skolelinux jessie local"
+"deb http://security.debian.org/ jessie/updates main"
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
@@ -1639,7 +1638,7 @@
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -1659,7 +1658,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1785,7 +1784,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 "
@@ -4053,7 +4052,7 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
@@ -4889,9 +4888,9 @@
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -5686,7 +5685,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -5914,11 +5913,11 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -7484,7 +7483,7 @@
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"(2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
"(2014) and is released under the GPL v2 or any later version."
msgstr ""
@@ -7496,21 +7495,21 @@
"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
-"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"(2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later "
"version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
+"2014) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
"version."
@@ -7518,14 +7517,14 @@
#. type: Content of: <article><section><para>
msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
-"is released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><title>
@@ -8249,8 +8248,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-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><itemizedlist><listitem><para>
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml 2016-05-27 15:33:19.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml 2016-09-10 12:24:03.000000000 +0200
@@ -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>Directly after installation of a school server all services needed for a school network are set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>) and the system is ready to be used. Only users and machines need to be added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment using PXE has also been prepared, 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 traditional thin-clients.
+<para>Directly after installation of a school server all services needed for a school network are set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>) and the system is ready to be used. Only users and machines need to be added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment using PXE has also been prepared, so after initial installation of the main server from CD, Blu-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 traditional 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>
@@ -449,10 +449,10 @@
</para></listitem></itemizedlist>
</section>
-<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
+<section id="Installation--USB_flash_drive_.2BAC8_Blu-ray_disc_ISO_image_for_i386_and_amd64">
+<title>USB flash drive / Blu-ray disc ISO image for i386 and amd64
</title>
-<para>The multi-architecture ISO image is 5.2 GiB large and can be used for installation of amd64 and i386 machines. Please note that internet access during installation is needed. Like the others it can be downloaded over FTP, HTTP or rsync via:
+<para>The multi-architecture ISO image is roughly 5 GiB large and can be used for installation of amd64 and i386 machines. Please note that internet access during installation is needed. 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/debian-edu-8+edu0-USB.iso";>debian-edu-8+edu0-USB.iso</ulink>
@@ -466,7 +466,7 @@
<section id="Installation--Sources">
<title>Sources
</title>
-<para>Sources are available from the Debian archive, see <ulink url="http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/"/> for some download options.
+<para>Sources are available from the Debian archive, see <ulink url="http://cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/"/> for some download options.
</para>
</section>
</section>
@@ -543,7 +543,7 @@
</para>
<itemizedlist>
<listitem>
-<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>The multi-architecture USB flash drive / Blu-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 image, that would be <computeroutput>amd64-install</computeroutput>.
@@ -665,13 +665,12 @@
</para>
</section>
-<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
+<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blu-ray_disc_image_installs">
+<title>A note on multi-arch USB flash drive / Blu-ray disc image installs
</title>
-<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>After you install from the multi-arch USB flash drive / Blu-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/ jessie main
-deb http://security.debian.org/ jessie/updates main
-deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
+deb http://security.debian.org/ jessie/updates main ]]></screen>
</section>
<section id="Installation--A_note_on_CD_installs">
@@ -695,14 +694,14 @@
</section>
</section>
-<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
+<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blu-ray_discs">
+<title>Installation using USB flash drives instead of CD / Blu-ray discs
</title>
<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 flash drive will behave just like a CD or Blue-ray disc.
+<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blu-ray disc.
</para>
</section>
@@ -745,7 +744,7 @@
<section id="Installation--Custom_images">
<title>Custom images
</title>
-<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>Creating custom CDs, DVDs or Blu-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>
@@ -1681,7 +1680,7 @@
</title>
<para>If you want to upgrade from one version to another (for example from Jessie 8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only physical media, follow these steps:
</para>
-<para>Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the apt-cdrom command:
+<para>Insert the CD / DVD / Blu-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:
@@ -2095,9 +2094,9 @@
</para><screen><![CDATA[# install the debian-keyring securely:
apt-get install debian-keyring
# fetch the deb-multimedia key insecurely:
-gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907
+gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907
# check securely if the key is correct and add it to the keyring used by APT if it is:
-gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -
+gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -
# add repository to sources.list - please check the homepages for mirrors!
echo "deb http://deb-multimedia.org jessie main" >> /etc/apt/sources.list
# update the list of available packages:
@@ -2422,7 +2421,7 @@
</para><screen><![CDATA[LDM_DIRECTX=True]]></screen>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Warning</emphasis>: The above protects initial login, but all activities after that use unencrypted networked X. Passwords (except the initial one) will travel in cleartext over the network, as well as anything else.
</para>
-<para>Note: Since such ten-year-old thin clients may also have trouble running never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching issues, you may consider running thin clients with at least 128 MB RAM, or upgrade the hardware, which will also give you the benefit of being able to use them as diskless workstations.
+<para>Note: Since such ten-year-old thin clients may also have trouble running newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching issues, you may consider running thin clients with at least 128 MB RAM, or upgrade the hardware, which will also give you the benefit of being able to use them as diskless workstations.
</para>
</section>
</section>
@@ -2508,7 +2507,7 @@
</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Note</emphasis> The examples are outdated since in wheezy kerberos was configured for samba too!
</para>
-<para>You should hopefully find an example smb.conf in your preferred language delivered by the installation on tjener under <computeroutput>/usr/share/debian-edu-config/examples/</computeroutput>. The source file is in English and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look for a file with the appropriate code in the filename (the German translation, for example, will be named <computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside the config file are a lot of explanations which you should have a look at.
+<para>You might find an example smb.conf in your preferred language delivered by the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-config/examples/</computeroutput>. The source file is in English and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look for a file with the appropriate code in the filename (the German translation, for example, will be named <computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside the config file are a lot of explanations which you should have a look at.
</para>
</section>
@@ -3461,17 +3460,17 @@
</title>
<para>The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012, 2015) and Norman Garcia (2010, 2012, 2013) and is released under the GPL v2 or any later version.
</para>
-<para>The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released under the GPL v2 or any later version.
+<para>The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014, 2015, 2016), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released under the GPL v2 or any later version.
</para>
-<para>The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013, 2014, 2015) and is released under the GPL v2 or any later version.
+<para>The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later version.
</para>
-<para>The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) and is released under the GPL v2 or any later version.
+<para>The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, 2014) and is released under the GPL v2 or any later version.
</para>
-<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version.
+<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version.
</para>
-<para>The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) and is released under the GPL v2 or any later version.
+<para>The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later version.
</para>
-<para>The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and is released under the GPL v2 or any later version.
+<para>The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, 2016) and is released under the GPL v2 or any later version.
</para>
</section>
@@ -3767,7 +3766,7 @@
<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>The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD.
</para></listitem></itemizedlist>
</section>
Binary files /tmp/g5ahKF146C/debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/images/de/worldmap.png and /tmp/SamXtMnb55/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/images/de/worldmap.png differ
Binary files /tmp/g5ahKF146C/debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/images/es/worldmap.png and /tmp/SamXtMnb55/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/images/es/worldmap.png differ
Binary files /tmp/g5ahKF146C/debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/images/fr/worldmap.png and /tmp/SamXtMnb55/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/images/fr/worldmap.png differ
Binary files /tmp/g5ahKF146C/debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-jessie/images/worldmap.png and /tmp/SamXtMnb55/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-jessie/images/worldmap.png differ
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po 2016-09-10 12:25:55.000000000 +0200
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-05-23 09:34+0200\n"
+"POT-Creation-Date: 2016-08-10 12:46+0200\n"
"PO-Revision-Date: 2014-09-23 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -83,7 +83,7 @@
"\"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 "
+"after initial installation of the main server from CD, Blu-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 "
@@ -1424,7 +1424,7 @@
"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr "USB-drev/blue-ray-disk ISO-aftryk for i386 og amd64"
#. type: Content of: <article><section><section><section><para>
@@ -1766,11 +1766,11 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
-"USB-drevet for flere arktitekturer / Blue-ray-diskaftrykket har som standard "
+"USB-drevet for flere arktitekturer / Blu-ray-diskaftrykket 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>
@@ -2124,13 +2124,13 @@
"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 multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
"En kort bemærkning om USB-drev for flere arkitekturer / blue-ray-aftryk"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 "
@@ -2228,7 +2228,7 @@
"gøres som standard."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr "Installation med brug af USB-drev i stedet for cd'er/blue-ray-diske"
#. type: Content of: <article><section><section><section><para>
@@ -2254,7 +2254,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"Afhængig af hvilket aftryk du vælger, så vil USB-drevet opføre sig på samme "
"måde som en cd eller blue-ray."
@@ -2435,7 +2435,7 @@
# engelsk fejl lille d i Debian
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 "
@@ -5192,7 +5192,7 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
"Indsæt cd/dvd/blue-ray/USB-drev, monter den og brug kommandoen apt-cdrom:"
@@ -6153,14 +6153,25 @@
msgstr "For at bruge www.deb-multimedia.org så udfør følgende:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -7254,9 +7265,16 @@
"netværket, sammen med alt andet."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note: Since such ten-year-old thin clients may also have trouble running "
+#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+#| "issues, you may consider running thin clients with at least 128 MB RAM, "
+#| "or upgrade the hardware, which will also give you the benefit of being "
+#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -7546,12 +7564,22 @@
msgstr "Eksempel smb.conf-filer for roamingprofiler"
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+#, fuzzy
+#| msgid ""
+#| "You should hopefully find an example smb.conf in your preferred language "
+#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
+#| "debian-edu-config/examples/</computeroutput>. The source file is in "
+#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
+#| "computeroutput>; look for a file with the appropriate code in the "
+#| "filename (the German translation, for example, will be named "
+#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
+#| "the config file are a lot of explanations which you should have a look at."
+msgid ""
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -9171,10 +9199,10 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
-"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blue-ray-"
+"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blu-ray-"
"diskaftryk, som opfører sig som dvd-aftrykket, men er for stort til at kunne "
"være på en dvd."
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po 2016-09-10 12:25:55.000000000 +0200
@@ -1,8 +1,8 @@
# translation of debian-edu-wheezy-manual.pot to german
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Holger Levsen and others
+# Copyright (C) 2007- 2016 Holger Levsen and others
# Source URL: http://wiki.debian.org/DebianEdu/Documentation/Wheezy/
#
-# Wolfgang Schweer <wschweer@arcor.de>, 2012, 2013.
+# Wolfgang Schweer <wschweer@arcor.de>, 2012-2016.
# Andreas B. Mundt <andi.mundt@web.de>, 2009, 2010.
# Holger Levsen <holger@layer-acht.org>, 2007.
# RalfGesellensetter <ralf@skolelinux.de>, 2007, 2009.
@@ -16,8 +16,8 @@
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 09:34+0200\n"
-"PO-Revision-Date: 2015-05-04 15:40+0000\n"
+"POT-Creation-Date: 2016-08-10 12:46+0200\n"
+"PO-Revision-Date: 2016-08-14 10:00+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer@arcor.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
@@ -26,7 +26,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -93,7 +93,7 @@
"\"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 "
+"after initial installation of the main server from CD, Blu-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 "
@@ -106,7 +106,7 @@
"der komfortablen Weboberfläche von GOsa² oder einem anderen LDAP-Editor "
"erfolgen kann. Eine Umgebung für das Booten über das Netzwerk mittels PXE "
"steht zur Verfügung; damit können nach der anfänglichen Installation des "
-"Hauptservers von CD, Blue-ray Disc oder USB-Stick alle anderen Rechner über "
+"Hauptservers von CD, Blu-ray Disc oder USB-Stick alle anderen Rechner über "
"das Netz installiert werden - eingeschlossen mobile Arbeitsplatzrechner "
"(also solche, die ausserhalb des Netzwerks benutzt werden können wie Laptops "
"und Netbooks). Auch das Booten mittels PXE für Rechner ohne Festplatten - "
@@ -1456,8 +1456,8 @@
"edu-7.1+edu0-CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "USB-Stick / Blue-ray Disc ISO-Image für i386 und amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "USB-Stick / Blu-ray Disc ISO-Image für i386 und amd64"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -1783,11 +1783,11 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
-"Das Multiarch-USB-Stick / Blue-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
+"Das Multiarch-USB-Stick / Blu-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
"voreingestellt »amd64-installgui« und auf x86-32-Bit-Rechnern »installgui« "
"aus."
@@ -2146,20 +2146,20 @@
"neuen Passwort angemeldet haben.)"
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
-"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blue-ray "
+"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blu-ray "
"Disc«"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 einem Multi-Arch-USB-Stick / Blue-ray-Disc-Image installieren, "
+"Wenn Sie von einem Multi-Arch-USB-Stick / Blu-ray-Disc-Image installieren, "
"enthält die Datei <computeroutput>/etc/apt/sources.list</computeroutput> nur "
"Quellen von der DVD. Wenn Sie eine Internetverbindung haben, wird dringend "
"empfohlen, die folgenden Zeilen zu der Datei hinzuzufügen. Damit stellen Sie "
@@ -2251,8 +2251,8 @@
"voreingestellt durchgeführt."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installation per USB-Stick anstelle von CD / Blue-ray Disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installation per USB-Stick anstelle von CD / Blu-ray Disc"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2277,9 +2277,9 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
-"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blue-ray "
+"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blu-ray "
"Disc verhalten."
#. type: Content of: <article><section><section><section><title>
@@ -2459,13 +2459,13 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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, DVDs oder Blue-ray Discs zu erstellen ist recht einfach, da "
+"Angepasste CDs, DVDs oder Blu-ray Discs zu erstellen ist recht einfach, da "
"das <ulink url=\"http://wiki.debian.org/DebianInstaller/\";>Debian-"
"Installationsprogramm</ulink> verwendet wird, das ein modulares Design und "
"andere schöne Eigenschaften hat. Mit dem sogenannten <ulink url=\"http://";
@@ -5281,10 +5281,10 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
-" Legen Sie die CD / DVD / Blue-ray Disc ein oder stecken Sie den USB-Stick "
+" Legen Sie die CD / DVD / Blu-ray Disc ein oder stecken Sie den USB-Stick "
"ein, hängen Sie das Medium ein und benutzen Sie das Kommando apt-cdrom:"
#. type: CDATA
@@ -6277,9 +6277,9 @@
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6290,7 +6290,7 @@
"# Den Debian-Multimedia-Key ungesichert holen:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
"# Gesichert die Korrektheit des Keys prüfen und diesen gegebenenfalls dem APT-Keyring hinzufügen:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# Das Depot der Datei sources.list hinzufügen - bitte die Homepages wegen Spiegelservern konsultieren!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# Die List der verfügbaren Pakete aktualisieren:\n"
@@ -7379,7 +7379,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -7681,23 +7681,23 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
msgstr ""
"Nach der Installation sollte eine beispielhafte Datei smb.conf in der "
"vorzugsweise verwendeten Sprache auf tjener im Verzeichnis <computeroutput>/"
-"usr/share/debian-edu-config/examples/</computeroutput> zu finden sein. Die "
-"Quelldatei ist in Englisch und heißt <computeroutput>smb-roaming-profiles-en."
-"conf</computeroutput>. Falls sie zum Beispiel ins Deutsche übersetzt wurde, "
-"heißt sie <computeroutput>smb-roaming-profiles-de.conf</computeroutput>. "
-"Innerhalb der Konfigurationsdatei sind eine Menge Erklärungen vorhanden, die "
-"Sie sich ansehen sollten."
+"usr/share/doc/debian-edu-config/examples/</computeroutput> zu finden sein. "
+"Die Quelldatei ist in Englisch und heißt <computeroutput>smb-roaming-"
+"profiles-en.conf</computeroutput>. Falls sie zum Beispiel ins Deutsche "
+"übersetzt wurde, heißt sie <computeroutput>smb-roaming-profiles-de.conf</"
+"computeroutput>. Innerhalb der Konfigurationsdatei sind eine Menge "
+"Erklärungen vorhanden, die Sie sich ansehen sollten."
#. type: Content of: <article><section><section><section><section><title>
msgid "Machine policies for roaming profiles"
@@ -9352,11 +9352,11 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
"Das DVD-Image gibt es nicht mehr, stattdessen haben wir nun ein USB-Stick / "
-"Blue-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
+"Blu-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
"ist, um auf eine DVD zu passen."
#. type: Content of: <article><section><section><section><title>
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po 2016-09-10 12:25:55.000000000 +0200
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 09:34+0200\n"
+"POT-Creation-Date: 2016-08-10 12:46+0200\n"
"PO-Revision-Date: 2013-12-02 00:31-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman@riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -86,7 +86,7 @@
"\"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 "
+"after initial installation of the main server from CD, Blu-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 "
@@ -99,7 +99,7 @@
"para agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
"cómoda, o cualquier otro editor de LDAP. Un ambiente de carga por red es "
"preparado usando PXE, así, después de la instalación inicial del servidor "
-"principal desde CD, Blue-ray o unidad USB, las otras computadoras pueden ser "
+"principal desde CD, Blu-ray o unidad USB, las otras computadoras pueden ser "
"instaladas a través de la red, esto incluye \"estaciones de trabajo "
"itinerantes\" (pueden ser llevadas fuera de la red escolar, usualmente "
"laptops o netbooks) y carga por PXE para computadoras sin disco duro como "
@@ -1462,9 +1462,9 @@
"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr ""
-"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blue-ray "
+"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blu-ray "
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -1806,7 +1806,7 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
@@ -2176,18 +2176,18 @@
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
-msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blue-ray"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
+msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blu-ray"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 ""
-"Después de instalar desde una imagen multiarquitectura USB / Blue-ray, "
+"Después de instalar desde una imagen multiarquitectura USB / Blu-ray, "
"<computeroutput>/etc/apt/sources.list</computeroutput> contendrá fuentes de "
"esa imagen. Si tiene conexión a Internet, le sugerimos agregar las "
"siguientes lineas para que las actualizaciones de seguridad disponible se "
@@ -2291,8 +2291,8 @@
"chroot combinado y por eso se hace de forma predeterminada."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Instalación utilizando memorias USB lugar de CD / Blue-ray"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Instalación utilizando memorias USB lugar de CD / Blu-ray"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2318,10 +2318,10 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"Dependiendo de la imágen seleccionada, la unidad USB se comportará como un "
-"CD o Blue-ray."
+"CD o Blu-ray."
#. type: Content of: <article><section><section><section><title>
msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2505,13 +2505,13 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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, DVDs o Blue-rays personalizados es bastante fácil, ya que se "
+"Crear CDs, DVDs o Blu-rays personalizados es bastante fácil, ya que se "
"utilizamos el <ulink url=\"http://wiki.debian.org/DebianInstaller/\";>debian "
"installer</ulink>, el cual es de diseño modular, y posee otras "
"características útiles.La <ulink url=\"http://wiki.debian.org/";
@@ -5136,10 +5136,10 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
-"Inserte el CD/DVD/Disco Blueray/Dispositivo USB en la unidad, montelo y use "
+"Inserte el CD/DVD/Disco Blu-ray/Dispositivo USB en la unidad, montelo y use "
"el comando apt-cdrom:"
#. type: CDATA
@@ -5974,14 +5974,25 @@
msgstr "Para usar www.deb-multimedia.org haga lo siguiente:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6860,7 +6871,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -7116,11 +7127,11 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -8590,8 +8601,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-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>
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po 2016-09-10 12:25:55.000000000 +0200
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 09:34+0200\n"
+"POT-Creation-Date: 2016-08-10 12:46+0200\n"
"PO-Revision-Date: 2014-09-23 07:24+0200\n"
"Last-Translator: Cédric Boutillier <boutil@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -84,7 +84,7 @@
"\"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 "
+"after initial installation of the main server from CD, Blu-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 "
@@ -1471,7 +1471,7 @@
"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr ""
"image pour clé USB ou disque Blu-ray pour les architectures i386 et amd64"
@@ -1818,7 +1818,7 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
@@ -2188,14 +2188,14 @@
"authentifié avec le nouveau mot de passe)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
"Une remarque sur les installations à partir de l'image multiarchitecture "
"pour clé USB et disque Blu-ray"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 "
@@ -2292,7 +2292,7 @@
"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 flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr ""
"Installation depuis une clé USB au lieu d'un CD ou d'un disque Blu-ray."
@@ -2319,7 +2319,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"En fonction de l'image que vous choisissez, la clé USB se comportera "
"exactement comme un CD ou un disque Blu-ray."
@@ -2506,7 +2506,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 "
@@ -5347,7 +5347,7 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
"Insérez le CD, DVD, disque Blu-ray ou périphérique USB, montez-le et "
@@ -6334,14 +6334,25 @@
"Pour utiliser www.deb-multimedia.org, effectuez les opérations suivantes :"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -7469,9 +7480,16 @@
"réseau, comme tout le reste, d'ailleurs."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note: Since such ten-year-old thin clients may also have trouble running "
+#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+#| "issues, you may consider running thin clients with at least 128 MB RAM, "
+#| "or upgrade the hardware, which will also give you the benefit of being "
+#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -7776,12 +7794,22 @@
msgstr "Exemple de fichier smb.conf pour les profils itinérants"
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+#, fuzzy
+#| msgid ""
+#| "You should hopefully find an example smb.conf in your preferred language "
+#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
+#| "debian-edu-config/examples/</computeroutput>. The source file is in "
+#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
+#| "computeroutput>; look for a file with the appropriate code in the "
+#| "filename (the German translation, for example, will be named "
+#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
+#| "the config file are a lot of explanations which you should have a look at."
+msgid ""
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -9460,8 +9488,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
"L'image DVD a été abandonnée, en faveur d'une image pour clé USB ou disque "
"Blu-ray qui se comporte comme celle-ci mais qui est trop grande pour tenir "
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po 2016-09-10 12:25:55.000000000 +0200
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2016-05-23 09:34+0200\n"
+"POT-Creation-Date: 2016-08-10 12:46+0200\n"
"PO-Revision-Date: 2014-06-26 19:17+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini@gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian@list.debian.org>\n"
@@ -82,7 +82,7 @@
"\"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 "
+"after initial installation of the main server from CD, Blu-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 "
@@ -95,8 +95,8 @@
"e macchine siano aggiunti usando GOsa², una comoda interfaccia Web, o da "
"qualsiasi altro editor LDAP. Un ambiente di avvio dalla rete è disponibile "
"utilizzando PXE, così che dopo l'installazione iniziale del server "
-"principale da CD, disco Blue-ray o penna USB, tutte le altre macchine "
-"possono essere installate via rete, comprese le \"postazioni mobili "
+"principale da CD, disco Blu-ray o penna USB, tutte le altre macchine possono "
+"essere installate via rete, comprese le \"postazioni mobili "
"(roaming)\" (macchine che possono essere allontanate dalla rete della "
"scuola, generalmente laptop o netbook), nonché l'avvio tramite PXE per "
"macchine senza disco come i tradizionali thin-client."
@@ -1442,8 +1442,8 @@
"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "Immagine per flash drive USB / Blue-ray disc per i386 e amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "Immagine per flash drive USB / Blu-ray disc per i386 e amd64"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -1790,11 +1790,11 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
-"L'immagine multiarchitettura su flash drive USB / Blue-ray disc usa in modo "
+"L'immagine multiarchitettura su flash drive USB / Blu-ray disc usa in modo "
"predefinito amd64-installgui su macchine x86 a 64-bit e installgui su "
"macchine x86 a 32-bit."
@@ -2157,21 +2157,21 @@
"password)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
-"Una nota sull'installazione multi-architettura da flash drive USB / Blue-ray "
+"Una nota sull'installazione multi-architettura da flash drive USB / Blu-ray "
"disc"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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'immarighegine multi-architettura su flash drive USB / "
-"Blue-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
+"Blu-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
"conterrà come sorgente solo quella immagine. Se si ha un collegamento "
"Internet si raccomanda di aggiungere le seguenti righe al file in modo da "
"avere disponibili e installare gli aggiornamenti di sicurezza:"
@@ -2261,8 +2261,8 @@
"sempre un chroot combinato come da impostazione predefinita. "
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installazione da flash drive USB al posto di CD /Blue-ray disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installazione da flash drive USB al posto di CD /Blu-ray disc"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2287,10 +2287,10 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"A seconda dell'immagine scelta, la penna USB si comporterà esattamente come "
-"un CD o Blue-ray disc."
+"un CD o Blu-ray disc."
#. type: Content of: <article><section><section><section><title>
msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2465,13 +2465,13 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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, DVD o Blue-ray è possibile "
+"Creare una versione personalizzata del CD, DVD o Blu-ray è possibile "
"abbastanza facilmente, usando l'<ulink url=\"http://wiki.debian.org/";
"DebianInstaller/\">installatore Debian</ulink>, che ha un progetto modulare "
"e altre interessanti caratteristiche. L'<ulink url=\"http://wiki.debian.org/";
@@ -5248,10 +5248,10 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
-"Inserire il CD/ DVD / Blue-ray disc / drive flash USB, montarlo e usare il "
+"Inserire il CD/ DVD / Blu-ray disc / drive flash USB, montarlo e usare il "
"comando apt-cdrom:"
#. type: CDATA
@@ -6217,14 +6217,25 @@
msgstr "Se si usa www.deb-multimedia.org occorre eseguire i seguenti comandi:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -7329,9 +7340,16 @@
"informazione."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note: Since such ten-year-old thin clients may also have trouble running "
+#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+#| "issues, you may consider running thin clients with at least 128 MB RAM, "
+#| "or upgrade the hardware, which will also give you the benefit of being "
+#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -7623,12 +7641,22 @@
msgstr "Esempio di smb.conf per i profili mobili"
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+#, fuzzy
+#| msgid ""
+#| "You should hopefully find an example smb.conf in your preferred language "
+#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
+#| "debian-edu-config/examples/</computeroutput>. The source file is in "
+#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
+#| "computeroutput>; look for a file with the appropriate code in the "
+#| "filename (the German translation, for example, will be named "
+#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
+#| "the config file are a lot of explanations which you should have a look at."
+msgid ""
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -9274,8 +9302,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
"L'immagine del DVD è stata abbandonata, invece è stata aggiunta un'immagine "
"per flash drive USB / Blu-ray, che si comporta come l'immagine del DVD, ma "
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po 2016-09-10 12:25:55.000000000 +0200
@@ -12,21 +12,21 @@
# FourFire Le'bard <FourFire@rocketmail.com>, 2014
# Hans Arthur Kielland Aanesen <hans@eprforum.no>, 2014-2015
# Håvard Korsvoll <korsvoll@gmail.com>, 2007-2009
-# Ingrid Yrvin <iyrvin@hagan.no>, 2014-2015
+# Ingrid Yrvin <ingrid.yrvin@gmail.com>, 2014-2016
# Jan Roar Roed <janroed@gmail.com>, 2010
# Knut Yrvin <knut.yrvin@gmail.com>, 2014
-# Ole-Erik Yrvin <oeyrvin@hagan.no>, 2014
+# Ole-Erik Yrvin <oeyrvin@hagan.no>, 2014-2016
# Ole-Anders Andreassen <olea@skolelinux.no>, 2010
# Ragnar Wisløff <ragnar@wisloff.no>, 2014
# Stefan Mitchell-Lauridsen <stefan@eprforum.no>, 2014-2015
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 09:34+0200\n"
-"PO-Revision-Date: 2015-06-08 08:35+0000\n"
-"Last-Translator: Ingrid Yrvin <iyrvin@hagan.no>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/";
-"p/debian-edu-doc/language/nb_NO/)\n"
+"POT-Creation-Date: 2016-08-10 12:46+0200\n"
+"PO-Revision-Date: 2016-08-05 07:54+0000\n"
+"Last-Translator: Ingrid Yrvin <ingrid.yrvin@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/debian-";
+"edu-skolelinux/debian-edu-doc/language/nb_NO/)\n"
"Language: nb_NO\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -96,7 +96,7 @@
"\"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 "
+"after initial installation of the main server from CD, Blu-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 "
@@ -104,15 +104,14 @@
msgstr ""
"Rett etter installasjonen vil skoletjeneren være satt opp til å kjøre alle "
"tjenester som trengs i skolenettverket (se neste kapittel <link linkend="
-"\"Architecture\"> for detaljer omkring arkitektur og oppsett</link>). "
-"Tjeneren vil vente på at brukere og maskiner blir lagt til via GOsa², og få "
-"et komfortabelt Web-brukergrensesnitt, eller foreta andre LDAP-redigeringer. "
-"Et nettoppstartsmiljø er utarbeidet ved hjelp av PXE slik at, etter første "
-"installasjon av hovedtjener fra en CD, Blue-ray-plate eller USB-minne, vil "
-"alle andre maskiner bli installert via nettverket. Dette gjelder også "
-"vandrende (mobile) arbeidsstasjoner som periodevis forlater det lokale "
-"skolenettverket. Dette kan være bærbare datamaskiner eller nettbrett, men "
-"også tradisjonelle tynne klienter som lagringsløse maskiner med PXE-oppstart."
+"\"Architecture\"> detaljer om arkitekturen i dette oppsettet </link>), klar "
+"for at brukere og maskiner blir lagt til via GOsa², og få et velegnet Web-"
+"brukergrensesnitt, eller bruk andre LDAP-redigeringer. Et nettoppstartmiljø "
+"er utarbeidet med PXE slik at, etter første installasjon av hovedtjener fra "
+"en CD, en Blue-ray-plate, eller et USB-minne, kan alle andre maskiner "
+"installeres via nettverket. Dette gjelder også flyttbare arbeidsstasjoner "
+"(som bærbare datamaskiner eller nettbrett), men også tradisjonelle tynne "
+"klienter som lagringsløse maskiner med PXE-oppstart."
#. type: Content of: <article><section><para>
msgid ""
@@ -1431,8 +1430,8 @@
"edu-7.1+edu0-CD.iso ./debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "USB-minnekort/Blu-ray-disk ISO-bilde for i386 og AMD64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "USB-minnepenn / Blu-ray-plate ISO-bilde for i386 og AMD64"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -1760,12 +1759,12 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
-"USB Fler-arkitektur flash-disk/Blue-ray-disktyper er standard for bruk av "
-"AMD64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
+"Multiarkitektur USB-minnepennen / Blu-ray-platebildet bruker som forvalg "
+"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>
@@ -2108,24 +2107,23 @@
"knyttet din bærbare til nettverket, og logget inn med det nye passordet)."
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
-"En merknad om USB-minnepinne / Blue-ray-installasjon med flerarkitektur-"
-"diskbilder"
+"En merknad for multi-arch USB-minnpinne-/Blu-ray-platebildeinstallasjoner"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 USB-minnepinne, vil <computeroutput>/etc/apt/"
-"sources.list</computeroutput> bare inneholde kilder fra minnepinnen. Hvis du "
-"har en Internett-tilkopling, anbefaler vi på det sterkeste å legge til disse "
-"linjene til denne filen, slik at tilgjengelige (sikkerhets)oppdateringer kan "
-"installeres:"
+"Når du har installert fra multiarkitekturbilde fra USB-minnepenn-/Blu-ray-"
+"plate, vil <computeroutput>/etc/apt/sources.list</computeroutput> bare "
+"inneholde ressurser fra det bildet. Hvis du har en Internett-tilkobling, "
+"anbefaler vi sterkt å legge til følgende linjer, slik at tilgjengelige "
+"sikkerhetsoppdateringer kan installeres:"
#. type: CDATA
#, no-wrap
@@ -2212,9 +2210,9 @@
"som standard. "
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr ""
-"Installasjon ved bruk av USB-minnepinne i stedet for CD eller Blue-ray-plate"
+"Installasjon ved å bruke USB-minnepinner i stedet for CD/Blu-ray-plater"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2239,10 +2237,10 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
-"Avhengig av hvilket bilde du velger, vil USB minnepinnen oppføre seg som en "
-"CD eller Blue-ray-disk."
+"Ut fra hvilket bilde du velger, vil USB-minnepinnen oppføre seg akkurat som "
+"en CD eller Blue-ray-plate."
#. type: Content of: <article><section><section><section><title>
msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2415,17 +2413,17 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 CD-er eller DVD-plater er ganske enkelt, siden vi benytter "
-"<ulink url=\"http://wiki.debian.org/DebianInstaller/\";> debian installer</"
-"ulink>, som har et modulært design og andre fine funksjoner. <ulink url="
-"\"http://wiki.debian.org/DebianInstaller/Preseed\";>Preseeding</ulink> gjør "
-"det mulig å definere svar på spørsmålene som vanligvis stilles."
+"<ulink url=\"http://wiki.debian.org/DebianInstaller/\";>debian installer</"
+"ulink>, som har moduldesign og andre fine funksjoner. <ulink url=\"http://";
+"wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> gjør det mulig "
+"å gi svar på spørsmål som vanligvis stilles."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -5161,10 +5159,10 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
-"Sett inn en CD / DVD / Blue-ray-plate/USB-minnepenn, monter den, og bruk apt-"
+"Sett inn CD / DVD / Blu-ray-plate / USB-minnepenn, start den, og bruk apt-"
"cdrom kommandoen:"
#. type: CDATA
@@ -6118,14 +6116,25 @@
"nettarkiv, eller du kan legge til"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -7193,17 +7202,16 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
msgstr ""
-"Merk: Å bruke 10 år gamle tynnklienter kan føre til problemer med å kjøre "
-"nyere versjoner av <ulink url=\"http://wiki.debian.org/OpenOffice#";
-"\">OpenOffice</ulink>.org og Firefox/Iceweasel p.g.a. pixmap "
-"mellomlagringsproblemer. Du bør helst kjøre tynneklienter med minst 128 MB "
-"RAM, eller oppgradere maskinvaren. Dette vil også gi deg fordelen av å kunne "
-"kjøre de som diskløse arbeidsstasjoner."
+"Merk: Siden slike ti år gamle tynne klienter også kan ha problemer med å "
+"kjøre nyere versjoner av LibreOffice og Firefox/Iceweasel på grunn av pixmap "
+"mellomlagringsproblemer, kan du vurdere å kjøre tynne klienter med minst 128 "
+"MB RAM, eller oppgradere maskinvaren, noe som også vil gi deg fordelen av å "
+"kunne bruke dem som diskløse arbeidsstasjoner."
#. type: Content of: <article><section><section><title>
msgid "Replacing LDM with KDM"
@@ -7483,24 +7491,22 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
msgstr ""
-"Allerede levert med innstallsjonen finner du et eksempel smb.conf i ditt "
-"fortrukne språk. Du kan finne oppsettseksempel i en fil på tjeneren under "
-"<computeroutput>/usr/share/debian- edu-config/examples/</computeroutput>. "
-"Kildefilen er på engelsk, og er kalt <computeroutput>smb-roaming-profiles-en."
-"conf</computeroutput>. Hvis den er oversatt til f.eks. tysk, er den navngitt "
-"<computeroutput>smb-roaming-profiles-de.conf</computeroutput>. Så hvis du "
-"søker etter en fil oversatt til ditt språk, se etter landskoden som er en "
-"del av filnavnet. Inni konfigurasjonsfilen er det mange forklaringer som du "
-"bør se på."
+"Du kan finne et eksempel-smb.conf på ditt foretrukne språk levert fra "
+"installasjonen på tjeneren under <computeroutput>/usr/share/debian-edu-"
+"config/examples/</computeroutput>. Kildefilen er på engelsk, og kalles "
+"<computeroutput>smb-roaming-profiles-en.conf</computeroutput>; se etter en "
+"fil med den riktige koden i filnavnet (den tyske oversettelsen, for "
+"eksempel, vil være navngitt <computeroutput>smb-roaming-profiles-de.conf</"
+"computeroutput>). I config-filen er det mange forklaringer som du må se på."
#. type: Content of: <article><section><section><section><section><title>
msgid "Machine policies for roaming profiles"
@@ -9116,12 +9122,12 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
-"DVD-avtrykket ble droppet, i stedet har vi lagt til en USB-minnepinne / Blue-"
-"ray-plate, som oppfører seg som et DVD-avtrykk, men er for stort til å få "
-"plass på en DVD."
+"DVD-bildet ble valgt vekk. Isteden la vi til et bilde på en USB-minnepenn / "
+"Blu-ray-plate, som virker som DVD-bildet, for bildet var for stort til å "
+"legge inn på en DVD."
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po 2016-09-10 12:25:55.000000000 +0200
@@ -1,12 +1,12 @@
# Copyright (C) 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the debian-edu-doc package.
-# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2015.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2015, 2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-05-23 09:34+0200\n"
-"PO-Revision-Date: 2015-05-05 23:36+0200\n"
+"Project-Id-Version: debian-edu-wheezy-manual\n"
+"POT-Creation-Date: 2016-08-10 12:46+0200\n"
+"PO-Revision-Date: 2016-08-19 20:51+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
"Language: nl\n"
@@ -81,7 +81,7 @@
"\"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 "
+"after initial installation of the main server from CD, Blu-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 "
@@ -1474,7 +1474,7 @@
"edu-7.1+edu0-CD.iso ./debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr "USB-stick- / blu-ray-ISO-image voor i386 en amd64"
#. type: Content of: <article><section><section><section><para>
@@ -1817,7 +1817,7 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
@@ -2189,14 +2189,14 @@
"aansluit op het schoolnetwerk en u daar aanmeldt met uw nieuwe wachtwoord.)"
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
"Een noot bij installaties met het multi-archimage voor USB-stick / blu-"
"rayschijf"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 "
@@ -2297,7 +2297,7 @@
"de normale werkwijze."
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr "Installaties vanaf een USB-stick en niet vanaf een cd / blu-rayschijf"
#. type: Content of: <article><section><section><section><para>
@@ -2324,7 +2324,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
"Afhankelijk van het gebruikte image, zal de USB-stick zich gedragen als een "
"cd of een blu-rayschijf."
@@ -2512,7 +2512,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 "
@@ -5391,7 +5391,7 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
"Plaats de cd / dvd / blu-rayschijf / USB-stick in het station, koppel ze aan "
@@ -6400,24 +6400,35 @@
#. type: CDATA
#, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
"apt-get update"
msgstr ""
-"# De sleutelbos van debian op een veilige manier installeren:\n"
+"# installeer de sleutelbos van debian op een veilige manier:\n"
"apt-get install debian-keyring\n"
-"# de sleutel van deb-multimedia veilig ophalen:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"# haal de sleutel van deb-multimedia op een onveilige manier op:\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# ga op een veilige manier na of de sleutel echt is en voeg hem in voorkomend geval toe aan de sleutelbos die door APT gebruikt wordt:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# voeg de pakketbron toe in het bestand sources.list - gelieve op de homepagina na te gaan of u een spiegelserver kunt gebruiken!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# werk de lijst van beschikbare pakketten bij:\n"
@@ -7538,19 +7549,25 @@
"rest, ongecodeerd over het netwerk doorgegeven worden."
#. type: Content of: <article><section><section><section><para>
+#| msgid ""
+#| "Note: Since such ten-year-old thin clients may also have trouble running "
+#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+#| "issues, you may consider running thin clients with at least 128 MB RAM, "
+#| "or upgrade the hardware, which will also give you the benefit of being "
+#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
msgstr ""
"Noot: aangezien zulke tien jaar oude thin clients ook problemen kunnen "
-"hebben met LibreOffice en Firefox/Iceweasel ten gevolge van het gebruik van "
-"cache door pixmap, moet u overwegen om thin clients uit te rusten met "
-"minstens 128 MB RAM of om de apparatuur op te waarderen, hetgeen ook het "
-"voordeel kan hebben dat u de computers kunt gaan gebruiken als schijfloze "
-"werkstations."
+"hebben met recentere versies van LibreOffice en Firefox/Iceweasel ten "
+"gevolge van het gebruik van cache door pixmap, moet u overwegen om thin "
+"clients uit te rusten met minstens 128 MB RAM of om de apparatuur op te "
+"waarderen, hetgeen ook het voordeel kan hebben dat u de computers kunt gaan "
+"gebruiken als schijfloze werkstations."
#. type: Content of: <article><section><section><title>
msgid "Replacing LDM with KDM"
@@ -7848,25 +7865,34 @@
msgstr "Voorbeelden van smb.conf bestanden voor mobiele profielen"
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+#| msgid ""
+#| "You should hopefully find an example smb.conf in your preferred language "
+#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
+#| "debian-edu-config/examples/</computeroutput>. The source file is in "
+#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
+#| "computeroutput>; look for a file with the appropriate code in the "
+#| "filename (the German translation, for example, will be named "
+#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
+#| "the config file are a lot of explanations which you should have a look at."
+msgid ""
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
msgstr ""
-"Hopelijk werd bij de installatie van tjener ook een voorbeeld van het "
+"Misschien werd bij de installatie van tjener ook een voorbeeld van het "
"bestand smb.conf in de taal van uw voorkeur opgenomen in de map "
"<computeroutput>/usr/share/debian-edu-config/examples/</computeroutput>. Het "
"originele bestand is in het Engels en heet <computeroutput>smb-roaming-"
"profiles-en.conf</computeroutput>; zoek naar een bestand met de passende "
"taalcode in zijn naam (de Duitse vertaling bijvoorbeeld, zal "
"<computeroutput>smb-roaming-profiles-de.conf</computeroutput> heten). "
-"Binnenin dat configuratiebestand vindt u een heleboel uitleg die u "
-"aandachtig moet bekijken."
+"Binnenin dat configuratiebestand vindt u een heleboel uitleg waar u eens "
+"naar zou moeten kijken."
#. type: Content of: <article><section><section><section><section><title>
msgid "Machine policies for roaming profiles"
@@ -9546,8 +9572,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
msgstr ""
"Er is geen dvd-image meer. In de plaats kwam een image voor USB-stick / blu-"
"rayschijf, dat zich als het vroegere dvd-image gedraagt, maar dat te groot "
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot 2016-05-28 17:18:42.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot 2016-09-10 12:25:55.000000000 +0200
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-23 09:34+0200\n"
+"POT-Creation-Date: 2016-08-10 12:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -71,7 +71,7 @@
"\"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 "
+"after initial installation of the main server from CD, Blu-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 "
@@ -1063,7 +1063,7 @@
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -1319,7 +1319,7 @@
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
"machines."
msgstr ""
@@ -1568,12 +1568,12 @@
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-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 "
@@ -1639,7 +1639,7 @@
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -1659,7 +1659,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1785,7 +1785,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-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 "
@@ -3861,7 +3861,7 @@
#. type: Content of: <article><section><section><para>
msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
"apt-cdrom command:"
msgstr ""
@@ -4566,9 +4566,9 @@
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -5323,7 +5323,7 @@
#. type: Content of: <article><section><section><section><para>
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
+"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
"issues, you may consider running thin clients with at least 128 MB RAM, or "
"upgrade the hardware, which will also give you the benefit of being able to "
"use them as diskless workstations."
@@ -5539,11 +5539,11 @@
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share/"
-"debian-edu-config/examples/</computeroutput>. The source file is in English "
-"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"look for a file with the appropriate code in the filename (the German "
+"You might find an example smb.conf in your preferred language delivered by "
+"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. The source file is in English and is "
+"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
+"for a file with the appropriate code in the filename (the German "
"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
@@ -6766,8 +6766,8 @@
#. 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."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-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>
diff -Nru debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
--- debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml 2016-05-27 15:32:58.000000000 +0200
+++ debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml 2016-09-10 12:23:46.000000000 +0200
@@ -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, 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 traditional 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, Blu-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 traditional 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>
@@ -443,8 +443,8 @@
</para></listitem></itemizedlist>
</section>
-<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
+<section id="Installation--USB_flash_drive_.2BAC8_Blu-ray_disc_ISO_image_for_i386_and_amd64">
+<title>USB flash drive / Blu-ray disc ISO image for i386 and amd64
</title>
<para>The multi-architecture ISO image is 5.2 GiB large and can be used for installation of amd64 and i386 machines. Please note that internet access during installation is needed. Like the others it can be downloaded over FTP, HTTP or rsync via:
</para>
@@ -544,7 +544,7 @@
</para>
<itemizedlist>
<listitem>
-<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>The multi-architecture USB flash drive / Blu-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 image, that would be <computeroutput>amd64-install</computeroutput>.
@@ -663,10 +663,10 @@
</para>
</section>
-<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
+<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blu-ray_disc_image_installs">
+<title>A note on multi-arch USB flash drive / Blu-ray disc image installs
</title>
-<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>After you install from the multi-arch USB flash drive / Blu-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>
@@ -693,14 +693,14 @@
</section>
</section>
-<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
+<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blu-ray_discs">
+<title>Installation using USB flash drives instead of CD / Blu-ray discs
</title>
<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 flash drive will behave just like a CD or Blue-ray disc.
+<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blu-ray disc.
</para>
</section>
@@ -743,7 +743,7 @@
<section id="Installation--Custom_images">
<title>Custom images
</title>
-<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>Creating custom CDs, DVDs or Blu-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>
@@ -1611,7 +1611,7 @@
</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 / Blue-ray disc / USB flash drive, mount it and use the apt-cdrom command:
+<para>Insert the CD / DVD / Blu-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:
@@ -1961,9 +1961,9 @@
</para><screen><![CDATA[# install the debian-keyring securely:
apt-get install debian-keyring
# fetch the deb-multimedia key insecurely:
-gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907
+gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907
# check securely if the key is correct and add it to the keyring used by APT if it is:
-gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -
+gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -
# add repository to sources.list - please check the homepages for mirrors!
echo "deb http://deb-multimedia.org wheezy main" >> /etc/apt/sources.list
# update the list of available packages:
@@ -2268,7 +2268,7 @@
</para><screen><![CDATA[LDM_DIRECTX=True]]></screen>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Warning</emphasis>: The above protects initial login, but all activities after that use unencrypted networked X. Passwords (except the initial one) will travel in cleartext over the network, as well as anything else.
</para>
-<para>Note: Since such ten-year-old thin clients may also have trouble running never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching issues, you may consider running thin clients with at least 128 MB RAM, or upgrade the hardware, which will also give you the benefit of being able to use them as diskless workstations.
+<para>Note: Since such ten-year-old thin clients may also have trouble running newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching issues, you may consider running thin clients with at least 128 MB RAM, or upgrade the hardware, which will also give you the benefit of being able to use them as diskless workstations.
</para>
</section>
</section>
@@ -2349,7 +2349,7 @@
<section id="NetworkClients--Example_smb.conf_files_for_roaming_profiles">
<title>Example smb.conf files for roaming profiles
</title>
-<para>You should hopefully find an example smb.conf in your preferred language delivered by the installation on tjener under <computeroutput>/usr/share/debian-edu-config/examples/</computeroutput>. The source file is in English and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look for a file with the appropriate code in the filename (the German translation, for example, will be named <computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside the config file are a lot of explanations which you should have a look at.
+<para>You might find an example smb.conf in your preferred language delivered by the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-config/examples/</computeroutput>. The source file is in English and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look for a file with the appropriate code in the filename (the German translation, for example, will be named <computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside the config file are a lot of explanations which you should have a look at.
</para>
</section>
@@ -3058,7 +3058,7 @@
<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>The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD.
</para></listitem></itemizedlist>
</section>
Binary files /tmp/g5ahKF146C/debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/images/de/worldmap.png and /tmp/SamXtMnb55/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/images/de/worldmap.png differ
Binary files /tmp/g5ahKF146C/debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/images/es/worldmap.png and /tmp/SamXtMnb55/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/images/es/worldmap.png differ
Binary files /tmp/g5ahKF146C/debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/images/fr/worldmap.png and /tmp/SamXtMnb55/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
Binary files /tmp/g5ahKF146C/debian-edu-doc-1.6~20160528+deb8u1/documentation/debian-edu-wheezy/images/worldmap.png and /tmp/SamXtMnb55/debian-edu-doc-1.6~20160910+deb8u2/documentation/debian-edu-wheezy/images/worldmap.png differ
Attachment:
signature.asc
Description: Digital signature