[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
Thu Jul 19 16:54:59 BST 2018
Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc
Commits:
47f04e13 by Holger Levsen at 2018-07-19T15:54:29+00:00
Update Debian Edu Buster manual from the wiki.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
12 changed files:
- 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:
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.da.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.da.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+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"
@@ -4065,15 +4065,24 @@ msgstr ""
"skærmbilleder viser hvordan dette gøres i praksis."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Opret GOsa-mskine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.de.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.de.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+0000\n"
"PO-Revision-Date: 2018-05-30 23:48+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -3690,15 +3690,24 @@ msgstr ""
"Praxis erfolgen könnte."
#. type: CDATA
-#, no-wrap
-msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
+msgid ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
@@ -9566,8 +9575,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 "
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.es.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.es.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+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"
@@ -3925,15 +3925,24 @@ msgid ""
msgstr ""
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+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"
@@ -4185,15 +4185,24 @@ msgstr ""
"ressemble en pratique."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.it.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.it.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+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"
@@ -3634,15 +3634,24 @@ msgstr ""
"stanno le cose nella pratica:"
#. type: CDATA
-#, no-wrap
-msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
+msgid ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+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"
@@ -3776,15 +3776,24 @@ msgstr ""
"のスクリーンショットのようになります:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+0000\n"
"PO-Revision-Date: 2018-06-28 14:40+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"
@@ -3765,15 +3765,24 @@ msgstr ""
"praksis:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
@@ -9023,8 +9032,8 @@ msgid ""
msgstr ""
"En fin måte å få med seg hva som foregår i utviklingen av Debian Edu er å "
"melde seg på <ulink url=\"https://alioth-lists.debian.net/cgi-bin/mailman/"
-"listinfo/debian-edu-commits\">e-postlisten for innmeldinger av "
-"bidrag</ulink>."
+"listinfo/debian-edu-commits\">e-postlisten for innmeldinger av bidrag</"
+"ulink>."
#. type: Content of: <article><section><section><title>
msgid "Documentation writers and translators"
@@ -9657,8 +9666,8 @@ msgstr ""
"Hvis du kun ønsker å oversette, trenger du bare å sjekke ut noen få filer "
"fra Git (som kan gjøres anonymt). Du lagrer en feilrapport mot pakken debian-"
"edu-doc, og fest PO-filen til <ulink url =\"http://bugs.debian.org/debian-"
-"edu-doc\">feilrapporten</ulink>. Sjekk <ulink url =\"http://bugs.debian.org\""
-"> instruksjoner om hvordan du innrapporterer feil</ulink> for mer "
+"edu-doc\">feilrapporten</ulink>. Sjekk <ulink url =\"http://bugs.debian.org"
+"\"> instruksjoner om hvordan du innrapporterer feil</ulink> for mer "
"informasjon."
#. type: Content of: <article><section><section><section><para>
@@ -9676,8 +9685,8 @@ msgid ""
"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
"git</computeroutput>"
msgstr ""
-"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-"
-"doc.git</computeroutput>"
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -9748,8 +9757,8 @@ msgid ""
"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
msgstr ""
"Grunnleggende informasjon om Salsa (verten der vårt Git pakkelager er "
-"plassert) og Git er tilgjengelig på <ulink url=\"http://wiki.debian.org/"
-"Salsa\"/>."
+"plassert) og Git er tilgjengelig på <ulink url=\"http://wiki.debian.org/Salsa"
+"\"/>."
#. type: Content of: <article><section><section><section><para>
msgid ""
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+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"
@@ -251,11 +251,6 @@ msgid "The default network setup"
msgstr "De standaard netwerkconfiguratie"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "DHCPD on Tjener serves the 10.0.0.0/8 network, providing a syslinux menu "
-#| "via PXE-boot where you can choose whether to install a new server/"
-#| "workstation, boot a thin client or a diskless workstation, run memtest, "
-#| "or boot from the local hard disk."
msgid ""
"DHCP on the main server serves the 10.0.0.0/8 network, providing a PXE boot "
"menu where you can choose whether to install a new server/workstation, boot "
@@ -278,10 +273,6 @@ msgstr ""
"HowTo</link>-hoofdstuk."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "DHCPD on the LTSP servers only serves a dedicated network on the second "
-#| "interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) "
-#| "and should seldom need to be changed."
msgid ""
"DHCP on the LTSP servers only serves a dedicated network on the second "
"interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and "
@@ -1881,7 +1872,6 @@ msgstr ""
"instellen."
#. type: Content of: <article><section><section><section><title>
-#| msgid "Installation"
msgid "Modular installation"
msgstr "Modulaire installatie"
@@ -2091,11 +2081,6 @@ msgid "{{attachment:BD_command_line.png}}"
msgstr "{{attachment:BD_command_line.png}}"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "You can use an existing HTTP proxy service on the network to speed up the "
-#| "installation of the main server profile from CD. Add "
-#| "<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> "
-#| "as an additional boot parameter."
msgid ""
"You can use an existing HTTP proxy service on the network to speed up the "
"installation of the main server profile from CD. Add e.g. "
@@ -3769,15 +3754,24 @@ msgstr ""
"volgende schermafdrukken tonen hoe dit eruit ziet in de praktijk:"
#. type: CDATA
-#, no-wrap
-msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
+msgid ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
@@ -9058,10 +9052,6 @@ msgstr ""
"lezen."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "A good way to learn what is happening in the development of Debian Edu is "
-#| "to subscribe to the <ulink url=\"http://lists.alioth.debian.org/mailman/"
-#| "listinfo/debian-edu-commits\">commit mailinglist</ulink>."
msgid ""
"A good way to learn what is happening in the development of Debian Edu is to "
"subscribe to the <ulink url=\"https://alioth-lists.debian.net/cgi-bin/"
@@ -9261,10 +9251,6 @@ msgstr ""
"buster/installmanual\">installatiehandleiding</ulink>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
-#| "Themes/softWaves#\">\"soft Waves\" theme</ulink>, the default artwork for "
-#| "Debian 10 Buster."
msgid ""
"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
"Themes/XXX#\">XXX theme</ulink>, the default artwork for Debian 10 Buster."
@@ -9412,7 +9398,6 @@ msgstr ""
"toepassing gnash weg te laten"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "New GOsa²-Plugin Password Management."
msgid "New GOsa²-Plugin <emphasis>Password Management</emphasis>."
msgstr ""
"Nieuw GOsa²-Plugin <emphasis>Password Management</emphasis> (voor "
@@ -9424,9 +9409,6 @@ msgstr ""
"Uit de web-interface van GOsa² werden de onbruikbare opties verwijderd."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "New netgroup available to exclude shut-down-at-night-host from being "
-#| "waken up."
msgid ""
"New netgroup available to exclude systems belonging to the <emphasis>shut-"
"down-at-night-hosts</emphasis> netgroup from being waken up."
@@ -9684,10 +9666,6 @@ msgstr ""
"<computeroutput>debian-edu</computeroutput>."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
msgid ""
"Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
@@ -9723,9 +9701,6 @@ msgstr ""
"u het pakket <computeroutput>git</computeroutput> geïnstalleerd hebben):"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
-#| "doc.git</computeroutput>"
msgid ""
"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
"git</computeroutput>"
@@ -9790,10 +9765,6 @@ msgstr ""
"moet u onderdelen waarbij \"FIXME\" staat, niet vertalen."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Basic information about Alioth (the host where our Git repository is "
-#| "located) and Git is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Git\"/>."
msgid ""
"Basic information about Salsa (the host where our Git repository is located) "
"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+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-"
@@ -3405,13 +3405,14 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.pot
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.pot
+++ b/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-05-30 21:39+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+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"
@@ -2697,13 +2697,14 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.xml
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.xml
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.xml
@@ -1213,13 +1213,14 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
<para>To assign a host with the MAC address 52:54:00:12:34:10 a static IP address in GOsa² you have to enter the MAC address, the hostname and the IP; alternatively you might click the <computeroutput>Propose ip</computeroutput> button which will show the first free fixed address in 10.0.0.0/8, most probably something like 10.0.0.2 if you add the first machine this way. It may be better to first think about your network: for example you could use 10.0.0.x with x>10 and x<50 for servers, and x>100 for workstations. Don't forget to activate the just added system. With the exception of the main server all systems will then have a matching icon.
</para>
<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa². For simple machines it will work out of the box, for machines with more than one mac address the actually used one has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified to suit your network: rename each new system, activate DHCP and DNS, add it to netgroups (see screenshot below for recommended netgroups), reboot the system afterwards. The following screenshots show how this looks in practice:
-</para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations
-info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.
+</para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations
+info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.
Enter password if you want to activate these changes, and ^c to abort.
Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
-enter password: ]]></screen>
+enter password: ********
+root at tjener:~#]]></screen>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_list.png"/></imageobject><textobject><phrase>GOsa² systems listing</phrase></textobject></inlinemediaobject>
</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_host_details.png"/></imageobject><textobject><phrase>Host details</phrase></textobject></inlinemediaobject>
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
=====================================
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
+++ b/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-04-12 20:31+0000\n"
+"POT-Creation-Date: 2018-07-19 15:53+0000\n"
"PO-Revision-Date: 2018-06-08 00:35+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -3640,15 +3640,24 @@ msgstr ""
"快照显示在实际中所看到的是怎样的："
#. type: CDATA
-#, no-wrap
-msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password:"
+msgid ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff -t workstations\n"
+"info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password:"
+"enter password: ********\n"
+"root at tjener:~#"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
@@ -7750,7 +7759,8 @@ msgid ""
"contribution is to let us know you exist and use Debian Edu - this motivates "
"us very much and therefore is already a valuable contribution."
msgstr ""
-"Debian Edu 用户遍及世界各处。一个很容易的贡献方式是让我们知道你在用 Debian Edu —— 这非常激励我们因而已经是有价值的贡献。"
+"Debian Edu 用户遍及世界各处。一个很容易的贡献方式是让我们知道你在用 Debian "
+"Edu —— 这非常激励我们因而已经是有价值的贡献。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -7761,9 +7771,10 @@ msgid ""
"school, <ulink url=\"http://wiki.debian.org/DebianEdu/ReferenceSchools\">use "
"this web form</ulink>."
msgstr ""
-"Debian Edu 项目提供一个学校和系统用户数据库来帮助用户彼此相识，也有一个目的是发布用户位置。请通过在这个数据库中登记，让我们知道有关你的安装。<"
-"ulink url=\"http://wiki.debian.org/DebianEdu/ReferenceSchools\">使用 web "
-"表格</ulink>，来登记你的学校。"
+"Debian Edu 项目提供一个学校和系统用户数据库来帮助用户彼此相识，也有一个目的是"
+"发布用户位置。请通过在这个数据库中登记，让我们知道有关你的安装。<ulink url="
+"\"http://wiki.debian.org/DebianEdu/ReferenceSchools\">使用 web 表格</ulink>，"
+"来登记你的学校。"
#. type: Content of: <article><section><section><title>
msgid "Contribute locally"
@@ -7782,8 +7793,8 @@ msgid ""
"links to localised resources, as <emphasis>contribute</emphasis> and "
"<emphasis>support</emphasis> are two sides of the same coin."
msgstr ""
-"<link linkend=\"Support\">支持</link>一章有解释说明并链接到地方资源，作为<emphasis>贡献</emphasis>和"
-"<emphasis>支持</emphasis>是同一硬币的两面。"
+"<link linkend=\"Support\">支持</link>一章有解释说明并链接到地方资源，作为"
+"<emphasis>贡献</emphasis>和<emphasis>支持</emphasis>是同一硬币的两面。"
#. type: Content of: <article><section><section><title>
msgid "Contribute globally"
@@ -7794,8 +7805,8 @@ msgid ""
"Internationally we are organised into various <ulink url=\"http://wiki."
"debian.org/DebianEdu/Teams/\">teams</ulink> working on different subjects."
msgstr ""
-"在国际上我们组织成多种<ulink url=\"http://wiki.debian.org/DebianEdu/Teams/\""
-">团队</ulink>工作在不同的主题上。"
+"在国际上我们组织成多种<ulink url=\"http://wiki.debian.org/DebianEdu/Teams/\">"
+"团队</ulink>工作在不同的主题上。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -7807,11 +7818,11 @@ msgid ""
"contributors</ulink> should read our <ulink url=\"http://wiki.debian.org/"
"DebianEdu/ArchivePolicy\"/>."
msgstr ""
-"大多数时间，<ulink url=\"http://lists.debian.org/debian-edu\""
-">开发者邮件列表</ulink>是我们交流的主要媒介，虽然我们在 irc.debian.org #debian-edu 有每月的 IRC "
-"会议而且还有，不经常的，真实聚会，在那里我们彼此亲身相识。<ulink url=\"http://wiki.debian.org/DebianEdu/"
-"NewContributor\">新贡献者</ulink>要阅读我们的 <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/ArchivePolicy\"/>。"
+"大多数时间，<ulink url=\"http://lists.debian.org/debian-edu\">开发者邮件列表"
+"</ulink>是我们交流的主要媒介，虽然我们在 irc.debian.org #debian-edu 有每月的 "
+"IRC 会议而且还有，不经常的，真实聚会，在那里我们彼此亲身相识。<ulink url="
+"\"http://wiki.debian.org/DebianEdu/NewContributor\">新贡献者</ulink>要阅读我"
+"们的 <ulink url=\"http://wiki.debian.org/DebianEdu/ArchivePolicy\"/>。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -7819,8 +7830,8 @@ msgid ""
"subscribe to the <ulink url=\"https://alioth-lists.debian.net/cgi-bin/"
"mailman/listinfo/debian-edu-commits\">commit mailinglist</ulink>."
msgstr ""
-"正好在 Debian Edu 开发中学习的好方法是订阅<ulink url=\"http://lists.alioth.debian.org/"
-"mailman/listinfo/debian-edu-commits\">提交的邮件列表</ulink>。"
+"正好在 Debian Edu 开发中学习的好方法是订阅<ulink url=\"http://lists.alioth."
+"debian.org/mailman/listinfo/debian-edu-commits\">提交的邮件列表</ulink>。"
#. type: Content of: <article><section><section><title>
msgid "Documentation writers and translators"
@@ -7833,8 +7844,8 @@ msgid ""
"happen to know (a bit of) what needs to be explained there, please consider "
"sharing your knowledge with us."
msgstr ""
-"这一文档需要你的帮助！最重要的是，文档尚未完成：如果阅读文档，会注意到文本中有许多 "
-"FIXME。如果你正好知道（一点儿）需要在这讲解的，请同我们分享你的知识。"
+"这一文档需要你的帮助！最重要的是，文档尚未完成：如果阅读文档，会注意到文本中"
+"有许多 FIXME。如果你正好知道（一点儿）需要在这讲解的，请同我们分享你的知识。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -7844,9 +7855,10 @@ msgid ""
"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
"UserPreferences\">create a wiki user</ulink> first."
msgstr ""
-"文本的来源是一个维基并且可以用简单的 web 浏览器来编辑。仅来到 <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Documentation/Buster/\"/> 就可以很容易地做贡献。提示：编辑这些页面需要一个用户账号；首先需要<ulink "
-"url=\"http://wiki.debian.org/UserPreferences\">创建一个维基用户</ulink>。"
+"文本的来源是一个维基并且可以用简单的 web 浏览器来编辑。仅来到 <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Buster/\"/> 就可以很容易地做"
+"贡献。提示：编辑这些页面需要一个用户账号；首先需要<ulink url=\"http://wiki."
+"debian.org/UserPreferences\">创建一个维基用户</ulink>。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -7856,8 +7868,9 @@ msgid ""
"link> of this book. Please consider helping the translation effort of this "
"book!"
msgstr ""
-"另一个非常好的贡献途径是通过翻译软件和文档来帮助用户。如何翻译本文档的信息可以在本书的<link linkend=\"Translations\""
-">翻译一章</link>中找到。请考虑协助本书的翻译努力！"
+"另一个非常好的贡献途径是通过翻译软件和文档来帮助用户。如何翻译本文档的信息可"
+"以在本书的<link linkend=\"Translations\">翻译一章</link>中找到。请考虑协助本"
+"书的翻译努力！"
#. type: Content of: <article><section><title>
msgid "Support"
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/47f04e1300c2c2583e909d72c32e6fcfb3d2d315
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/47f04e1300c2c2583e909d72c32e6fcfb3d2d315
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/20180719/d693fd74/attachment-0001.html>
More information about the debian-edu-commits
mailing list