[debian-edu-commits] debian-edu/ 01/03: Update Debian Edu Stretch manual from the wiki.
Holger Levsen
holger at layer-acht.org
Sun May 28 15:11:30 UTC 2017
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 7c8d768237f9d43a32354628f35d4b709d56b9b2
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun May 28 17:08:39 2017 +0200
Update Debian Edu Stretch manual from the wiki.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
debian/changelog | 6 +
.../debian-edu-stretch-manual.da.po | 6 +-
.../debian-edu-stretch-manual.de.po | 17 +-
.../debian-edu-stretch-manual.es.po | 6 +-
.../debian-edu-stretch-manual.fr.po | 6 +-
.../debian-edu-stretch-manual.it.po | 68 ++-----
.../debian-edu-stretch-manual.ja.po | 13 +-
.../debian-edu-stretch-manual.nb.po | 197 ++++++++++-----------
.../debian-edu-stretch-manual.nl.po | 13 +-
.../debian-edu-stretch-manual.pl.po | 6 +-
.../debian-edu-stretch-manual.pot | 6 +-
.../debian-edu-stretch-manual.xml | 2 +-
.../debian-edu-stretch-manual.zh.po | 6 +-
13 files changed, 162 insertions(+), 190 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 56e08ba..13b9ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu-doc (1.921~20170603) UNRELEASED; urgency=medium
+
+ * Update Debian Edu Stretch manual from the wiki.
+
+ -- Holger Levsen <holger at debian.org> Sun, 28 May 2017 17:08:47 +0200
+
debian-edu-doc (1.920~20170528) unstable; urgency=medium
* Update Debian Edu Stretch manual from the wiki.
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index f4b15e3..151707e 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2016-10-06 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -7220,8 +7220,8 @@ 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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
"Brugere vil være i stand til at vælge ethvert af de fem skrivebordsmiljøer "
"via logindhåndteringen før de logger ind. Selvfølgelig kan du vælge at give "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index 1120382..013d02b 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2017-05-26 19:10+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -6716,12 +6716,19 @@ msgstr ""
" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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 less choices. Keep in mind that there will be several programs for "
+#| "the same purpose (like file managers, editors, PDF viewers...) if more "
+#| "than one DE is installed; this might confuse users."
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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
"Benutzer können dann über den Anmeldemanager vor dem Anmelden wählen, welche "
"der fünf graphischen Arbeitsumgebungen verwendet werden soll. Die Auswahl "
@@ -10438,8 +10445,8 @@ msgstr ""
"translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
"Sprache anlegen und wie Übersetzungen aktualisiert werden."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index 224d8cc..22d7e6d 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2015-03-30 22:30+0000\n"
"Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -6611,8 +6611,8 @@ 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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index 49bb881..8200ba0 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2015-06-22 10:34+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -7505,8 +7505,8 @@ 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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
"Les utilisateurs pourront choisir parmi les cinq environnements de bureau à "
"partir du gestionnaire de connexion avant de s'identifier. Bien sûr, vous "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index 5eee886..1651df0 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2017-05-27 18:32+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1572,11 +1572,6 @@ msgid "Request a CD / DVD by mail"
msgstr "Richiedere un CD/DVD per posta"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "For those without a fast Internet connection, we can offer a CD or DVD "
-#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
-#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
-#| "will discuss the payment details (for shipping and media)"
msgid ""
"For those without a fast Internet connection, we can offer a CD or DVD sent "
"for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
@@ -4886,7 +4881,6 @@ msgid "the GOsa² gui is working,"
msgstr "la gui di GOsa² sta funzionando,"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Introduction to thin clients and diskless workstations"
msgid "if one is able to connect LTSP clients and workstations,"
msgstr "se si è in grado di collegare client LTSP e workstation,"
@@ -4937,7 +4931,6 @@ msgstr ""
"service nslcd start"
#. type: Content of: <article><section><section><section><title>
-#| msgid "Upgrade LTSP chroot (default arch i386)"
msgid "Upgrading LTSP chroots (default arch i386)"
msgstr "Aggiornare la chroot di LTSP (default arch i386)"
@@ -4954,14 +4947,6 @@ msgstr ""
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "ltsp-chroot -m -a i386 apt-get update\n"
-#| "ltsp-chroot -m -a i386 apt-get -y upgrade\n"
-#| "sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-#| "ltsp-chroot -m -a i386 apt-get update\n"
-#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-#| "ltsp-chroot -m -a i386 apt-get -f install\n"
-#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
msgid ""
"ltsp-chroot -m -a i386 apt update\n"
"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
@@ -4980,18 +4965,15 @@ msgstr ""
"ltsp-chroot -m -a i386 apt -y full-upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Cleaning up."
msgid "Cleaning up:"
msgstr "Ripulire:"
#. type: CDATA
#, no-wrap
-#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr "ltsp-chroot -m -a i386 apt --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Update LTSP support on the server side."
msgid "Update LTSP support on the server side:"
msgstr "Aggiornare il supporto LTSP sul lato server:"
@@ -5007,10 +4989,6 @@ msgstr ""
"ltsp-update-image"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-#| "computeroutput> on the main server to point to <computeroutput>/var/lib/"
-#| "tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
msgid ""
"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
"could be used instead; see <computeroutput>man ltsp-update-image</"
@@ -6631,12 +6609,19 @@ msgstr ""
" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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 less choices. Keep in mind that there will be several programs for "
+#| "the same purpose (like file managers, editors, PDF viewers...) if more "
+#| "than one DE is installed; this might confuse users."
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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
"Gli utenti, quindi, potranno scegliere uno dei cinque ambienti desktop "
"attraverso il gestore degli accessi prima di effettuare il login. "
@@ -8872,10 +8857,6 @@ msgstr ""
"su \"OK\""
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "After the reboot, when you login the first time, click on the \"Options "
-#| ">>\" button and select the domain SKOLELINUX instead of the local "
-#| "domain (\"this computer\")"
msgid ""
"After the reboot, when you login the first time, click on the \"Options >"
">\" button and select the domain SKOLELINUX instead of the local domain "
@@ -9369,12 +9350,6 @@ msgid "Using email"
msgstr "Usare la posta elettronica"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "All users can send and receive mails within the internal network. To "
-#| "allow mail outside the internal network, the administrator needs to "
-#| "configure the mailserver <computeroutput>exim4</computeroutput> to suit "
-#| "the local situation, starting with <computeroutput>dpkg-reconfigure exim4-"
-#| "config</computeroutput>."
msgid ""
"All users can send and receive mails within the internal network; self-"
"signed certificates are provided to allow TLS secured connections. To allow "
@@ -9441,9 +9416,6 @@ msgid "Click 'Done'"
msgstr "Click su 'Done'"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "First time accessing the inbox click 'Confirm Security Exception' to "
-#| "accept the certificate"
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
"the certificate; same applies if sending mail for the first time."
@@ -9854,14 +9826,12 @@ msgid "Iceweasel has been re-renamed to Firefox!"
msgstr "Iceweasel è stato rinominato come Firefox!"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Icedove has been re-renamed to Thunderbird."
msgid ""
"Icedove has been re-renamed to Thunderbird and is now installed by default."
msgstr ""
"Icedove è stato rinominato come Thunderbird ed è ora installato di default."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LibreOffice 5.2.5"
msgid "LibreOffice 5.2.6"
msgstr "LibreOffice 5.2.6"
@@ -9923,9 +9893,6 @@ msgstr ""
"giapponese è stata appena aggiunta per Stretch."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Partly translated versions exists for Spanish, Polish and Simplified "
-#| "Chinese."
msgid ""
"Partly translated versions exist for Spanish, Polish and Simplified Chinese."
msgstr ""
@@ -10068,14 +10035,6 @@ msgstr ""
"2012, 2013) rilasciata sotto licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014, 2015, 2016, 2017), Håvard Korsvoll (2007-2009), Tore Skogly (2008), "
-#| "Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014, "
-#| "2016, 2017), 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."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015, 2016, 2017), Håvard Korsvoll (2007-2009), Tore Skogly (2008), "
@@ -10182,11 +10141,6 @@ msgid "Translations of this document"
msgstr "Traduzioni di questo documento"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "Versions of this document fully translated into German, Italian, French, "
-#| "Danish, Dutch and Norwegian Bokmål are available. An incomplete "
-#| "translation exists for Spanish. This is an <ulink url=\"http://maintainer."
-#| "skolelinux.org/debian-edu-doc/\">online overview of all languages</ulink>."
msgid ""
"Versions of this document translated into German, Italian, French, Danish, "
"Dutch, Norwegian Bokmål and Japanese are available. Incomplete translations "
@@ -10335,7 +10289,7 @@ msgstr ""
"lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index b28a1e7..5b482ff 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2017-02-24 06:55+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -6385,12 +6385,19 @@ msgstr ""
" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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 less choices. Keep in mind that there will be several programs for "
+#| "the same purpose (like file managers, editors, PDF viewers...) if more "
+#| "than one DE is installed; this might confuse users."
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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
"そうするとユーザはログイン前にログインマネージャー経由で 5つのデスクトップ環"
"境から任意に選択できるようになります。もちろんこの選択の幅を狭めることもでき"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index e202628..63114c4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2017-05-28 05:52+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -1380,8 +1380,7 @@ msgstr ""
" service networking start\n"
" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
" service enable-nat restart\n"
-" # Det kan hende du ønsker en brannmur (shorewall eller ufw) og "
-"trafikkforming.\n"
+" # Det kan hende du ønsker en brannmur (shorewall eller ufw) og trafikkforming.\n"
" #apt update\n"
" #apt install shorewall\n"
" # or\n"
@@ -2836,10 +2835,10 @@ msgstr ""
"system med en nettleser installert som kan bli hoverdtjeneren selv hvis den "
"var installert som en såkalt kombinerttjener (hoved-, LTSP-tjener- + "
"arbeidsstasjonsprofiler). Dersom ikke alle de førnevnte er tilgjengelige, se "
-"<link linkend=\"Administration"
-"--Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-\">"
-"Installasjon av en grafisk omgivelse på hovedtjeneren for å bruke "
-"GOsa²</link>."
+"<link linkend=\"Administration--"
+"Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+"\">Installasjon av en grafisk omgivelse på hovedtjeneren for å bruke GOsa²</"
+"link>."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4444,9 +4443,9 @@ msgid ""
"permitted by applicable law.</emphasis>"
msgstr ""
"Før du leser denne oppgraderingsveiledningen, så vær oppmerksom på at du "
-"gjør dette på en tjener i drift på egen risiko. <emphasis role='strong'>"
-"Debian Edu/Skolelinux kommer med ABSOLUTT HELT UTEN GARANTI, i det omfang "
-"som er tillatt av relevante lover.</emphasis>"
+"gjør dette på en tjener i drift på egen risiko. <emphasis "
+"role='strong'>Debian Edu/Skolelinux kommer med ABSOLUTT HELT UTEN GARANTI, i "
+"det omfang som er tillatt av relevante lover.</emphasis>"
#. type: Content of: <article><section><para>
msgid ""
@@ -4798,8 +4797,7 @@ msgid ""
"rm -rm /etc/php5"
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
-"apt purge debian-edu-artwork-lines # Bare hvis den ikke ønskes som "
-"alternativt tema.\n"
+"apt purge debian-edu-artwork-lines # Bare hvis den ikke ønskes som alternativt tema.\n"
"dpkg -P php5-imagick\n"
"rm -rm /etc/php5"
@@ -4944,9 +4942,9 @@ msgid ""
"could be used instead; see <computeroutput>man ltsp-update-image</"
"computeroutput>."
msgstr ""
-"For å spare diskplass kan <computeroutput>ltsp-update-image "
-"-n</computeroutput> brukes i stedet, se <computeroutput>man ltsp-update-"
-"image</computeroutput>."
+"For å spare diskplass kan <computeroutput>ltsp-update-image -n</"
+"computeroutput> brukes i stedet, se <computeroutput>man ltsp-update-image</"
+"computeroutput>."
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
@@ -5010,8 +5008,8 @@ msgstr "Veiledning"
msgid ""
"HowTos for <link linkend=\"Administration\">general administration</link>"
msgstr ""
-"Oppskrifter for <link linkend=\"Administration\">generell "
-"administrasjon</link>"
+"Oppskrifter for <link linkend=\"Administration\">generell administrasjon</"
+"link>"
#. type: Content of: <article><section><itemizedlist><listitem><para>
msgid ""
@@ -6088,9 +6086,7 @@ msgstr ""
" chown $user:$group $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already exists."
-"\\n"
-"\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
" fi\n"
" done\n"
" echo \"$created_dir folders have been created\""
@@ -6177,9 +6173,7 @@ msgstr ""
" ln -s /media/$home $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already exists."
-"\\n"
-"\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
" fi\n"
" done\n"
" echo \"$created_dir folders has been created\""
@@ -6322,8 +6316,7 @@ msgstr ""
"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: nas-server\n"
-" automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-"
-"server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+" automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
"\n"
" add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: top\n"
@@ -6333,8 +6326,7 @@ msgstr ""
" add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: /\n"
-" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize="
-"32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -6545,16 +6537,22 @@ msgid ""
" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
msgstr ""
"apt update\n"
-" apt install education-desktop-gnome education-desktop-lxde education-"
-"desktop-xfce education-desktop-mate"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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 less choices. Keep in mind that there will be several programs for "
+#| "the same purpose (like file managers, editors, PDF viewers...) if more "
+#| "than one DE is installed; this might confuse users."
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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
"Brukerne vil da kunne velge blant alle de fem skrivebordsmiljøene via "
"innloggingsvinduet før de logger seg inn. Du kan selvfølgelig også velge å "
@@ -6891,8 +6889,7 @@ msgid ""
"(3)Execute 'ltsp-update-kernels'\n"
"(4)Execute 'ltsp-update-image'"
msgstr ""
-"(1) Åpne filen /opt/ltsp/i386/etc/ltsp/update-kernels.conf med en "
-"redigerer\n"
+"(1) Åpne filen /opt/ltsp/i386/etc/ltsp/update-kernels.conf med en redigerer\n"
" og erstatt linjen\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"med \n"
@@ -7010,8 +7007,7 @@ msgid ""
"d-i apt-setup/local1/key string http://example.org/key.asc"
msgstr ""
"#legg til skoleprosjektets lokale pakkebrønn\n"
-"d-i apt-setup/local1/repository string http://example.org/debian "
-"stable main contrib non-free\n"
+"d-i apt-setup/local1/repository string http://example.org/debian stable main contrib non-free\n"
"d-i apt-setup/local1/comment string Example Software Repository\n"
"d-i apt-setup/local1/source boolean true\n"
"d-i apt-setup/local1/key string http://example.org/key.asc"
@@ -7518,8 +7514,7 @@ msgstr ""
" for i in $MY_SERVER_LIST; do\n"
" rank=$RANDOM\n"
" let \"rank %= 100\"\n"
-" TMP_LIST=\"$TMP_LIST\\n"
-"${rank}_$i\"\n"
+" TMP_LIST=\"$TMP_LIST\\n${rank}_$i\"\n"
" done\n"
" TMP_LIST=$(echo -e $TMP_LIST | sort)\n"
" for i in $TMP_LIST; do\n"
@@ -7646,12 +7641,11 @@ msgid ""
"regardless of brand or model) and set <computeroutput>socket://<LTSP "
"client ip>:9100</computeroutput> as connection URI."
msgstr ""
-"Sett opp skriveren med nettgrensesnittet "
-"<computeroutput>https://www:631</computeroutput> på hovedtjeneren; velg type "
-"nettverkskriver; <computeroutput>AppSocket/HP JetDirect</computeroutput> ("
-"for alle skrivere uavhengig av merke eller modell), og sett "
-"<computeroutput>socket://<LTSP client ip>:9100</computeroutput> som "
-"URI-forbindelse."
+"Sett opp skriveren med nettgrensesnittet <computeroutput>https://www:631</"
+"computeroutput> på hovedtjeneren; velg type nettverkskriver; "
+"<computeroutput>AppSocket/HP JetDirect</computeroutput> (for alle skrivere "
+"uavhengig av merke eller modell), og sett <computeroutput>socket://<LTSP "
+"client ip>:9100</computeroutput> som URI-forbindelse."
#. type: Content of: <article><section><section><section><title>
msgid "Upgrading the LTSP environment"
@@ -7678,8 +7672,7 @@ msgid ""
"exit\n"
"ltsp-update-image"
msgstr ""
-"ltsp-chroot -a i386 # dette kjører \"chroot /opt/ltsp/i386\" med mer, "
-"f.eks. hindrer det at nisser startes opp\n"
+"ltsp-chroot -a i386 # dette kjører \"chroot /opt/ltsp/i386\" med mer, f.eks. hindrer det at nisser startes opp\n"
"apt update\n"
"apt upgrade\n"
"apt full-upgrade\n"
@@ -8771,9 +8764,9 @@ msgid ""
">\" button and select the domain SKOLELINUX instead of the local domain "
"(\"this computer\")."
msgstr ""
-"Etter omstart, når du har logget inn første gang, klikk på "
-"«Alternativer>>»-knappen, og velg domenet SKOLELINUX i stedet for det "
-"lokale domenet («denne datamaskinen»)."
+"Etter omstart, når du har logget inn første gang, klikk på «Alternativer>"
+">»-knappen, og velg domenet SKOLELINUX i stedet for det lokale domenet "
+"(«denne datamaskinen»)."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -8843,9 +8836,9 @@ msgid ""
">\" button and select the domain SKOLELINUX instead of the local domain "
"(\"this computer\")"
msgstr ""
-"Etter omstart, når du har logget inn første gang, klikk på "
-"«Alternativer>>»-knappen, og velg domenet SKOLELINUX i stedet for det "
-"lokale domenet («denne datamaskinen»)."
+"Etter omstart, når du har logget inn første gang, klikk på «Alternativer>"
+">»-knappen, og velg domenet SKOLELINUX i stedet for det lokale domenet "
+"(«denne datamaskinen»)."
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
@@ -9058,8 +9051,7 @@ msgid ""
"# extract the file\n"
"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
msgstr ""
-"# Flytt tar.gz filen til en depotkatalog på skolens nettverkets webroot (i "
-"utgangspunktet plassert på tjener):\n"
+"# Flytt tar.gz filen til en depotkatalog på skolens nettverkets webroot (i utgangspunktet plassert på tjener):\n"
"root at tjener:~# \n"
"mkdir /etc/debian-edu/www/debian\n"
"mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -9369,8 +9361,8 @@ msgid ""
"computeroutput>) can be used to change audio volume."
msgstr ""
"På tynne klienter, <computeroutput>pavucontrol</computeroutput> eller "
-"<computeroutput>alsamixer</computeroutput> (men ikke "
-"<computeroutput>kmix</computeroutput>) kan brukes til å endre volumet."
+"<computeroutput>alsamixer</computeroutput> (men ikke <computeroutput>kmix</"
+"computeroutput>) kan brukes til å endre volumet."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9477,9 +9469,9 @@ msgstr ""
"<ulink url=\"http://lists.debian.org/debian-edu\">E-postlisten for "
"utviklere</ulink> er for det meste den viktigste kommunikasjonskanalen. Vi "
"har også månedlige møter på IRC på #debian-edu på irc.oftc.net, og noen "
-"ganger i året fysiske møter på utviklersamlinger.<ulink url = \""
-"http://wiki.debian.org/DebianEdu/NewContributor\">Nye bidragsytere </ulink>"
-"bør lese vår <ulink url=\"http://wiki.debian.org/DebianEdu/ArchivePolicy\"/>."
+"ganger i året fysiske møter på utviklersamlinger.<ulink url = \"http://wiki."
+"debian.org/DebianEdu/NewContributor\">Nye bidragsytere </ulink>bør lese vår "
+"<ulink url=\"http://wiki.debian.org/DebianEdu/ArchivePolicy\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9775,10 +9767,10 @@ msgid ""
"ulink> and the <ulink url=\"http://www.debian.org/releases/stretch/"
"installmanual\">installation manual</ulink>."
msgstr ""
-"Mer informasjon om Debian 9 Stretch kan man finne i <ulink url=\""
-"http://www.debian.org/releases/jessie/releasenotes\">utgavenotatene</ulink> "
-"og <ulink url=\"http://www.debian.org/releases/jessie/installmanual\""
-">installasjonshåndboken</ulink>."
+"Mer informasjon om Debian 9 Stretch kan man finne i <ulink url=\"http://www."
+"debian.org/releases/jessie/releasenotes\">utgavenotatene</ulink> og <ulink "
+"url=\"http://www.debian.org/releases/jessie/installmanual"
+"\">installasjonshåndboken</ulink>."
#. type: Content of: <article><section><section><section><title>
msgid "Documentation and translation updates"
@@ -9984,8 +9976,8 @@ msgid ""
"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) 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, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) og "
+"Opphavsretten til den italienske oversettelsen tilhører Claudio Carboncini "
+"(2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) og "
"Beatrice Torracca (2013-2014), og er gitt ut i henhold til GPL v2 eller en "
"senere utgave."
@@ -9997,10 +9989,10 @@ msgid ""
"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 GPL v2 eller en "
+"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 GPL v2 eller en "
"senere versjon."
#. type: Content of: <article><section><para>
@@ -10032,8 +10024,8 @@ msgid ""
"The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
"and is released under the GPL v2 or any later version."
msgstr ""
-"Opphavsretten til den polske oversettelsen tilhører Stanisław Krukowski ("
-"2016, 2017) og er utgitt under GPL v2 eller senere versjoner."
+"Opphavsretten til den polske oversettelsen tilhører Stanisław Krukowski "
+"(2016, 2017) og er utgitt under GPL v2 eller senere versjoner."
#. type: Content of: <article><section><para>
msgid ""
@@ -10041,9 +10033,9 @@ msgid ""
"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
"any later version."
msgstr ""
-"Opphavsretten for oversettelsen på forenklet kinesisk tilhører Ma Yong ("
-"2016, 2017), Boyuan Yang (2017) og Roy Zhang (2017) og er gjort tilgjengelig "
-"med vilkårene til GPL v2 eller en senere versjon."
+"Opphavsretten for oversettelsen på forenklet kinesisk tilhører Ma Yong "
+"(2016, 2017), Boyuan Yang (2017) og Roy Zhang (2017) og er gjort "
+"tilgjengelig med vilkårene til GPL v2 eller en senere versjon."
#. type: Content of: <article><section><title>
msgid "Translations of this document"
@@ -10085,10 +10077,10 @@ msgstr ""
"dokumentet plassert i PO-filer. Mer informasjon om prosessen finnes i "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-stretch-"
"manual-translations </computeroutput>. Dette Git-arkivet (se nedenfor) "
-"inneholder også denne filen. Ta en titt der og på <ulink url = \""
-"https://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">"
-"språkspesifikke konvensjoner</ulink> hvis du ønsker å bidra til å oversette "
-"dette dokumentet."
+"inneholder også denne filen. Ta en titt der og på <ulink url = \"https://"
+"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#"
+"\">språkspesifikke konvensjoner</ulink> hvis du ønsker å bidra til å "
+"oversette dette dokumentet."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -10132,9 +10124,9 @@ msgid ""
msgstr ""
"Hvis du bare ønsker å oversette, trenger du bare å sjekke ut noen få filer "
"fra Git (som kan gjøres anonymt). Send inn en feilrapport mot debian-edu-doc "
-"og legg ved PO-filen til <ulink url =\"http://bugs.debian.org/debian-edu-"
-"doc\">feilrapporten</ulink>. Se <ulink url =\"http://bugs.debian.org\">"
-"instruksjoner om hvordan du sender inn feilrapporter</ulink> for mer "
+"og legg ved PO-filen til <ulink url =\"http://bugs.debian.org/debian-edu-doc"
+"\">feilrapporten</ulink>. Se <ulink url =\"http://bugs.debian.org"
+"\">instruksjoner om hvordan du sender inn feilrapporter</ulink> for mer "
"informasjon."
#. type: Content of: <article><section><section><section><para>
@@ -10226,8 +10218,8 @@ msgid ""
"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
"Hvis du er ny når det gjelder Git, sjekk ut boken <ulink url=\"http://git-"
-"scm.com/book\">Pro Git</ulink>, den har et kapittel om <ulink url=\"http"
-"://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository\"> å "
+"scm.com/book\">Pro Git</ulink>, den har et kapittel om <ulink url=\"http://"
+"git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository\"> å "
"registrere endringer i arkivet kodelageret</ulink>. Det kan også være lurt å "
"se på <computeroutput>gitk</computeroutput>-pakken som gir et GUI for Git."
@@ -10266,8 +10258,8 @@ msgid ""
"copyright owners."
msgstr ""
"Opphavsrett © 2007-2017 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > og andre, se <link linkend=\""
-"CopyRight\">opphavsrettskapitlet</link> for den fulle listen med personer "
+"acht.org\">holger at layer-acht.org</ulink> > og andre, se <link linkend="
+"\"CopyRight\">opphavsrettskapitlet</link> for den fulle listen med personer "
"med opphavsrett."
#. type: Content of: <article><section><section><para>
@@ -10983,11 +10975,10 @@ msgid ""
"the live images. Not all locales have translations installed, though. The "
"keyboard layout names can be found in /usr/share/keymaps/i386/."
msgstr ""
-"En fullstendig liste over lokale koder er tilgjengelig i "
-"<computeroutput>/usr/share/i18n/SUPPORTED</computeroutput>, men LiveCD/DVD-"
-"er støtter bare UTF-8 lokalkoder. Ikke alle lokaliteter har oversettelser "
-"installert, men navn på tastaturutforminger finner man i "
-"/usr/share/keymaps/i386/."
+"En fullstendig liste over lokale koder er tilgjengelig i <computeroutput>/"
+"usr/share/i18n/SUPPORTED</computeroutput>, men LiveCD/DVD-er støtter bare "
+"UTF-8 lokalkoder. Ikke alle lokaliteter har oversettelser installert, men "
+"navn på tastaturutforminger finner man i /usr/share/keymaps/i386/."
#. type: Content of: <article><section><section><title>
msgid "Stuff to know"
@@ -11025,9 +11016,9 @@ msgid ""
"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
"stretch-live/</computeroutput>."
msgstr ""
-"Diskbildet vil bli (men i øyeblikket ikke) tilgjengelig via <ulink url=\""
-"ftp://ftp.skolelinux.no/cd-stretch-live/\">FTP</ulink>, <ulink url=\""
-"http://ftp.skolelinux.no/cd-stretch-live/\">HTTP</ulink> eller rsync fra "
+"Diskbildet vil bli (men i øyeblikket ikke) tilgjengelig via <ulink url="
+"\"ftp://ftp.skolelinux.no/cd-stretch-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.no/cd-stretch-live/\">HTTP</ulink> eller rsync fra "
"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
"stretch-live/</computeroutput>."
@@ -11045,9 +11036,9 @@ msgid ""
"debian.org/News/2016/20160702.en.html\">Debian Edu / Skolelinux Jessie — a "
"complete Linux solution for your school</ulink>."
msgstr ""
-"Les utgivelseskunngjøringen på www.debian.org: <ulink url=\""
-"https://www.debian.org/News/2016/20160702.en.html\">Debian Edu / Skolelinux "
-"Jessie — a complete Linux solution for your school</ulink>."
+"Les utgivelseskunngjøringen på www.debian.org: <ulink url=\"https://www."
+"debian.org/News/2016/20160702.en.html\">Debian Edu / Skolelinux Jessie — a "
+"complete Linux solution for your school</ulink>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -11153,10 +11144,10 @@ msgid ""
"<computeroutput>/etc/squid3/squid.conf</computeroutput>."
msgstr ""
"<emphasis>squid</emphasis>: Utkobling og omstart av hovedserveren tar lenger "
-"tid enn før på grunn av en ny standardinnstilling <computeroutput>"
-"shutdown_lifetime 30 seconds</computeroutput>. Som et eksempel kan "
-"forsinkelsen være satt til 10 sekunder ved å tilføye linjen <computeroutput>"
-"shutdown_lifetime 10 seconds</computeroutput> til "
+"tid enn før på grunn av en ny standardinnstilling "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. Som et "
+"eksempel kan forsinkelsen være satt til 10 sekunder ved å tilføye linjen "
+"<computeroutput>shutdown_lifetime 10 seconds</computeroutput> til "
"<computeroutput>/etc/squid3/squid.conf</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -11298,10 +11289,10 @@ msgid ""
"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
"\">installation manual</ulink>."
msgstr ""
-"Mer informasjon om Debian Wheezy 7.1 er tilgjengelig i <ulink url=\""
-"http://www.debian.org/releases/wheezy/releasenotes\">utgavenotatene</ulink> "
-"og <ulink url=\"http://www.debian.org/releases/wheezy/installmanual\""
-">installasjonsveiledningen</ulink>."
+"Mer informasjon om Debian Wheezy 7.1 er tilgjengelig i <ulink url=\"http://"
+"www.debian.org/releases/wheezy/releasenotes\">utgavenotatene</ulink> og "
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installasjonsveiledningen</ulink>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index ca06a9a..a9dd040 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
"Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2017-04-28 21:49+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"
@@ -6841,12 +6841,19 @@ msgstr ""
" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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 less choices. Keep in mind that there will be several programs for "
+#| "the same purpose (like file managers, editors, PDF viewers...) if more "
+#| "than one DE is installed; this might confuse users."
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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
"Gebruikers kunnen dan via het aanmeldscherm een van deze vijf "
"bureaubladomgevingen kiezen alvorens ze zich aanmelden. U kunt er uiteraard "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index 9a245a0..670e1c4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2017-05-09 07:23+0000\n"
"Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -5402,8 +5402,8 @@ 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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 9085919..f642406 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -4890,8 +4890,8 @@ 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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 4b47af1..4a2f7b7 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -2153,7 +2153,7 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
<para>To install other desktop environments after installation, simply use apt:
</para><screen><![CDATA[ apt update
apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate]]></screen>
-<para>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 less choices. Keep in mind that there will be several programs for the same purpose (like file managers, editors, PDF viewers...) if more than one DE is installed; this might confuse users.
+<para>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 less choices. Keep in mind that there will be several programs for the same purpose (like file managers, editors, PDF viewers...) if more than one desktop environment is installed; this might confuse users.
</para>
<para>The use of LXDE as default on thin clients can be forced; see <link linkend="NetworkClients">networked clients</link> for details.
</para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
index 522fb08..e008891 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-05-26 10:54+0000\n"
+"POT-Creation-Date: 2017-05-28 15:08+0000\n"
"PO-Revision-Date: 2017-05-20 09:44+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -5553,8 +5553,8 @@ 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 "
"less choices. Keep in mind that there will be several programs for the same "
-"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
-"installed; this might confuse users."
+"purpose (like file managers, editors, PDF viewers...) if more than one "
+"desktop environment is installed; this might confuse users."
msgstr ""
#. type: Content of: <article><section><section><para>
--
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