[debian-edu-commits] debian-edu/ 01/01: jessie manual: update from the wiki, add paragraph about installation with Mate desktop
Holger Levsen
holger at moszumanska.debian.org
Thu Oct 16 13:25:34 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 075262a831ea3732935e21037eaafdc27cdd529e
Author: Holger Levsen <holger at layer-acht.org>
Date: Thu Oct 16 15:24:40 2014 +0200
jessie manual: update from the wiki, add paragraph about installation with Mate desktop
---
.../debian-edu-jessie-manual.da.po | 27 +++++++---
.../debian-edu-jessie-manual.de.po | 21 ++++++--
.../debian-edu-jessie-manual.es.po | 17 +++++-
.../debian-edu-jessie-manual.fr.po | 61 ++++++----------------
.../debian-edu-jessie-manual.it.po | 17 +++++-
.../debian-edu-jessie-manual.nb.po | 14 ++++-
.../debian-edu-jessie-manual.nl.po | 61 ++++++----------------
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 9 +++-
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 3 ++
9 files changed, 125 insertions(+), 105 deletions(-)
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 aabaf1f..a2e9afa 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-10-14 15:18+0300\n"
+"POT-Creation-Date: 2014-10-16 15:21+0300\n"
"PO-Revision-Date: 2014-10-13 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1815,6 +1815,21 @@ msgstr ""
"stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
"kerneopstartsparametrene."
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
+msgid ""
+"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
+"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"boot parameters."
+msgstr ""
+"For at installere <emphasis role=\"strong\">Xfce</emphasis>-skrivebordet i "
+"stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
+"kerneopstartsparametrene."
+
#. type: Content of: <article><section><section><section><title>
msgid "The installation process"
msgstr "Installationsprocessen"
@@ -9020,18 +9035,14 @@ msgid "Linux kernel 3.16.x"
msgstr "Linuxkerne version 3.16.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-#| "X and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-#| "the others see this manual.)"
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.)"
msgstr ""
-"Skrivebordsmiljøet KDE »Plasma« 4.11.12, GNOME 3.4, Xfce 4.10 og LXDE 0.5.6 og "
-"Mate 1.8 (KDE »Plasma« installeres som standard; for at vælge en af de andre "
-"så se i denne manual)."
+"Skrivebordsmiljøet KDE »Plasma« 4.11.12, GNOME 3.4, Xfce 4.10 og LXDE 0.5.6 "
+"og Mate 1.8 (KDE »Plasma« installeres som standard; for at vælge en af de "
+"andre så se i denne manual)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "the browsers Iceweasel 31 ESR and Chromium 37"
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 89d80a6..fbd26f6 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-10-14 15:18+0300\n"
+"POT-Creation-Date: 2014-10-16 15:21+0300\n"
"PO-Revision-Date: 2014-10-13 18:05+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1857,6 +1857,21 @@ msgstr ""
"installieren, verwenden Sie <computeroutput>desktop=xfce</computeroutput> "
"als zusätzlichen Kernel-Boot-Parameter."
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
+msgid ""
+"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
+"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"boot parameters."
+msgstr ""
+"Um alternativ den <emphasis role=\"strong\">Xfce</emphasis>-Desktop zu "
+"installieren, verwenden Sie <computeroutput>desktop=xfce</computeroutput> "
+"als zusätzlichen Kernel-Boot-Parameter."
+
#. type: Content of: <article><section><section><section><title>
msgid "The installation process"
msgstr "Der Installationprozess"
@@ -9258,10 +9273,6 @@ msgid "Linux kernel 3.16.x"
msgstr "Linux-Kernel in der Version 3.16.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-#| "X and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-#| "the others see this manual.)"
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 "
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 e3ac84d..00d9877 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-10-14 15:18+0300\n"
+"POT-Creation-Date: 2014-10-16 15:21+0300\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"
@@ -1857,6 +1857,21 @@ msgstr ""
"agregue <computeroutput>desktop=xfce</computeroutput> a los parámetros de "
"carga del kernel."
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
+msgid ""
+"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
+"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"boot parameters."
+msgstr ""
+"Para instalar el escritorio <emphasis role=\"strong\">Xfce</emphasis>, "
+"agregue <computeroutput>desktop=xfce</computeroutput> a los parámetros de "
+"carga del kernel."
+
#. type: Content of: <article><section><section><section><title>
msgid "The installation process"
msgstr "El proceso de instalación"
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 d01201c..cd8073b 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-10-14 15:18+0300\n"
+"POT-Creation-Date: 2014-10-16 15:21+0300\n"
"PO-Revision-Date: 2014-09-23 07:24+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -182,7 +182,6 @@ msgid "Network"
msgstr "Réseau"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/Debian_Edu_Network_Wheezy.png"
msgid "./images/Debian_Edu_Network_Jessie.png"
msgstr "./images/Debian_Edu_Network_Jessie.png"
@@ -1867,6 +1866,21 @@ msgstr ""
"place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
"d'initialisation du noyau."
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
+msgid ""
+"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
+"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"boot parameters."
+msgstr ""
+"Pour installer le bureau<emphasis role=\"strong\">LXDE</emphasis> à la "
+"place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
+"d'initialisation du noyau."
+
#. type: Content of: <article><section><section><section><title>
msgid "The installation process"
msgstr "Le processus d'installation"
@@ -4620,14 +4634,6 @@ msgstr ""
"(avant Wheezy)"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To upgrade from any older release, you will need to upgrade to the Wheezy-"
-#| "based Debian Edu release first, before you can follow the instructions "
-#| "provided above. Instructions are given in the <ulink url=\"https://wiki."
-#| "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu "
-#| "Wheezy</ulink> about how to upgrade to Wheezy from the previous release, "
-#| "Squeeze, and the Squeeze manual covers the one before that! (Lenny was "
-#| "it's name.)"
msgid ""
"To upgrade from any older release, you will need to upgrade to the Wheezy "
"based Debian Edu release first, before you can follow the instructions "
@@ -5195,10 +5201,6 @@ msgid "Upgrading with a CD or similar image"
msgstr "Mettre à jour avec un CD ou une image similaire"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Jessie 8.0~alpha+edu0 to 7.3+edu1) but you do not have Internet "
-#| "connectivity, only physical media, follow these steps:"
msgid ""
"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 "
@@ -7499,9 +7501,6 @@ msgstr ""
" comment=\"Tous les élèves de l'école\""
#. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "FIXME: it would be even better to first/also explain user groups for "
-#| "Windows with GOsa² (and then show an example for the command line)"
msgid ""
"FIXME: It would be even better to first/also explain user groups for Windows "
"with GOsa² (and then show an example for the command line)"
@@ -8135,11 +8134,6 @@ msgid "Samba in Debian Edu"
msgstr "Samba dans Debian Edu"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
-#| "style domain controller with Windows XP, Windows Vista and Windows 7 as "
-#| "clients. After a machine has joined the domain, this machine can be fully "
-#| "managed with GOsa²."
msgid ""
"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
"prepared for use as an NT4-style domain controller with Windows XP, Windows "
@@ -9280,9 +9274,6 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nouvelles fonctionnalités dans Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 8.0~alpha+edu0 Codename Jessie released "
-#| "2013-09-28"
msgid ""
"New features for Debian Edu 8.0~alpha+edu0 Codename Jessie released 2015-XX-"
"YY"
@@ -9329,15 +9320,10 @@ msgid "Everything which is new in Debian Jessie 8.0, eg:"
msgstr "Toutes les nouveautés de Debian Jessie 8.0, comme par exemple :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Linux kernel 3.2.x"
msgid "Linux kernel 3.16.x"
msgstr "Noyau Linux version 3.16.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and "
-#| "LXDE 0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce "
-#| "or LXDE: see manual.)"
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 "
@@ -9348,22 +9334,18 @@ msgstr ""
"des autres, consultez ce manuel)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Web browser Iceweasel 17 ESR"
msgid "the browsers Iceweasel 31 ESR and Chromium 37"
msgstr "Navigateurs web Iceweasel 31 ESR et Chromium 37"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LibreOffice 3.5.4"
msgid "LibreOffice 4.3.2"
msgstr "LibreOffice 4.3.2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Educational toolbox GCompris 12.01"
msgid "Educational toolbox GCompris 14.07"
msgstr "Boîte à outils éducative GCompris 14.07"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Music creator Rosegarden 10.04.2"
msgid "Music creator Rosegarden 14.02"
msgstr "Créateur de musique Rosegarden 14.02"
@@ -9372,7 +9354,6 @@ msgid "GOsa 2.7.4"
msgstr "GOsa 2.7.4"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LTSP 5.4.2"
msgid "LTSP 5.5.3"
msgstr "LSTP 5.5.3"
@@ -9381,8 +9362,6 @@ msgid "new boot framework: systemd"
msgstr "nouvelle suite de logiciels d'amorçage : systemd"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Debian Jessie includes about 37000 packages available for installation."
msgid "Debian Jessie includes about 42000 packages available for installation."
msgstr "Debian Jessie contient environ 42 000 paquets prêts à être installés."
@@ -9411,10 +9390,6 @@ msgstr ""
"Ces chaînes sont maintenant disponibles en 29 langues."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The Debian Edu Jessie Manual is fully translated to German, French, "
-#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
-#| "and Spanish."
msgid ""
"The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
@@ -9718,7 +9693,7 @@ msgstr ""
"langue s'il n'existe pas déjà et comment mettre à jour les traductions."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -10546,8 +10521,6 @@ msgid "Appendix C - Features in older releases"
msgstr "Annexe C — Fonctionnalités dans les publications précédentes"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgstr ""
"Nouvelles fonctionnalités de Debian Edu 7.1+edu0 Wheezy, publiée le "
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 24aafaf..e3d9124 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-10-14 15:18+0300\n"
+"POT-Creation-Date: 2014-10-16 15:21+0300\n"
"PO-Revision-Date: 2014-06-26 19:17+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1841,6 +1841,21 @@ msgstr ""
"aggiungere <computeroutput>desktop=xfce</computeroutput> ai parametri di "
"avvio del kernel."
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
+msgid ""
+"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
+"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"boot parameters."
+msgstr ""
+"Per installare il desktop <emphasis role=\"strong\">Xfce</emphasis>, "
+"aggiungere <computeroutput>desktop=xfce</computeroutput> ai parametri di "
+"avvio del kernel."
+
#. type: Content of: <article><section><section><section><title>
msgid "The installation process"
msgstr "Il processo d'installazione"
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 fab6f65..c705dca 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-10-14 15:18+0300\n"
+"POT-Creation-Date: 2014-10-16 15:21+0300\n"
"PO-Revision-Date: 2014-06-15 16:48+0200\n"
"Last-Translator: Ole-Erik Yrvin <oeyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -1888,6 +1888,18 @@ msgstr ""
"til <computeroutput>desktop=gnome</computeroutput> i kjernens boot "
"parametere. "
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+msgid ""
+"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
+"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"boot parameters."
+msgstr ""
+"for å installere <emphasis role=\"strong\">GNOME</emphasis> skrivebordsmiljø "
+"i stedet for <emphasis role=\"strong\">KDE</emphasis> skrivebordsmiljø, legg "
+"til <computeroutput>desktop=gnome</computeroutput> i kjernens boot "
+"parametere. "
+
#. type: Content of: <article><section><section><section><title>
#, fuzzy
msgid "The installation process"
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 0d8bb7b..32c316d 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-10-14 15:18+0300\n"
+"POT-Creation-Date: 2014-10-16 15:21+0300\n"
"PO-Revision-Date: 2014-10-15 21:53+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -182,7 +182,6 @@ msgid "Network"
msgstr "Het netwerk"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/Debian_Edu_Network_Wheezy.png"
msgid "./images/Debian_Edu_Network_Jessie.png"
msgstr "./images/Debian_Edu_Network_Wheezy.png"
@@ -1898,6 +1897,21 @@ msgstr ""
"installeren, moet u <computeroutput>desktop=xfce</computeroutput> toevoegen "
"als opstartparameter van de kernel."
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
+msgid ""
+"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
+"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"boot parameters."
+msgstr ""
+"Om de <emphasis role=\"strong\">Xfce</emphasis> bureaubladomgeving te "
+"installeren, moet u <computeroutput>desktop=xfce</computeroutput> toevoegen "
+"als opstartparameter van de kernel."
+
#. type: Content of: <article><section><section><section><title>
msgid "The installation process"
msgstr "Het installatieproces"
@@ -4693,14 +4707,6 @@ msgstr ""
"Wheezy)"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To upgrade from any older release, you will need to upgrade to the Wheezy-"
-#| "based Debian Edu release first, before you can follow the instructions "
-#| "provided above. Instructions are given in the <ulink url=\"https://wiki."
-#| "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu "
-#| "Wheezy</ulink> about how to upgrade to Wheezy from the previous release, "
-#| "Squeeze, and the Squeeze manual covers the one before that! (Lenny was "
-#| "it's name.)"
msgid ""
"To upgrade from any older release, you will need to upgrade to the Wheezy "
"based Debian Edu release first, before you can follow the instructions "
@@ -5278,10 +5284,6 @@ msgid "Upgrading with a CD or similar image"
msgstr "Opwaarderen met behulp van een cd of een gelijksoortig image"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Jessie 8.0~alpha+edu0 to 7.3+edu1) but you do not have Internet "
-#| "connectivity, only physical media, follow these steps:"
msgid ""
"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 "
@@ -7626,9 +7628,6 @@ msgstr ""
" comment=\"Alle leerlingen van de school\""
#. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "FIXME: it would be even better to first/also explain user groups for "
-#| "Windows with GOsa² (and then show an example for the command line)"
msgid ""
"FIXME: It would be even better to first/also explain user groups for Windows "
"with GOsa² (and then show an example for the command line)"
@@ -8268,11 +8267,6 @@ msgid "Samba in Debian Edu"
msgstr "Samba in Debian Edu"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
-#| "style domain controller with Windows XP, Windows Vista and Windows 7 as "
-#| "clients. After a machine has joined the domain, this machine can be fully "
-#| "managed with GOsa²."
msgid ""
"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
"prepared for use as an NT4-style domain controller with Windows XP, Windows "
@@ -9424,9 +9418,6 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nieuwe functionaliteit in Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 8.0~alpha+edu0 Codename Jessie released "
-#| "2013-09-28"
msgid ""
"New features for Debian Edu 8.0~alpha+edu0 Codename Jessie released 2015-XX-"
"YY"
@@ -9474,15 +9465,10 @@ msgid "Everything which is new in Debian Jessie 8.0, eg:"
msgstr "Alles wat nieuw is in Debian Jessie 8.0, bijvoorbeeld:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Linux kernel 3.2.x"
msgid "Linux kernel 3.16.x"
msgstr "Linux kernel versie 3.16.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and "
-#| "LXDE 0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce "
-#| "or LXDE: see manual.)"
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 "
@@ -9493,22 +9479,18 @@ msgstr ""
"deze handleiding om een van de andere te kiezen.)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Web browser Iceweasel 17 ESR"
msgid "the browsers Iceweasel 31 ESR and Chromium 37"
msgstr "de webbrowsers Iceweasel 32 ESR en Chromium 37"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LibreOffice 3.5.4"
msgid "LibreOffice 4.3.2"
msgstr "LibreOffice 4.3.2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Educational toolbox GCompris 12.01"
msgid "Educational toolbox GCompris 14.07"
msgstr "Gereedschapskist voor het onderwijs GCompris versie 14.07"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Music creator Rosegarden 10.04.2"
msgid "Music creator Rosegarden 14.02"
msgstr "Programma voor muziekcreatie Rosegarden 14.02"
@@ -9517,7 +9499,6 @@ msgid "GOsa 2.7.4"
msgstr "GOsa 2.7.4"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LTSP 5.4.2"
msgid "LTSP 5.5.3"
msgstr "LTSP 5.5.3"
@@ -9526,8 +9507,6 @@ msgid "new boot framework: systemd"
msgstr "nieuw raamwerk voor het opstarten van computers: systemd"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Debian Jessie includes about 37000 packages available for installation."
msgid "Debian Jessie includes about 42000 packages available for installation."
msgstr ""
"Debian Jessie stelt ongeveer 42.000 pakketten ter beschikking, klaar voor "
@@ -9558,10 +9537,6 @@ msgstr ""
"gebruikt worden. Deze sjablonen zijn nu in 29 talen beschikbaar."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The Debian Edu Jessie Manual is fully translated to German, French, "
-#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
-#| "and Spanish."
msgid ""
"The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
@@ -9873,7 +9848,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 "
@@ -10698,8 +10673,6 @@ msgid "Appendix C - Features in older releases"
msgstr "Bijlage C - Functionaliteit in oudere uitgaven"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgstr ""
"Nieuwe functionaliteit in Debian Edu 7.1+edu0, codenaam Wheezy, uitgebracht "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index cfadad4..61ec91f 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-10-14 15:18+0300\n"
+"POT-Creation-Date: 2014-10-16 15:21+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1364,6 +1364,13 @@ msgid ""
"parameters."
msgstr ""
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
+"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"boot parameters."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "The installation process"
msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 1154244..dce16cd 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -569,6 +569,9 @@
</para></listitem>
<listitem>
<para>To install the <emphasis role="strong">Xfce</emphasis> desktop instead, add <computeroutput>desktop=xfce</computeroutput> to the kernel boot parameters.
+</para></listitem>
+<listitem>
+<para>And to install the <emphasis role="strong">Mate</emphasis> desktop instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel boot parameters.
</para></listitem></itemizedlist>
</section>
</section>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list