[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Debian Edu Buster manual from the wiki.
Holger Levsen
gitlab at salsa.debian.org
Sun Sep 23 18:34:54 BST 2018
Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc
Commits:
298a7a45 by Holger Levsen at 2018-09-23T17:34:22Z
Update Debian Edu Buster manual from the wiki.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
13 changed files:
- debian/changelog
- documentation/debian-edu-buster/debian-edu-buster-manual.da.po
- documentation/debian-edu-buster/debian-edu-buster-manual.de.po
- documentation/debian-edu-buster/debian-edu-buster-manual.es.po
- documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
- documentation/debian-edu-buster/debian-edu-buster-manual.it.po
- documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
- documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
- documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
- documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
- documentation/debian-edu-buster/debian-edu-buster-manual.pot
- documentation/debian-edu-buster/debian-edu-buster-manual.xml
- documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
Changes:
=====================================
debian/changelog
=====================================
@@ -13,6 +13,7 @@ debian-edu-doc (2.10.7) UNRELEASED; urgency=medium
[ Holger Levsen ]
* Update debian/copyright from the wikis.
+ * Update Debian Edu Buster manual from the wiki.
-- Petter Reinholdtsen <pere at debian.org> Sat, 08 Sep 2018 20:18:54 +0200
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.da.po
=====================================
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+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"
@@ -2010,9 +2010,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
=====================================
documentation/debian-edu-buster/debian-edu-buster-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: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+0000\n"
"PO-Revision-Date: 2018-07-19 18:10+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1874,11 +1874,19 @@ msgstr ""
"und auch eine Testinstallation kann so deutlich beschleunigt werden."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Please note: If you want to install a desktop afterwards, don't use the "
+#| "Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
+#| "emphasis> because these would pull in all education related programs; "
+#| "rather install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
"Bitte beachten: Falls anschließend eine graphische Arbeitsumgebung "
"installiert werden soll, dann verwenden Sie nicht die Debian Edu Metapakete "
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.es.po
=====================================
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+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"
@@ -2003,9 +2003,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
=====================================
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+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"
@@ -2064,9 +2064,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.it.po
=====================================
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+0000\n"
"PO-Revision-Date: 2018-05-21 18:26+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1846,9 +1846,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
=====================================
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+0000\n"
"PO-Revision-Date: 2017-10-09 05:36+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -1875,9 +1875,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
=====================================
@@ -21,11 +21,11 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-08-27 10:10+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+0000\n"
"PO-Revision-Date: 2018-09-19 04:29+0000\n"
"Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
-"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
-"debian-edu-documentation/debian-edu-buster/nb/>\n"
+"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
+"edu-documentation/debian-edu-buster/nb/>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -91,9 +91,9 @@ msgid ""
"requirements</link> and about the <link linkend=\"Architecture"
"\">architecture</link> contain basic environment details."
msgstr ""
-"Kapitlene om <link linkend=\"Requirements\">maskinvare og "
-"nettverkskrav</link>og om <link linkend=\"Architecture\">arkitektur</link> "
-"inneholder grunnlegende miljøvariabler."
+"Kapitlene om <link linkend=\"Requirements\">maskinvare og nettverkskrav</"
+"link>og om <link linkend=\"Architecture\">arkitektur</link> inneholder "
+"grunnlegende miljøvariabler."
#. type: Content of: <article><section><para>
msgid ""
@@ -274,9 +274,9 @@ msgid ""
"\"NetworkClients--Configuring_the_PXE_menu\">the related HowTo</link> "
"chapter."
msgstr ""
-"Dette er utformet for å kunne endres, for detaljer, se <link linkend=\""
-"NetworkClients--Configuring_the_PXE_menu\">relatert "
-"veiledningskapittel</link>."
+"Dette er utformet for å kunne endres, for detaljer, se <link linkend="
+"\"NetworkClients--Configuring_the_PXE_menu\">relatert veiledningskapittel</"
+"link>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -789,8 +789,8 @@ msgid ""
"Desktop_choice\">Installation chapter</link> for details."
msgstr ""
"For LTSP-klienter bør et lettere skrivebordsmiljø brukes. Dette kan settes "
-"opp under installasjon, se <link linkend=\"Installation--Desktop_choice\""
-">installasjonskapittelet</link> for detaljer."
+"opp under installasjon, se <link linkend=\"Installation--Desktop_choice"
+"\">installasjonskapittelet</link> for detaljer."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -815,10 +815,10 @@ msgid ""
"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 PC-er å fungere som (X-)"
-"terminaler. Dette betyr at maskinen starter opp direkte fra tjeneren 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 PC-er å fungere som "
+"(X-)terminaler. Dette betyr at maskinen starter opp direkte fra tjeneren "
+"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 ""
@@ -831,12 +831,12 @@ msgid ""
"encrypted on the network."
msgstr ""
"Tynnklienter er en bra måte å bruke gamle, trege datamaskiner siden de "
-"egentlig kjører alle programmene på LTSP-tjeneren. Dette fungerer som følger:"
-" Tjenesten bruker DHCP og TFTP for å kople seg til nettverket og starte opp "
-"fra nettverket. Det neste er at filsystemet blir tilknyttet (montert) fra "
-"LTSP-tjeneren ved å bruke NBD. Til slutt startes X Windows-systemet. "
-"Skjermhåndtereren (LDM) kopler seg til LTSP-tjeneren via SSH med X-"
-"forwarding (videresending). På denne måte blir all data kryptert i "
+"egentlig kjører alle programmene på LTSP-tjeneren. Dette fungerer som "
+"følger: Tjenesten bruker DHCP og TFTP for å kople seg til nettverket og "
+"starte opp fra nettverket. Det neste er at filsystemet blir tilknyttet "
+"(montert) fra LTSP-tjeneren ved å bruke NBD. Til slutt startes X Windows-"
+"systemet. Skjermhåndtereren (LDM) kopler seg til LTSP-tjeneren via SSH med "
+"X-forwarding (videresending). På denne måte blir all data kryptert i "
"nettverket."
#. type: Content of: <article><section><section><section><title>
@@ -1477,11 +1477,11 @@ msgid ""
"its <ulink url=\"http://www.debian.org/releases/buster/installmanual"
"\">installation manual</ulink>."
msgstr ""
-"Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\""
-"http://www.debian.org/releases/buster/releasenotes\">utgivelsesnotatene for "
-"Debian Buster</ulink> før du starter å installere et system for bruk i "
-"produksjon. Det er mer informasjon Debian Buster-utgaven tilgjengelig fra <"
-"ulink url=\"http://www.debian.org/releases/buster/installmanual\">dens "
+"Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\"http://"
+"www.debian.org/releases/buster/releasenotes\">utgivelsesnotatene for Debian "
+"Buster</ulink> før du starter å installere et system for bruk i produksjon. "
+"Det er mer informasjon Debian Buster-utgaven tilgjengelig fra <ulink url="
+"\"http://www.debian.org/releases/buster/installmanual\">dens "
"installasjonshåndbok</ulink>."
#. type: Content of: <article><section><section><para>
@@ -1499,9 +1499,9 @@ msgid ""
"<link linkend=\"Architecture\">architecture</link> before starting to "
"install a main server."
msgstr ""
-"Det er derimot anbefalt, å lese kapitlene om <link linkend=\"Requirements\">"
-"maskinvare og nettverkskrav</link> og om <link linkend=\"Architecture\""
-">arkitekturen</link> før du starter på installasjon av en hovedtjener."
+"Det er derimot anbefalt, å lese kapitlene om <link linkend=\"Requirements"
+"\">maskinvare og nettverkskrav</link> og om <link linkend=\"Architecture"
+"\">arkitekturen</link> før du starter på installasjon av en hovedtjener."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -1509,8 +1509,8 @@ msgid ""
"link> chapter of this manual, as it explains how to log in for the first "
"time."
msgstr ""
-"Sørg for også å ha lest <link linkend=\"GettingStarted\">getting started ("
-"komme i gang)</link>-kapittelet i denne manual, siden det beskriver hvordan "
+"Sørg for også å ha lest <link linkend=\"GettingStarted\">getting started "
+"(komme i gang)</link>-kapittelet i denne manual, siden det beskriver hvordan "
"man logger inn for første gang."
#. type: Content of: <article><section><section><title>
@@ -1819,20 +1819,28 @@ msgid ""
"details how this is done. This allows one to install a site specific system "
"and could be used to speed up test installations."
msgstr ""
-"Når du installerer et system med profilen <emphasis>arbeidsstasjon</emphasis>"
-", følger det med mange utdanningsrelaterte programmer. For å kun installere "
-"den grunnleggende profilen, fjern <emphasis>desktop=xxxx</emphasis> "
-"kjærnekommandolinjeparameteret før du starter installasjonen; sjekk nedenfor "
-"for detaljer om hvordan dette gjøres. Dette tillater installasjon av system "
-"tilpasset dets omgivelser, og kan brukes for å spare tid på "
-"testinstallasjoner."
+"Når du installerer et system med profilen <emphasis>arbeidsstasjon</"
+"emphasis>, følger det med mange utdanningsrelaterte programmer. For å kun "
+"installere den grunnleggende profilen, fjern <emphasis>desktop=xxxx</"
+"emphasis> kjærnekommandolinjeparameteret før du starter installasjonen; "
+"sjekk nedenfor for detaljer om hvordan dette gjøres. Dette tillater "
+"installasjon av system tilpasset dets omgivelser, og kan brukes for å spare "
+"tid på testinstallasjoner."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Please note: If you want to install a desktop afterwards, don't use the "
+#| "Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
+#| "emphasis> because these would pull in all education related programs; "
+#| "rather install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
"Merk: Hvis du ønsker å installere et skrivebord etterpå, ikke bruk Debian "
"Edu-metapakker som f.eks. <emphasis>education-desktop-mate</emphasis> fordi "
@@ -2032,11 +2040,11 @@ msgid ""
"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
"parameter."
msgstr ""
-"For å installere skrivebordsmiljøet <emphasis role=\"strong\""
-">GNOME</emphasis> i stedet for det forhåndsvalgte <emphasis role=\"strong\""
-">Xfce</emphasis>, erstatt <computeroutput>xfce</computeroutput> med "
-"<computeroutput>gnome</computeroutput> i "
-"<computeroutput>desktop=xfce</computeroutput>-parameteret."
+"For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</"
+"emphasis> i stedet for det forhåndsvalgte <emphasis role=\"strong\">Xfce</"
+"emphasis>, erstatt <computeroutput>xfce</computeroutput> med "
+"<computeroutput>gnome</computeroutput> i <computeroutput>desktop=xfce</"
+"computeroutput>-parameteret."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -3603,13 +3611,10 @@ msgid ""
"enter password: ********\n"
"root at tjener:~#"
msgstr ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t "
-"workstations\n"
-"info: Opprett GOsa-maskin for am-2211334455ff.intern [10.0.16.21] id "
-"ether-22:11:33:44:55:ff.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Opprett GOsa-maskin for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
-"Skriv inn passord hvis du ønsker å aktivere disse endringene, og ^c for å "
-"avbryte.\n"
+"Skriv inn passord hvis du ønsker å aktivere disse endringene, og ^c for å avbryte.\n"
"\n"
"Kobler til LDAP som cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
"skriv inn passord: ********\n"
@@ -3880,8 +3885,8 @@ msgid ""
"<computeroutput>teachers</computeroutput> and <computeroutput>jradmins</"
"computeroutput> (no members after installation)."
msgstr ""
-"For skriverhåndtering legg din nettleser til <ulink url=\"https://www:631\"/>"
-". Dette er det normale CUPS administrasjonsgrensesnittet der du kan legge "
+"For skriverhåndtering legg din nettleser til <ulink url=\"https://www:631\"/"
+">. Dette er det normale CUPS administrasjonsgrensesnittet der du kan legge "
"til/slette/endre skriverne dine, og kan rydde opp i utskriftskøen. Som "
"standard er bare rot (root) tillatt, men dette kan endres: Åpne /etc/cups/"
"cups-files.conf med en redigerer, og legg til ett eller flere gyldige "
@@ -4977,10 +4982,9 @@ msgid ""
"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
"in LDAP for one dedicated network)."
msgstr ""
-"Bruk \"ldapvi -ZD '(cn=admin)'\" for å erstatte "
-"<computeroutput>i386</computeroutput> med "
-"<computeroutput>amd64</computeroutput> (DHCP-stadfestelser i LDAP for ett "
-"dedikert nettverk)."
+"Bruk \"ldapvi -ZD '(cn=admin)'\" for å erstatte <computeroutput>i386</"
+"computeroutput> med <computeroutput>amd64</computeroutput> (DHCP-"
+"stadfestelser i LDAP for ett dedikert nettverk)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Run \"service isc-dhcp-server restart\"."
@@ -6660,8 +6664,8 @@ msgid ""
"PC (aka i386)."
msgstr ""
"Forvalg for nye Debian Edu Buster-installasjoner: LTSP-klienter bruker samme "
-"arkitektur som LTSP-tjeneren, f.eks. 64-biters-PC (aka amd64) eller 32"
-"-biters-PC (aka i386)."
+"arkitektur som LTSP-tjeneren, f.eks. 64-biters-PC (aka amd64) eller 32-"
+"biters-PC (aka i386)."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -6689,9 +6693,9 @@ msgid ""
"where all software runs on the LTSP server. This means that this machine "
"boots via 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 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 uten bruk av lokal "
+"harddisk i klienten."
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -6784,8 +6788,7 @@ msgstr ""
"ltsp-chroot -a amd64 apt-get update\n"
"ltsp-chroot -d -a amd64 apt-get -y -q install <pakkenavn>\n"
"\n"
-"# kopier den nye initrd-filen til tjenerens tftpboot-mappe og oppdater NBD-"
-"avbildningen.\n"
+"# kopier den nye initrd-filen til tjenerens tftpboot-mappe og oppdater NBD-avbildningen.\n"
"ltsp-update-kernels\n"
"ltsp-update-image"
@@ -6852,8 +6855,7 @@ msgid ""
"(3)Execute 'ltsp-update-kernels'\n"
"(4)Execute 'ltsp-update-image'"
msgstr ""
-"(1) Åpne filen /opt/ltsp/amd64/etc/ltsp/update-kernels.conf med en "
-"redigerer\n"
+"(1) Åpne filen /opt/ltsp/amd64/etc/ltsp/update-kernels.conf med en redigerer\n"
" og erstatt linjen\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"med \n"
@@ -7092,9 +7094,7 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid "DEFAULT ltsp/amd64/vmlinuz initrd=ltsp/amd64/initrd.img nfsroot=10.0.2.10:/opt/ltsp/amd64 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
-msgstr ""
-"DEFAULT ltsp/amd64/vmlinuz initrd=ltsp/amd64/initrd.img nfsroot=10.0.2.10:/"
-"opt/ltsp/amd64 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
+msgstr "DEFAULT ltsp/amd64/vmlinuz initrd=ltsp/amd64/initrd.img nfsroot=10.0.2.10:/opt/ltsp/amd64 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -7165,9 +7165,8 @@ msgid ""
"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
"Bruk <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> for å erstatte "
-"<computeroutput>amd64</computeroutput> med "
-"<computeroutput>i386</computeroutput> (DHCP-oppføringer i LDAP for ett "
-"dedikert nettverk)."
+"<computeroutput>amd64</computeroutput> med <computeroutput>i386</"
+"computeroutput> (DHCP-oppføringer i LDAP for ett dedikert nettverk)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
@@ -7586,8 +7585,8 @@ msgstr ""
"lastbalanseres. Lagre denne filen som <computeroutput>/etc/ltsp/"
"ssh_known_hosts.extra </computeroutput> på alle lastbalanseringsserverne. "
"Dette siste steget er veldig viktig siden ltsp-update-sshkeys kjører hver "
-"gang en tjener startes på ny, og <computeroutput>/etc/ltsp/"
-"ssh_known_hosts.extra</computeroutput> legges inn hvis filen eksisterer."
+"gang en tjener startes på ny, og <computeroutput>/etc/ltsp/ssh_known_hosts."
+"extra</computeroutput> legges inn hvis filen eksisterer."
#. type: Content of: <article><section><section><section><section><para>
msgid ""
@@ -7654,8 +7653,8 @@ msgid ""
msgstr ""
"Sett opp denne maskinen til å kjøre en skriver i lts.conf (forvalgt "
"plassering: <computeroutput>/opt/ltsp/amd64/etc/lts.conf</computeroutput>), "
-"se LTSP-manualen <computeroutput>/usr/share/doc/ltsp/"
-"LTSPManual.html#printer</computeroutput> for detaljer."
+"se LTSP-manualen <computeroutput>/usr/share/doc/ltsp/LTSPManual."
+"html#printer</computeroutput> for detaljer."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -7696,8 +7695,7 @@ msgid ""
"exit\n"
"ltsp-update-image"
msgstr ""
-"ltsp-chroot -a amd64 # dette kjører \"chroot /opt/ltsp/amd64\" med mer, "
-"f.eks. hindrer det at nisser startes opp\n"
+"ltsp-chroot -a amd64 # dette kjører \"chroot /opt/ltsp/amd64\" med mer, f.eks. hindrer det at nisser startes opp\n"
"apt update\n"
"apt upgrade\n"
"apt full-upgrade\n"
@@ -8110,10 +8108,10 @@ msgid ""
"domain."
msgstr ""
"Student- og lærerkontoer som er satt opp via GOsa², skulle ha muligheten "
-"til å bekrefte identitet (autentisere) mot \\\\TJENER\\HJEM eller \\\\"
-"TJENER\\< brukernavn> , og få tilgang til sine hjemmemapper selv med "
-"Windows-maskiner <emphasis role=\"strong\">not</emphasis> som er "
-"sammenføyet med Windows SKOLELINUX-domain (domenet)."
+"til å bekrefte identitet (autentisere) mot \\\\TJENER\\HJEM eller \\\\TJENER"
+"\\< brukernavn> , og få tilgang til sine hjemmemapper selv med Windows-"
+"maskiner <emphasis role=\"strong\">not</emphasis> som er sammenføyet med "
+"Windows SKOLELINUX-domain (domenet)."
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
@@ -8321,10 +8319,10 @@ msgid ""
"stable/epoptes#\">Epoptes</ulink> to supervise their students. See also: "
"<ulink url=\"http://www.epoptes.org\">Epoptes Homepage</ulink>."
msgstr ""
-"Noen skoler benytter styringsverktøy som <ulink url=\""
-"https://packages.debian.org/stable/epoptes#\">Epoptes</ulink> for å styre "
-"sine elever. Se også nettsidene til <ulink url=\"http://www.epoptes.org\">"
-"Epoptes hjemmeside</ulink>."
+"Noen skoler benytter styringsverktøy som <ulink url=\"https://packages."
+"debian.org/stable/epoptes#\">Epoptes</ulink> for å styre sine elever. Se "
+"også nettsidene til <ulink url=\"http://www.epoptes.org\">Epoptes "
+"hjemmeside</ulink>."
#. type: Content of: <article><section><section><para>
msgid "To get full Epoptes support, these steps are required."
@@ -8344,17 +8342,14 @@ msgid ""
"# If diskspace matters, use 'ltsp-update-image -n' instead.\n"
"ltsp-update-image"
msgstr ""
-"# Kjør på en kombinasjons-tjenermaskin (og på hver ekstra LTSP-tjenermaskin):"
-"\n"
+"# Kjør på en kombinasjons-tjenermaskin (og på hver ekstra LTSP-tjenermaskin):\n"
"apt update\n"
"apt install epoptes\n"
"ltsp-chroot -m --arch amd64 apt update\n"
"ltsp-chroot -m --arch amd64 apt install epoptes-client\n"
"ltsp-chroot -m --arch amd64 apt install ssvnc\n"
-"ltsp-chroot -m --arch amd64 sed -i 's/test -f/#test -f/' /etc/init.d/epoptes-"
-"client \n"
-"ltsp-chroot -m --arch amd64 sed -i 's/grep -qs/#grep -qs/' /etc/init.d/"
-"epoptes-client \n"
+"ltsp-chroot -m --arch amd64 sed -i 's/test -f/#test -f/' /etc/init.d/epoptes-client \n"
+"ltsp-chroot -m --arch amd64 sed -i 's/grep -qs/#grep -qs/' /etc/init.d/epoptes-client \n"
"# Hvis diskplass er viktig, bruk 'ltsp-update-image -n' i stedet.\n"
"ltsp-update-image"
@@ -8445,8 +8440,8 @@ msgstr ""
"sertifikater tilbys for å tillate sikring av forbindelsene med TLS. Hvis du "
"vil tillate e-post utenfor dette, må administratoren sette opp e-"
"posttjeneren <computeroutput> exim4 </computeroutput> med passende "
-"innstillinger. En kan starte med <computeroutput>dpkg-reconfigure "
-"exim4-config</computeroutput>."
+"innstillinger. En kan starte med <computeroutput>dpkg-reconfigure exim4-"
+"config</computeroutput>."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -8844,8 +8839,9 @@ msgid ""
"ulink>."
msgstr ""
"Ny CFEngine-oppsettsbehandling (erstatter ikke-vedlikeholdt pakke cfengine2 "
-"med cfengine3); dette er en stor endring, for detaljer, se <ulink url=\""
-"https://docs.cfengine.com\">den offisielle CFEngine-dokumentasjonen</ulink>."
+"med cfengine3); dette er en stor endring, for detaljer, se <ulink url="
+"\"https://docs.cfengine.com\">den offisielle CFEngine-dokumentasjonen</"
+"ulink>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "New default desktop environment Xfce (replacing KDE)."
@@ -8911,10 +8907,10 @@ msgid ""
"and the <ulink url=\"http://www.debian.org/releases/buster/installmanual"
"\">installation manual</ulink>."
msgstr ""
-"Mer informasjon om Debian 10 Buster kan man finne i <ulink url=\""
-"http://www.debian.org/releases/buster/releasenotes\">utgavenotatene</ulink> "
-"og <ulink url=\"http://www.debian.org/releases/buster/installmanual\""
-">installasjonshåndboken</ulink>."
+"Mer informasjon om Debian 10 Buster kan man finne i <ulink url=\"http://www."
+"debian.org/releases/buster/releasenotes\">utgavenotatene</ulink> og <ulink "
+"url=\"http://www.debian.org/releases/buster/installmanual"
+"\">installasjonshåndboken</ulink>."
#. type: Content of: <article><section><section><section><title>
msgid "Documentation and translation updates"
@@ -9208,10 +9204,10 @@ msgstr ""
"dokumentet plassert i PO-filer. Mer informasjon om prosessen finnes i "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-buster-"
"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 ""
@@ -9349,9 +9345,9 @@ msgid ""
"\"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
"buster/\"/> for more information."
msgstr ""
-"Noen språk-lag har bestemt seg for å oversette via Weblate. Se <ulink url=\""
-"https://hosted.weblate.org/projects/debian-edu-documentation/"
-"debian-edu-buster/\"/> for mer info."
+"Noen språk-lag har bestemt seg for å oversette via Weblate. Se <ulink url="
+"\"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
+"buster/\"/> for mer info."
#. type: Content of: <article><section><section><section><para>
msgid "Please report any problems."
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
=====================================
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-buster-manual\n"
"Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+0000\n"
"PO-Revision-Date: 2018-06-15 16:09+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"
@@ -1893,11 +1893,19 @@ msgstr ""
"gebruikt worden om testinstallaties te versnellen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Please note: If you want to install a desktop afterwards, don't use the "
+#| "Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
+#| "emphasis> because these would pull in all education related programs; "
+#| "rather install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
"Opmerking: indien u nadien een grafische werkomgeving wenst te installeren, "
"gebruik dan niet de meta-pakketten van Debian Edu, zoals bijvoorbeeld "
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
=====================================
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+0000\n"
"PO-Revision-Date: 2017-06-05 08:57+0000\n"
"Last-Translator: Stanisław Krukowski <stdf021 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -1994,9 +1994,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.pot
=====================================
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+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"
@@ -1378,9 +1378,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.xml
=====================================
@@ -633,7 +633,7 @@
<para>When installing a system with profile <emphasis>Workstation</emphasis> included, a lot of education related programs are installed. To install only the basic profile, remove the <emphasis>desktop=xxxx</emphasis> kernel command line param before starting the installation; see further below for details how this is done. This allows one to install a site specific system and could be used to speed up test installations.
</para></listitem>
<listitem>
-<para>Please note: If you want to install a desktop afterwards, don't use the Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</emphasis> because these would pull in all education related programs; rather install e.g. <emphasis>mate-desktop-environment</emphasis> instead.
+<para>Please note: If you want to install a desktop afterwards, don't use the Debian Edu meta-packages like e.g. <ulink url="https://packages.debian.org/stable/education-desktop-mate#">education-desktop-mate</ulink> because these would pull in all education related programs; rather install e.g. <ulink url="https://packages.debian.org/stable/task-mate-desktop#">task-mate-desktop</ulink> instead.
</para></listitem>
<listitem>
<para>For details about Debian Edu meta-packages, see the <ulink url="https://blends.debian.org/edu/tasks/">Debian Edu packages overview</ulink> page.
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
=====================================
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-09-08 09:44+0000\n"
+"POT-Creation-Date: 2018-09-23 17:33+0000\n"
"PO-Revision-Date: 2018-09-16 06:24+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -45,8 +45,8 @@ msgid ""
"The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
"Buster\"/> is a wiki and updated frequently."
msgstr ""
-"在 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Buster\"/> "
-"上的版本是一个维基，并会时常更新。"
+"在 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Buster\"/> 上"
+"的版本是一个维基，并会时常更新。"
#. type: Content of: <article><section><para>
msgid ""
@@ -1817,9 +1817,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Please note: If you want to install a desktop afterwards, don't use the "
-"Debian Edu meta-packages like e.g. <emphasis>education-desktop-mate</"
-"emphasis> because these would pull in all education related programs; rather "
-"install e.g. <emphasis>mate-desktop-environment</emphasis> instead."
+"Debian Edu meta-packages like e.g. <ulink url=\"https://packages.debian.org/"
+"stable/education-desktop-mate#\">education-desktop-mate</ulink> because "
+"these would pull in all education related programs; rather install e.g. "
+"<ulink url=\"https://packages.debian.org/stable/task-mate-desktop#\">task-"
+"mate-desktop</ulink> instead."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/298a7a45cc7749bad4535a6b1a16220d2538fd1c
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/298a7a45cc7749bad4535a6b1a16220d2538fd1c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20180923/04f8a31f/attachment-0001.html>
More information about the debian-edu-commits
mailing list