[debian-edu-commits] debian-edu/ 03/03: update typo-fixes from the wiki (and trivial unfuzzying of fully completed translations)
Holger Levsen
holger at moszumanska.debian.org
Sun Dec 21 17:33:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-doc.
commit 1d1bd052dd339b4e49eb5f30b5ad79382d1f44ba
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Dec 21 18:32:56 2014 +0100
update typo-fixes from the wiki (and trivial unfuzzying of fully completed translations)
---
documentation/audacity/audacity-manual.fr.po | 26 ++---
documentation/audacity/audacity-manual.nb.po | 12 +--
documentation/audacity/audacity-manual.nl.po | 82 +++++++-------
documentation/audacity/audacity-manual.pot | 12 +--
documentation/audacity/audacity-manual.xml | 2 +-
.../debian-edu-jessie-manual.da.po | 20 ++--
.../debian-edu-jessie-manual.de.po | 43 +++++---
.../debian-edu-jessie-manual.es.po | 20 ++--
.../debian-edu-jessie-manual.fr.po | 28 +++--
.../debian-edu-jessie-manual.it.po | 30 ++++--
.../debian-edu-jessie-manual.nb.po | 38 ++++---
.../debian-edu-jessie-manual.nl.po | 118 +++++----------------
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 20 ++--
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 6 +-
14 files changed, 221 insertions(+), 236 deletions(-)
diff --git a/documentation/audacity/audacity-manual.fr.po b/documentation/audacity/audacity-manual.fr.po
index 919127a..470a3a0 100644
--- a/documentation/audacity/audacity-manual.fr.po
+++ b/documentation/audacity/audacity-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-12-19 21:06+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2012-02-25 17:05+0100\n"
"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -581,26 +581,12 @@ msgstr ""
"souhaitez commencer/aider à traduire ce document."
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To commit your translations you need to be a member of the alioth project "
-#| "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
-#| "to check out some files from Subversion (which can be done anonymously), "
-#| "create patches and send those to <ulink url=\"mailto:debian-edu-"
-#| "doc at packages.qa.debian.org\">debian-edu-doc at packages.qa.debian.org</"
-#| "ulink>."
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
"from your local one, create or edit <computeroutput>~/.ssh/config</"
"computeroutput>. There should be an entry like:"
msgstr ""
-"Pour enregistrer vos traductions, vous devez être membre du projet alioth "
-"<computeroutput>debian-edu</computeroutput>. Pour traduire, vous n'avez qu'à "
-"importer quelques fichiers depuis Subversion (ce qui peut être fait "
-"anonymement), créer des correctifs et les envoyer à <ulink url='mailto:"
-"debian-edu at packages.qa.debian.org'>debian-edu at packages.qa.debian.org\"</"
-"ulink>."
#. type: CDATA
#, no-wrap
@@ -619,11 +605,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"If you only want to translate, you just need to check out some files from "
-"from Git (which can be done anonymously) and create patches. Please file a "
-"bug against the debian-edu-doc package and attach the PO file to the <ulink "
-"url=\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can "
-"find some <ulink url=\"http://bugs.debian.org\">instructions on how to "
-"submit bugs</ulink> here."
+"Git (which can be done anonymously) and create patches. Please file a bug "
+"against the debian-edu-doc package and attach the PO file to the <ulink url="
+"\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can find "
+"some <ulink url=\"http://bugs.debian.org\">instructions on how to submit "
+"bugs</ulink> here."
msgstr ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/audacity/audacity-manual.nb.po b/documentation/audacity/audacity-manual.nb.po
index 59b750c..da22873 100644
--- a/documentation/audacity/audacity-manual.nb.po
+++ b/documentation/audacity/audacity-manual.nb.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-12-19 21:06+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2014-12-01 20:58+0000\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -597,11 +597,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"If you only want to translate, you just need to check out some files from "
-"from Git (which can be done anonymously) and create patches. Please file a "
-"bug against the debian-edu-doc package and attach the PO file to the <ulink "
-"url=\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can "
-"find some <ulink url=\"http://bugs.debian.org\">instructions on how to "
-"submit bugs</ulink> here."
+"Git (which can be done anonymously) and create patches. Please file a bug "
+"against the debian-edu-doc package and attach the PO file to the <ulink url="
+"\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can find "
+"some <ulink url=\"http://bugs.debian.org\">instructions on how to submit "
+"bugs</ulink> here."
msgstr ""
"Hvis du bare ønsker å oversette, trenger du bare å sjekke ut noen filer fra "
"Git (som kan gjøres anonymt) og lage patcher. Du sender inn en feilrapport "
diff --git a/documentation/audacity/audacity-manual.nl.po b/documentation/audacity/audacity-manual.nl.po
index 33a038d..e648ca3 100644
--- a/documentation/audacity/audacity-manual.nl.po
+++ b/documentation/audacity/audacity-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-11-30 19:31+0100\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2014-12-19 22:43+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Dutch <Debian l10n Dutch <debian-l10n-dutch at lists.debian."
@@ -503,6 +503,21 @@ msgid "Translation copyright and authors"
msgstr "Auteursrechten en auteurs van vertalingen"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Alf Tonny Bätz (2008, 2009), "
+#| "Holger Levsen (2009) and is released under the GPL2 or any later version. "
+#| "Enjoy!"
+msgid ""
+"The Bokmål translation is copyrighted by Jon Nordby (2014) and Petter "
+"Reinholdtsen (2014) and is released under the GPL v2 or any later version."
+msgstr ""
+"De volgende auteurs, bij wie ook de auteursrechten berusten, schreven mee "
+"aan dit document: Alf Tonny Bätz (2008, 2009) en Holger Levsen (2009). Het "
+"document werd uitgegeven onder de licentie GPL2 of enige latere versie. "
+"Geniet ervan!"
+
+#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012), Jean-Paul Guilloneau (2012), David "
@@ -515,6 +530,21 @@ msgstr ""
"l10n-team (2009, 2010, 2012). De vertaling is vrijgegeven onder de licentie "
"GPL v2 of enige latere versie."
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Alf Tonny Bätz (2008, 2009), "
+#| "Holger Levsen (2009) and is released under the GPL2 or any later version. "
+#| "Enjoy!"
+msgid ""
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+"released under the GPL v2 or any later version."
+msgstr ""
+"De volgende auteurs, bij wie ook de auteursrechten berusten, schreven mee "
+"aan dit document: Alf Tonny Bätz (2008, 2009) en Holger Levsen (2009). Het "
+"document werd uitgegeven onder de licentie GPL2 of enige latere versie. "
+"Geniet ervan!"
+
#. type: Content of: <article><section><title>
msgid "Translations of this document"
msgstr "Vertalingen van dit document"
@@ -536,12 +566,6 @@ msgid "HowTo translate this document"
msgstr "Hoe dit document vertalen"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Translations of this document are kept in PO files like in many free "
-#| "software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/"
-#| "README.audacity-manual-translations</computeroutput> for more information "
-#| "on this. Please read also read this, if you want to start/help "
-#| "translating this document."
msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
@@ -561,13 +585,6 @@ msgstr ""
"indien u wilt meehelpen met het vertalen van dit document."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To commit your translations you need to be a member of the alioth project "
-#| "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
-#| "to check out some files from Subversion (which can be done anonymously), "
-#| "create patches and send those to <ulink url=\"mailto:debian-edu-"
-#| "doc at packages.qa.debian.org\">debian-edu-doc at packages.qa.debian.org</"
-#| "ulink>."
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
@@ -602,11 +619,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"If you only want to translate, you just need to check out some files from "
-"from Git (which can be done anonymously) and create patches. Please file a "
-"bug against the debian-edu-doc package and attach the PO file to the <ulink "
-"url=\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can "
-"find some <ulink url=\"http://bugs.debian.org\">instructions on how to "
-"submit bugs</ulink> here."
+"Git (which can be done anonymously) and create patches. Please file a bug "
+"against the debian-edu-doc package and attach the PO file to the <ulink url="
+"\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can find "
+"some <ulink url=\"http://bugs.debian.org\">instructions on how to submit "
+"bugs</ulink> here."
msgstr ""
"Indien u enkel een vertaling wenst te maken, moet u slechts enkele bestanden "
"ophalen uit Git (dit kan anoniem gebeuren) en de nodige aanvullingen "
@@ -617,11 +634,6 @@ msgstr ""
"bugrapport op te maken </ulink>"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "You can checkout the <computeroutput>debian-edu-doc</computeroutput> "
-#| "source anonymously with the following command (you need to have the "
-#| "<computeroutput>subversion</computeroutput> package installed for this to "
-#| "work):"
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
@@ -632,9 +644,6 @@ msgstr ""
"u het pakket <computeroutput>git</computeroutput> geïnstalleerd hebben):"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
-#| "debian-edu-doc</computeroutput>"
msgid ""
"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
"git</computeroutput>"
@@ -643,11 +652,6 @@ msgstr ""
"git</computeroutput>"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Then edit the <computeroutput>documentation/audacity/audacity-manual.$CC."
-#| "po</computeroutput> (where you replace $CC with your language code). "
-#| "There are many tools for translating available, we suggest to use "
-#| "<computeroutput>lokalize</computeroutput>."
msgid ""
"Then edit the file <computeroutput>documentation/audacity/audacity-manual."
"$CC.po</computeroutput> (replacing $CC with your language code). There are "
@@ -661,9 +665,6 @@ msgstr ""
"<computeroutput>lokalize</computeroutput>."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Then you either commit the file directly to Subversion (if you have the "
-#| "rights to do so) or send the file to the mailinglist."
msgid ""
"Then you either commit the file directly to Git (if you have the rights to "
"do so) or send the file to the bugreport."
@@ -682,19 +683,10 @@ msgstr ""
"computeroutput> bevindt:"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid "<computeroutput>svn up</computeroutput>"
msgid "<computeroutput>git pull</computeroutput>"
msgstr "<computeroutput>git pull</computeroutput>"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Read /usr/share/doc/debian-edu-doc-en/README.audacity-manual-translations "
-#| "to find information how to create a new PO file for your language if "
-#| "there is none yet, and how to update translations. If you are new to "
-#| "Subversion, look at the <ulink url=\"http://svnbook.org\">Version Control "
-#| "with Subversion</ulink>, it has a chapter on the <ulink url=\"http://"
-#| "svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-#| "Subversion</ulink>."
msgid ""
"Read /usr/share/doc/debian-edu-doc/README.audacity-manual-translations to "
"find information how to create a new PO file for your language if there "
@@ -706,7 +698,7 @@ msgstr ""
"over hoe u vertalingen moet bijwerken."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index 8a0c7b1..f7c3eb1 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-19 21:06+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -481,11 +481,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"If you only want to translate, you just need to check out some files from "
-"from Git (which can be done anonymously) and create patches. Please file a "
-"bug against the debian-edu-doc package and attach the PO file to the <ulink "
-"url=\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can "
-"find some <ulink url=\"http://bugs.debian.org\">instructions on how to "
-"submit bugs</ulink> here."
+"Git (which can be done anonymously) and create patches. Please file a bug "
+"against the debian-edu-doc package and attach the PO file to the <ulink url="
+"\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can find "
+"some <ulink url=\"http://bugs.debian.org\">instructions on how to submit "
+"bugs</ulink> here."
msgstr ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/audacity/audacity-manual.xml b/documentation/audacity/audacity-manual.xml
index 26c2697..6bcb96c 100644
--- a/documentation/audacity/audacity-manual.xml
+++ b/documentation/audacity/audacity-manual.xml
@@ -193,7 +193,7 @@
User <your-alioth-username>]]></screen>
<para> Then check out the <computeroutput>debian-edu-doc</computeroutput> source using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/debian-edu/debian-edu-doc.git</computeroutput>
</para>
-<para>If you only want to translate, you just need to check out some files from from Git (which can be done anonymously) and create patches. Please file a bug against the debian-edu-doc package and attach the PO file to the <ulink url="http://bugs.debian.org/debian-edu-doc">bugreport</ulink>. You can find some <ulink url="http://bugs.debian.org">instructions on how to submit bugs</ulink> here.
+<para>If you only want to translate, you just need to check out some files from Git (which can be done anonymously) and create patches. Please file a bug against the debian-edu-doc package and attach the PO file to the <ulink url="http://bugs.debian.org/debian-edu-doc">bugreport</ulink>. You can find some <ulink url="http://bugs.debian.org">instructions on how to submit bugs</ulink> here.
</para>
<para>You can check out the <computeroutput>debian-edu-doc</computeroutput> source anonymously with the following command (you need to have the <computeroutput>git</computeroutput> package installed for this to work):
</para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index b8e32e0..992c3db 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2014-12-17 10:27+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2014-10-21 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2840,8 +2840,8 @@ msgstr ""
msgid ""
"There is additional information available elsewhere in this manual: the "
"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
-"read by everyone who is familar with previous releases. And for those "
-"upgrading from a previous relase, make sure to read the <link linkend="
+"read by everyone who is familiar with previous releases. And for those "
+"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
@@ -6367,9 +6367,17 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"The solution for Chromium is similar, it needs the package "
-"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
-"which will install the (non-free) Pepper Flash Player web browser plugin "
-"from Google."
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
+"<computeroutput>contrib</computeroutput>) to be installed, which will "
+"install the (non-free) Adobe Flash Player web browser plugin."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the <computeroutput>pepperflashplugin-nonfree</"
+"computeroutput> package implements a more recent version of the Flash "
+"specification than does the <computeroutput>flashplugin-nonfree</"
+"computeroutput>, however."
msgstr ""
#. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 9703141..87fefa4 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 10:27+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2014-12-17 10:52+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -781,8 +781,8 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
-"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
+"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
"Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
"Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
"Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -2845,8 +2845,8 @@ msgstr ""
msgid ""
"There is additional information available elsewhere in this manual: the "
"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
-"read by everyone who is familar with previous releases. And for those "
-"upgrading from a previous relase, make sure to read the <link linkend="
+"read by everyone who is familiar with previous releases. And for those "
+"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
"In diesem Handbuch gibt es noch an anderen Stellen zusätzliche "
@@ -6290,10 +6290,10 @@ msgid ""
"alice, jane, bob and john from everywhere and for all other users only from "
"the internal networks by adding these lines:"
msgstr ""
-"In der Datei /etc/security/access.conf den Zugang für die "
-"(Beispiel-)Benutzer alice, jane, bob and john von überall her sowie für "
-"alle anderen Benutzer nur aus den internen Netzwerken ermöglichen durch "
-"Einfügen dieser Zeilen: :"
+"In der Datei /etc/security/access.conf den Zugang für die (Beispiel-)"
+"Benutzer alice, jane, bob and john von überall her sowie für alle anderen "
+"Benutzer nur aus den internen Netzwerken ermöglichen durch Einfügen dieser "
+"Zeilen: :"
#. type: CDATA
#, no-wrap
@@ -6395,7 +6395,6 @@ msgstr ""
#. type: CDATA
#, no-wrap
-#| msgid "apt-get install gnome lxde"
msgid "apt-get install gnome lxde xfce4 mate-desktop"
msgstr "apt-get install gnome lxde xfce4 mate-desktop"
@@ -6460,17 +6459,31 @@ msgstr ""
"list</computeroutput> vorhanden sein."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The solution for Chromium is similar, it needs the package "
+#| "<computeroutput>pepperflashplugin-nonfree</computeroutput> to be "
+#| "installed, which will install the (non-free) Pepper Flash Player web "
+#| "browser plugin from Google."
msgid ""
"The solution for Chromium is similar, it needs the package "
-"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
-"which will install the (non-free) Pepper Flash Player web browser plugin "
-"from Google."
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
+"<computeroutput>contrib</computeroutput>) to be installed, which will "
+"install the (non-free) Adobe Flash Player web browser plugin."
msgstr ""
"Für Chromium gibt es eine ähnliche Lösung; es muss das Paket "
"<computeroutput>pepperflashplugin-nonfree</computeroutput> installiert "
"werden, was seinerseits das (unfreie) Webbrowser-Plugin »Pepper Flash "
"Player« von Google installiert."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the <computeroutput>pepperflashplugin-nonfree</"
+"computeroutput> package implements a more recent version of the Flash "
+"specification than does the <computeroutput>flashplugin-nonfree</"
+"computeroutput>, however."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Playing DVDs"
msgstr "DVDs abspielen"
@@ -10098,8 +10111,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index a57737d..d6c88cf 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 10:27+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2013-12-02 00:31-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -2932,8 +2932,8 @@ msgstr ""
msgid ""
"There is additional information available elsewhere in this manual: the "
"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
-"read by everyone who is familar with previous releases. And for those "
-"upgrading from a previous relase, make sure to read the <link linkend="
+"read by everyone who is familiar with previous releases. And for those "
+"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
@@ -6097,9 +6097,17 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"The solution for Chromium is similar, it needs the package "
-"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
-"which will install the (non-free) Pepper Flash Player web browser plugin "
-"from Google."
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
+"<computeroutput>contrib</computeroutput>) to be installed, which will "
+"install the (non-free) Adobe Flash Player web browser plugin."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the <computeroutput>pepperflashplugin-nonfree</"
+"computeroutput> package implements a more recent version of the Flash "
+"specification than does the <computeroutput>flashplugin-nonfree</"
+"computeroutput>, however."
msgstr ""
#. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index aea6b82..d91a8a5 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-12-17 10:27+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2014-12-01 00:18+0100\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2869,8 +2869,8 @@ msgstr ""
msgid ""
"There is additional information available elsewhere in this manual: the "
"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
-"read by everyone who is familar with previous releases. And for those "
-"upgrading from a previous relase, make sure to read the <link linkend="
+"read by everyone who is familiar with previous releases. And for those "
+"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
@@ -6525,9 +6525,17 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"The solution for Chromium is similar, it needs the package "
-"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
-"which will install the (non-free) Pepper Flash Player web browser plugin "
-"from Google."
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
+"<computeroutput>contrib</computeroutput>) to be installed, which will "
+"install the (non-free) Adobe Flash Player web browser plugin."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the <computeroutput>pepperflashplugin-nonfree</"
+"computeroutput> package implements a more recent version of the Flash "
+"specification than does the <computeroutput>flashplugin-nonfree</"
+"computeroutput>, however."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -7256,10 +7264,10 @@ msgid ""
"address or IP address like this: <computeroutput>[192.168.0.10]</"
"computeroutput>."
msgstr ""
-"Les valeurs par défaut sont définies dans la section "
-"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
-"indiquez son adresse MAC ou son adresse IP de cette manière : "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"Les valeurs par défaut sont définies dans la section <computeroutput>"
+"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
+"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
+"computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index 4186997..c541ca7 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2014-12-19 20:50+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2014-12-19 20:45+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -2815,8 +2815,8 @@ msgstr ""
msgid ""
"There is additional information available elsewhere in this manual: the "
"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
-"read by everyone who is familar with previous releases. And for those "
-"upgrading from a previous relase, make sure to read the <link linkend="
+"read by everyone who is familiar with previous releases. And for those "
+"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
"Ci sono altre informazioni disponibili in questo manuale: il capitolo <link "
@@ -6356,16 +6356,30 @@ msgstr ""
"<computeroutput>/etc/apt/sources.list</computeroutput>."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The solution for Chromium is similar, it needs the package "
+#| "<computeroutput>pepperflashplugin-nonfree</computeroutput> to be "
+#| "installed, which will install the (non-free) Pepper Flash Player web "
+#| "browser plugin from Google."
msgid ""
"The solution for Chromium is similar, it needs the package "
-"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
-"which will install the (non-free) Pepper Flash Player web browser plugin "
-"from Google."
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
+"<computeroutput>contrib</computeroutput>) to be installed, which will "
+"install the (non-free) Adobe Flash Player web browser plugin."
msgstr ""
"La soluzione per Chromium è simile, bisogna installare il pacchetto "
"<computeroutput>pepperflashplugin-nonfree</computeroutput>, che installerà "
"il plugin (non-libero) per browser web Pepper Flash Player da Google."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the <computeroutput>pepperflashplugin-nonfree</"
+"computeroutput> package implements a more recent version of the Flash "
+"specification than does the <computeroutput>flashplugin-nonfree</"
+"computeroutput>, however."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Playing DVDs"
msgstr "Riprodurre DVD"
@@ -7072,8 +7086,8 @@ msgid ""
msgstr ""
"I valori predefiniti sono definiti in <computeroutput>[default]</"
"computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
+"</computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index 75efd6f..06cfceb 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-12-17 10:27+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2014-12-18 22:13+0000\n"
"Last-Translator: Ragnar Wisløff <ragnar at wisloff.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -760,11 +760,11 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som "
-"(X-)terminaler. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er Linux "
-"Terminal Server Project (LTSP)."
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som (X-)"
+"terminaler. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. Tynnklientoppsettet som er brukt er Linux Terminal "
+"Server Project (LTSP)."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2778,8 +2778,8 @@ msgstr ""
msgid ""
"There is additional information available elsewhere in this manual: the "
"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
-"read by everyone who is familar with previous releases. And for those "
-"upgrading from a previous relase, make sure to read the <link linkend="
+"read by everyone who is familiar with previous releases. And for those "
+"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
@@ -6229,9 +6229,17 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"The solution for Chromium is similar, it needs the package "
-"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
-"which will install the (non-free) Pepper Flash Player web browser plugin "
-"from Google."
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
+"<computeroutput>contrib</computeroutput>) to be installed, which will "
+"install the (non-free) Adobe Flash Player web browser plugin."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the <computeroutput>pepperflashplugin-nonfree</"
+"computeroutput> package implements a more recent version of the Flash "
+"specification than does the <computeroutput>flashplugin-nonfree</"
+"computeroutput>, however."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -6332,10 +6340,10 @@ msgid ""
"boots from a diskette or directly from the server using network-PROM (or "
"PXE) without using a local client hard drive."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. "
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 420ac80..603ca33 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-12-17 09:00+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: 2014-12-20 00:18+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -946,13 +946,6 @@ msgstr ""
"tijdens het installatieproces."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The installation should not ask any questions, with the exception of "
-#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
-#| "profile (server, workstation, thin client server). All other "
-#| "configuration will be set up automatically with reasonable values, to be "
-#| "changed from a central location by the system administrator subsequent to "
-#| "the installation."
msgid ""
"The installation should not ask any questions, with the exception of desired "
"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
@@ -2909,8 +2902,8 @@ msgstr ""
msgid ""
"There is additional information available elsewhere in this manual: the "
"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
-"read by everyone who is familar with previous releases. And for those "
-"upgrading from a previous relase, make sure to read the <link linkend="
+"read by everyone who is familiar with previous releases. And for those "
+"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
"Elders in deze handleiding is hierover meer informatie te vinden: iedereen "
@@ -4685,7 +4678,6 @@ msgstr ""
"wetgeving.</emphasis>"
#. type: Content of: <article><section><para>
-#| msgid "Please read this chapter completely before attempting to upgrade."
msgid ""
"Please read this chapter and the <link linkend=\"Features\">New features in "
"Jessie</link> chapter of this manual completely before attempting to upgrade."
@@ -5819,12 +5811,6 @@ msgid "HowTos from wiki.debian.org"
msgstr "HowTo's van wiki.debian.org"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> "
-#| "are either user- or developer-specific. Let's move the user-specific "
-#| "HowTos over here (and delete them over there)! (But first ask the authors "
-#| "(see the history of those pages to find them) if they are fine with "
-#| "moving the howto and putting it under the GPL.)"
msgid ""
"FIXME: The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/"
"\"/> are either user- or developer-specific. Let's move the user-specific "
@@ -6524,7 +6510,6 @@ msgstr ""
"informatie over het gebruik van deze variabelen."
#. type: Content of: <article><section><section><title>
-#| msgid "Using KDE \"Plasma\", GNOME and LXDE together"
msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
msgstr "KDE \"Plasma\", GNOME, LXDE, Xfce en/of MATE samen gebruiken"
@@ -6537,16 +6522,10 @@ msgstr ""
#. type: CDATA
#, no-wrap
-#| msgid "apt-get install gnome lxde"
msgid "apt-get install gnome lxde xfce4 mate-desktop"
msgstr "apt-get install gnome lxde xfce4 mate-desktop"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Users will then be able to choose the desktop environment via the login "
-#| "manager before logging in. The usage of LXDE as default on thin clients "
-#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
-#| "link> for details."
msgid ""
"Users will then be able to choose any of the five desktop environment via "
"the login manager before logging in. Of course, you can also choose to give "
@@ -6557,11 +6536,6 @@ msgstr ""
"ook voor opteren om een beperktere keuze aan te bieden."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Users will then be able to choose the desktop environment via the login "
-#| "manager before logging in. The usage of LXDE as default on thin clients "
-#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
-#| "link> for details."
msgid ""
"The usage of LXDE as default on thin clients can be forced; see <link "
"linkend=\"NetworkClients\">networked clients</link> for details."
@@ -6571,10 +6545,6 @@ msgstr ""
"link> voor meer uitleg."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the "
-#| "<link linkend=\"Installation--The_installation_process\">installation "
-#| "instructions</link>."
msgid ""
"If you don't want to do installations with the default desktop KDE \"Plasma"
"\", you can also <link linkend=\"Installation--The_installation_process"
@@ -6591,10 +6561,16 @@ msgid "Flash"
msgstr "Flash"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "While the free software flash-player <computeroutput>gnash</"
+#| "computeroutput> is <emphasis>not</emphasis> installed by default anymore, "
+#| "as it has been removed from Jessie, installing a non-free flash players "
+#| "is still an option."
msgid ""
"While the free software flash-player <computeroutput>gnash</computeroutput> "
"is <emphasis>not</emphasis> installed by default anymore, as it has been "
-"removed from Jessie, installing a non-free flash players is still an option."
+"removed from Jessie, installing a non-free flash player is still an option."
msgstr ""
"De uit vrije software bestaande flash-player <computeroutput>gnash</"
"computeroutput> wordt <emphasis>niet</emphasis> meer standaard "
@@ -6602,14 +6578,6 @@ msgstr ""
"flash-player installeren blijft nog steeds een optie."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The free software flash-player <computeroutput>gnash</computeroutput> is "
-#| "installed by default, but switching to Adobe Flash is an option. To "
-#| "install the (non-free) Adobe Flash Player web browser plugin, install the "
-#| "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
-#| "<computeroutput>contrib</computeroutput>. This requires "
-#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
-#| "apt/sources.list</computeroutput>."
msgid ""
"To install the (non-free) Adobe Flash Player web browser plugin, install the "
"<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
@@ -6625,17 +6593,31 @@ msgstr ""
"toegevoegd werd."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The solution for Chromium is similar, it needs the package "
+#| "<computeroutput>pepperflashplugin-nonfree</computeroutput> to be "
+#| "installed, which will install the (non-free) Pepper Flash Player web "
+#| "browser plugin from Google."
msgid ""
"The solution for Chromium is similar, it needs the package "
-"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
-"which will install the (non-free) Pepper Flash Player web browser plugin "
-"from Google."
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
+"<computeroutput>contrib</computeroutput>) to be installed, which will "
+"install the (non-free) Adobe Flash Player web browser plugin."
msgstr ""
"De oplossing voor Chromium is gelijkaardig. Daarvoor moet het pakket "
"<computeroutput>pepperflashplugin-nonfree</computeroutput> geïnstalleerd "
"worden, dat op zijn beurt de (niet-vrije) webbrowserplug-in van Google zal "
"installeren."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the <computeroutput>pepperflashplugin-nonfree</"
+"computeroutput> package implements a more recent version of the Flash "
+"specification than does the <computeroutput>flashplugin-nonfree</"
+"computeroutput>, however."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Playing DVDs"
msgstr "Dvd's afspelen"
@@ -6696,11 +6678,6 @@ msgid "Handwriting fonts"
msgstr "Tekensets met lettertekens in handschrift"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The package <computeroutput>ttf-linex</computeroutput> (which is "
-#| "installed by default) installs the font \"Abecedario\" which is a nice "
-#| "handwriting font for kids. The font has several forms to be used with "
-#| "kids: dotted, and with lines."
msgid ""
"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
"by default) installs the font \"Abecedario\" which is a nice handwriting "
@@ -9868,7 +9845,6 @@ msgstr ""
"het type i586 (zoals Intel Pentium en AMD K5)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
msgid ""
"Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
"0.5.6"
@@ -9877,15 +9853,10 @@ msgstr ""
"0.5.6"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "new optional desktop environment: MATE"
msgid "new optional desktop environment: MATE 1.8"
msgstr "nieuwe optionele bureaubladomgeving: MATE 1.8"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-#| "0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one "
-#| "of the others see this manual.)"
msgid ""
"KDE \"Plasma\" is installed by default; to choose one of the others see this "
"manual."
@@ -9967,10 +9938,6 @@ msgstr ""
"Bokmål."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The Debian Edu Jessie Manual is fully translated to German, French, "
-#| "Italian, Danish and Dutch. Partly translated versions exist for Norwegian "
-#| "Bokmal and Spanish."
msgid ""
"The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
@@ -10012,7 +9979,6 @@ msgstr ""
"computeroutput> toe te voegen."
#. type: Content of: <article><section><section><section><section><title>
-#| msgid "OpenSSH"
msgid "SSH"
msgstr "SSH"
@@ -10030,7 +9996,6 @@ msgstr ""
"inhoudt dat ssh-sleutels wel werken."
#. type: Content of: <article><section><section><section><section><title>
-#| msgid "sl-backup, slbackup-php"
msgid "Backup (slbackup-php)"
msgstr "Back-up (slbackup-php)"
@@ -10128,11 +10093,6 @@ msgstr ""
"enige latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
-#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
-#| "(2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (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), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
@@ -10213,11 +10173,6 @@ msgid "Translations of this document"
msgstr "Vertalingen van dit document"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "Versions of this document fully translated into German, Italian, French "
-#| "and Danish are available. Incomplete translations exist for Norwegian "
-#| "Bokmål and Spanish. This is an <ulink url=\"http://maintainer.skolelinux."
-#| "org/debian-edu-doc/\">online overview of all languages</ulink>."
msgid ""
"Versions of this document fully translated into German, Italian, French, "
"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
@@ -10368,7 +10323,7 @@ msgstr ""
"over hoe u vertalingen moet bijwerken."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -11307,10 +11262,6 @@ msgstr ""
"installmanual\">installatiehandleiding</ulink>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The Debian Edu Wheezy Manual is fully translated to German, French, "
-#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
-#| "and Spanish."
msgid ""
"The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
"and Danish. Partly translated versions exist for Norwegian Bokmål and "
@@ -11882,10 +11833,6 @@ msgstr ""
"taalkundige."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The Debian Edu Squeeze Manual is fully translated to German, French and "
-#| "Italian. Partly translated versions exist for Danish (new), Norwegian "
-#| "Bokmal and Spanish."
msgid ""
"The Debian Edu Squeeze Manual is fully translated to German, French and "
"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
@@ -12291,9 +12238,6 @@ msgstr ""
"te geven."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-#| "Italian, Bokmal, Vietnamese and Chinese translations."
msgid ""
"Debian-edu-install: Slovak translation added, updates to German, Basque, "
"Italian, Bokmål, Vietnamese and Chinese translations."
@@ -12303,9 +12247,6 @@ msgstr ""
"Chinees zijn bijgewerkt."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Debian-edu-doc: improvements to Italian, Bokmal and German translations "
-#| "as well as overall content and layout"
msgid ""
"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
"well as overall content and layout"
@@ -12575,9 +12516,6 @@ msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
msgstr "Nieuwe functionaliteit in de uitgave \"3.0r1 Terra\" van 05-12-2007"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Much improved documentation with updated translations to German, "
-#| "Norwegian Bokmal and Italian"
msgid ""
"Much improved documentation with updated translations to German, Norwegian "
"Bokmål and Italian"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 3a74f33..1896470 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-17 10:27+0000\n"
+"POT-Creation-Date: 2014-12-21 18:24+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2122,8 +2122,8 @@ msgstr ""
msgid ""
"There is additional information available elsewhere in this manual: the "
"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
-"read by everyone who is familar with previous releases. And for those "
-"upgrading from a previous relase, make sure to read the <link linkend="
+"read by everyone who is familiar with previous releases. And for those "
+"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
@@ -4684,9 +4684,17 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"The solution for Chromium is similar, it needs the package "
-"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
-"which will install the (non-free) Pepper Flash Player web browser plugin "
-"from Google."
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
+"<computeroutput>contrib</computeroutput>) to be installed, which will "
+"install the (non-free) Adobe Flash Player web browser plugin."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the <computeroutput>pepperflashplugin-nonfree</"
+"computeroutput> package implements a more recent version of the Flash "
+"specification than does the <computeroutput>flashplugin-nonfree</"
+"computeroutput>, however."
msgstr ""
#. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index a276ea9..b6c9109 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -850,7 +850,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
</para></listitem></orderedlist>
<para>Adding users and workstations is described in detail below, so please read this chapter completely. It covers how to perform these minumum steps correctly as well, as other stuff that everybody will probably need to do.
</para>
-<para>There is additional information available elsewhere in this manual: the <link linkend="Features">New features in Jessie</link> chapter should be read by everyone who is familar with previous releases. And for those upgrading from a previous relase, make sure to read the <link linkend="Upgrades">Upgrades</link> chapter.
+<para>There is additional information available elsewhere in this manual: the <link linkend="Features">New features in Jessie</link> chapter should be read by everyone who is familiar with previous releases. And for those upgrading from a previous release, make sure to read the <link linkend="Upgrades">Upgrades</link> chapter.
</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> If generic DNS traffic is blocked out of your network and you need to use some specific DNS server to look up internet hosts, you need to tell the DNS server to use this server as its "forwarder". Update /etc/bind/named.conf.options and specify the IP address of the DNS server to use.
</para>
@@ -2013,7 +2013,9 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"]]></screen>
</para>
<para>To install the (non-free) Adobe Flash Player web browser plugin, install the <computeroutput>flashplugin-nonfree</computeroutput> Debian package from <computeroutput>contrib</computeroutput>. This requires <computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/sources.list</computeroutput>.
</para>
-<para>The solution for Chromium is similar, it needs the package <computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, which will install the (non-free) Pepper Flash Player web browser plugin from Google.
+<para>The solution for Chromium is similar, it needs the package <computeroutput>pepperflashplugin-nonfree</computeroutput> (also from <computeroutput>contrib</computeroutput>) to be installed, which will install the (non-free) Adobe Flash Player web browser plugin.
+</para>
+<para>Please note that the <computeroutput>pepperflashplugin-nonfree</computeroutput> package implements a more recent version of the Flash specification than does the <computeroutput>flashplugin-nonfree</computeroutput>, however.
</para>
</section>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list