msgid "Manual for Debian Edu 10+edu0 Codename Buster" @@ -10281,19 +10281,15 @@ msgstr "" "een latere versie." #. type: Content of: <article><section><para> -#, fuzzy -#| msgid "" -#| "The Polish translation is copyrighted by Stanisław Krukowski (2016, " -#| "2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is " -#| "released under the GPL v2 or any later version." msgid "" "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), " "Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) " "and is released under the GPL v2 or any later version." msgstr "" "De auteursrechten van de Poolse vertaling berusten bij Stanisław Krukowski " -"(2016, 2017), Wiktor Wandachowicz (2019) en Adrian Bystrek (2019). De " -"vertaling is vrijgegeven onder de licentie GPL v2 of een latere versie." +"(2016, 2017), Wiktor Wandachowicz (2019), Adrian Bystrek (2019) en Michal " +"Biesiada (2020). De vertaling is vrijgegeven onder de licentie GPL v2 of een " +"latere versie." #. type: Content of: <article><section><para> msgid "" @@ -10468,8 +10464,8 @@ msgstr "" "bestand voor uw taal als er zo nog geen bestaat. U vindt er ook informatie " "over hoe u vertalingen moet bijwerken." -#. <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 " View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/1ae9e691e32b10ea78c97edbdd1aba5c201ddc64 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/1ae9e691e32b10ea78c97edbdd1aba5c201ddc64 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/20200301/8523c557/attachment-0001.html> From gitlab at salsa.debian.org Thu Mar 5 12:32:37 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Thu, 05 Mar 2020 12:32:37 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] debian/control: Update after running 'make dist'. Message-ID: <5e60f1667afd_2b23ff34a52f97c6137f2@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 5d33386e by Holger Levsen at 2020-03-05T13:32:26+01:00 debian/control: Update after running 'make dist'. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - debian/control Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +debian-edu (2.11.12) UNRELEASED; urgency=medium + + * debian/control: Update after running 'make dist'. + + -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 13:32:12 +0100 + debian-edu (2.11.11) unstable; urgency=medium [ Wolfgang Schweer ] ===================================== debian/control ===================================== @@ -832,6 +832,7 @@ Recommends: audacious, pianobooster, qsynth, rosegarden, + solfege, swh-plugins, terminatorx, timgm6mb-soundfont, @@ -840,8 +841,7 @@ Suggests: denemo, festival, hydrogen, lilypond, - musescore, - solfege + musescore Description: Debian Edu music and sound applications This metapackage depends on various applications that can be used to teach music. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/5d33386e828f68d53b99270509ff650888963c45 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/5d33386e828f68d53b99270509ff650888963c45 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/20200305/269f9dc7/attachment.html> From gitlab at salsa.debian.org Thu Mar 5 12:41:33 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Thu, 05 Mar 2020 12:41:33 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] Wrap long lines in changelog entries: 0.658, 0.654. Message-ID: <5e60f37dad0ce_2b23ff342bc5424614060@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: 76fe6673 by Holger Levsen at 2020-03-05T13:41:23+01:00 Wrap long lines in changelog entries: 0.658, 0.654. Fixes: lintian: debian-changelog-line-too-long See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +debian-edu-install (2.11.5) UNRELEASED; urgency=medium + + * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. + + -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 12:40:42 +0000 + debian-edu-install (2.11.4) unstable; urgency=medium [ Wolfgang Schweer ] @@ -3106,8 +3112,8 @@ debian-edu-install (0.658) unstable; urgency=low Add ltsp-chroot preseeds here * Added the preseeds for automatic installation using the new partman templates partman-auto/method and partman-lvm/confirm - * make partman commit.d script, that will feed partman with debian-edu's wanted - mountoptions. + * make partman commit.d script, that will feed partman with debian-edu's + wanted mountoptions. [ Petter Reinholdtsen ] * Add preseeding for uswsusp/encrypt to avoid question during installation. @@ -3225,7 +3231,8 @@ debian-edu-install (0.654) unstable; urgency=low return the d-e-install-udeb as a meta-package. * Revert to using autopartkit, now that it is working. Use partman in standalone mode, and manual partman partitioning in debian-edu-expert mode. - * Use the multiseat udeb as part of the debian-edu-install profile, if present. + * Use the multiseat udeb as part of the debian-edu-install profile, if + present. * In debian-edu-preseed, make sure /target/etc/bind/ exist before trying to make a symlink there. * Make sure /proc/ isn't mounted before trying to mount it in /target/. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/76fe66736d76115d7c72a9445ae558c2f47b31c3 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/76fe66736d76115d7c72a9445ae558c2f47b31c3 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/20200305/1d85673b/attachment-0001.html> From gitlab at salsa.debian.org Thu Mar 5 13:08:59 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Thu, 05 Mar 2020 13:08:59 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] Wrap long lines in changelog entries: 0.0.5. Message-ID: <5e60f9eb34b49_2b22aade3f0f06c6163e6@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-artwork Commits: f65a7c07 by Holger Levsen at 2020-03-05T14:02:50+01:00 Wrap long lines in changelog entries: 0.0.5. Fixes: lintian: debian-changelog-line-too-long See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +debian-edu-artwork (2.11.0.1-2) UNRELEASED; urgency=medium + + * Wrap long lines in changelog entries: 0.0.5, thanks lintian-brush. + + -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 13:00:04 +0000 + debian-edu-artwork (2.11.0.1-1) unstable; urgency=medium [ Wolfgang Schweer ] @@ -1421,8 +1427,8 @@ debian-edu-artwork (0.0.5) unstable; urgency=low yet, so the enabling code is commented out. * Copy <URL:http://www.skolelinux.de/~ralf/artwork/wallpapers/skoletux-wallpaper.png> - and use it as the KDE background image. Thanks, Ralf. Found via - skolelinux bug #397. + and use it as the KDE background image. Thanks, Ralf. Found via skolelinux + bug #397. * Add instructions for the CD splash image. * Replace CD splash image with one with black background and both the mascot, the logo and 'Debian Edu'. Tried to include gimp "source" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/commit/f65a7c0719610ef339d3e6ec73c2ee429ec4945f -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/commit/f65a7c0719610ef339d3e6ec73c2ee429ec4945f 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/20200305/e31b69d3/attachment.html> From gitlab at salsa.debian.org Thu Mar 5 15:58:16 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Thu, 05 Mar 2020 15:58:16 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] (nl) Debian Edu Bullseye manual translation update. Message-ID: <5e6121999f4_2b22aade3f0f06c63313c@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: 488dfef4 by Frans Spiesschaert at 2020-03-05T16:58:12+01:00 (nl) Debian Edu Bullseye manual translation update. - - - - - 2 changed files: - debian/changelog - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nl.po Changes: ===================================== debian/changelog ===================================== @@ -17,6 +17,7 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium * Bullseye manual: - Chinese (Simplified): Ma Yong - Norwegian Bokmål: Allan Nordhøy + - Dutch: Frans Spiesschaert * Buster manual: - Chinese (Simplified): Ma Yong - Dutch: Frans Spiesschaert ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nl.po ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/488dfef4592dbb33205b014dcb15d123add6618b -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/488dfef4592dbb33205b014dcb15d123add6618b 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/20200305/337d57b3/attachment-0001.html> From gitlab at salsa.debian.org Fri Mar 6 20:05:46 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Fri, 06 Mar 2020 20:05:46 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] Adjust preseeding Message-ID: <5e62ad1aaca8f_6dca2ad41d2ead44203696@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install Commits: 6eb7fc37 by Wolfgang Schweer at 2020-03-06T18:20:02+01:00 Adjust preseeding preseed-values/defaults.main-server: Drop no longer needed preseeding for tftpd-hpa, the defaults are just fine for working with the re-written LTSP. preseed-values/defaults.networked: Fix default-x-display-manager preseeding. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 3 changed files: - debian/changelog - preseed-values/defaults.main-server - preseed-values/defaults.networked Changes: ===================================== debian/changelog ===================================== @@ -1,7 +1,13 @@ debian-edu-install (2.11.5) UNRELEASED; urgency=medium + [ Holger Levsen ] * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. + [ Wolfgang Schweer ] + * preseed-values/defaults.main-server: Drop no longer needed preseeding for + tftpd-hpa, the defaults are just fine for working with the re-written LTSP. + * preseed-values/defaults.networked: Fix default-x-display-manager preseeding. + -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 12:40:42 +0000 debian-edu-install (2.11.4) unstable; urgency=medium ===================================== preseed-values/defaults.main-server ===================================== @@ -45,11 +45,6 @@ sitesummary-client sitesummary-client/hostclass string main-server #Configure bind9 options debian-edu. bind9 bind9/default-start-options string -4 -u bind -# Set up tftpd-hpa to work with PXE installs. Also, unset '--secure' option to be -# able to serve both LTSP and PXE. -tftpd-hpa tftpd-hpa/directory string /var/lib/tftpboot -tftpd-hpa tftpd-hpa/options string - # Ask for info on initial user before it is created in LDAP user-setup-udeb passwd/make-user boolean true ===================================== preseed-values/defaults.networked ===================================== @@ -44,5 +44,4 @@ exim4-config exim4/dc_minimaldns boolean false exim4-config exim4/dc_other_hostnames string intern # Prefer lightdm, sddm doesn't provide a language chooser -lightdm shared/default-x-display-manager select lightdm sddm shared/default-x-display-manager select lightdm View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/6eb7fc37f7caf164052e39f69edfa3f0a1546657 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/6eb7fc37f7caf164052e39f69edfa3f0a1546657 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/20200306/634f7326/attachment-0001.html> From gitlab at salsa.debian.org Fri Mar 6 20:06:09 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Fri, 06 Mar 2020 20:06:09 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 16 commits: Adjust ldap-bootstrap/root.ldif Message-ID: <5e62ad3141057_6dca2ad420116ac42039df@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: 77809b59 by Wolfgang Schweer at 2020-03-06T18:24:26+01:00 Adjust ldap-bootstrap/root.ldif Use https://www/ instead of http://www/. Cleanup file from 10 year old commented entries, also adjust outdated comment concerning the gosa ldap admin. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - d93caece by Wolfgang Schweer at 2020-03-06T18:31:26+01:00 Adjust tools/show-welcome-webpage to improve internal webpage localization Only query the internal webserver for localized files and store the base URL instead of the whole welcome URL. (Closes: #952665) Use the localized blends web page for the 'Standalone' profile. Whitespace fixes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 5cead286 by Wolfgang Schweer at 2020-03-06T18:34:13+01:00 Rework files in www/ to adjust and improve internal web page. Set correct language identifier in localized files (es-es,pt-br,zh-tw). Rename existing localization variants {es-es,nb-no,pt-br,zh-tw} to give the web server's Multiviews feature a better chance to choose the right file when the web browser is asking for content negotiation. Link index.html.nb-no to index.html.no to let the correct page be found just in case [no] is added as favourite language to a web browser. Use the localized blends web page. Remove link to no longer existing linuxsignpost.org website. Adjust related Makefile. Trivial unfuzzy for all PO files. Updated after running 'make' in the www directory. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 0decb9f4 by Wolfgang Schweer at 2020-03-06T18:40:42+01:00 www/: Remove now obsolete files. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 78aa0c57 by Wolfgang Schweer at 2020-03-06T18:50:47+01:00 Add new tool share/debian-edu-config/tools/edu-ltsp-install to be able to provide LTSP diskless workstation and thin client support. The tool contains basic usage instructions, more needs to go into the manual once everything has been integrated and is actually working like expected.. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 9f6ca44f by Wolfgang Schweer at 2020-03-06T19:02:24+01:00 Use kerberized NFS for mounting home directories Replace sec=sys with sec=krb5i in ldap-bootstrap/autofs.ldif file. Use dedicated edu.exports file shipped in the etc/exports.d/ directory, avoiding to modify the /etc/exports file as a benefit. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - b4a12a8f by Wolfgang Schweer at 2020-03-06T20:34:26+01:00 Drop now obsolete LTSP5 related files. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 30794eee by Wolfgang Schweer at 2020-03-06T20:37:55+01:00 Adjust share/debian-edu-config/d-i/finish-install Add code to set up LTSP client support during installation of systems with profile 'LTSP-Server'. Whitespace fixes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - bc90c03a by Wolfgang Schweer at 2020-03-06T20:40:09+01:00 Drop no longer needed cf3/cf.tftpd file. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1ba92af1 by Wolfgang Schweer at 2020-03-06T20:46:00+01:00 Adjust cfengine related files: cf3/cf.{chromium,firefox-esr} (http -> https related) cf3/cf.homes (Kerberized NFS related) cf3/cf.{finalize,ntp,pxeinstall,squid] and cf3/edu.cf (LTSP related) cf3/cf.workarounds (no workarounds needed atm) Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - cef05fca by Wolfgang Schweer at 2020-03-06T20:53:32+01:00 Cleanup LDIF files ldap-bootstrap/{gosa,samba}.ldif: Drop generation of outdated LanManager password and cleanup the files from 10 year old commented entries. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2aaa1adf by Wolfgang Schweer at 2020-03-06T20:55:53+01:00 Drop outdated (and obsolete) lib/mime/packages/debian-edu-mailcap file Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 24f26f25 by Wolfgang Schweer at 2020-03-06T20:58:33+01:00 Adjust debian/{dirs,debian-edu-config.links,debian-edu-config.postinst, debian-edu-config.maintscript}, cf3/promises.cf and Makefile to reflect the changes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - f1b76600 by Wolfgang Schweer at 2020-03-06T21:01:25+01:00 debian/debian-edu-config.preinst: Drop Stretch related conditional removal, add LTSP related new one. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1ab228fc by Wolfgang Schweer at 2020-03-06T21:02:36+01:00 Adjust debian/debian-edu-config.lintian-overrides. Thanks lintian. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 62717efc by Wolfgang Schweer at 2020-03-06T21:04:02+01:00 Add changelog entries for last commits. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 30 changed files: - Makefile - cf3/cf.chromium - cf3/cf.finalize - cf3/cf.firefox-esr - cf3/cf.grub - cf3/cf.homes - cf3/cf.ntp - cf3/cf.pxeinstall - cf3/cf.squid - − cf3/cf.tftpd - cf3/cf.workarounds - cf3/edu.cf - cf3/promises.cf - debian/changelog - debian/debian-edu-config.links - debian/debian-edu-config.lintian-overrides - debian/debian-edu-config.maintscript - debian/debian-edu-config.postinst - debian/debian-edu-config.preinst - debian/dirs - + etc/exports.d/edu.exports - − etc/ltsp/ltsp-build-client.conf - − etc/ltspfs/mounter.d/edu-notify - ldap-bootstrap/autofs.ldif - ldap-bootstrap/gosa.ldif - ldap-bootstrap/root.ldif - ldap-bootstrap/samba.ldif - − lib/mime/packages/debian-edu-mailcap - share/debian-edu-config/d-i/finish-install - − share/debian-edu-config/ltspfs-mounter-kde The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/94c04be2e45531502297d69d0e936559a42e9a25...62717efcb61f0a92de7fd7826945e41697a61437 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/94c04be2e45531502297d69d0e936559a42e9a25...62717efcb61f0a92de7fd7826945e41697a61437 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/20200306/3ddc0e3b/attachment.html> From gitlab at salsa.debian.org Fri Mar 6 20:12:05 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Fri, 06 Mar 2020 20:12:05 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Trim trailing whitespace, thanks lintian-brush. Message-ID: <5e62ae95bd2f8_6dca2ad41d2ead4420475c@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: 91d2d30c by Holger Levsen at 2020-03-06T21:11:44+01:00 Trim trailing whitespace, thanks lintian-brush. Fixes: lintian: file-contains-trailing-whitespace See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -63,8 +63,8 @@ debian-edu-config (2.11.16) UNRELEASED; urgency=medium * Adjust debian/{dirs,debian-edu-config.links,debian-edu-config.postinst}, cf3/promises.cf and Makefile to reflect the changes. * debian/debian-edu-config.preinst: - - Drop Stretch related conditional removal, add LTSP related new one. - * Adjust debian/debian-edu-config.lintian-overrides. Thanks lintian. + - Drop Stretch related conditional removal, add LTSP related new one. + * Adjust debian/debian-edu-config.lintian-overrides. Thanks lintian. -- Wolfgang Schweer <wschweer at arcor.de> Fri, 06 Mar 2020 10:37:20 +0100 View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/91d2d30c519772be86236f30d9b3d72e582f535a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/91d2d30c519772be86236f30d9b3d72e582f535a 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/20200306/15f38186/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 7 08:49:59 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 07 Mar 2020 08:49:59 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: convert education-menus into arch:all and mark it Multi-Arch:foreign. Message-ID: <5e636037887fb_6dca2ad41afdaef82946bb@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 448a1d6d by Holger Levsen at 2020-03-07T09:47:27+01:00 convert education-menus into arch:all and mark it Multi-Arch:foreign. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - b49ad972 by Holger Levsen at 2020-03-07T09:48:56+01:00 release as 2.11.12 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 3 changed files: - debian/changelog - debian/control - debian/control.stub Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,10 @@ -debian-edu (2.11.12) UNRELEASED; urgency=medium +debian-edu (2.11.12) unstable; urgency=medium - * debian/control: Update after running 'make dist'. + * debian/control: + - convert education-menus into arch:all and mark it Multi-Arch:foreign. + - update after running 'make dist'. - -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 13:32:12 +0100 + -- Holger Levsen <holger at debian.org> Sat, 07 Mar 2020 09:48:47 +0100 debian-edu (2.11.11) unstable; urgency=medium ===================================== debian/control ===================================== @@ -32,7 +32,8 @@ Description: Debian Edu tasks for tasksel XS-Comment: This is a specific package which reorganizes the menu. It doesn't make sense to put in tasks. Package: education-menus Section: misc -Architecture: any +Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: Debian Edu menu reorganization A package to reorganize menu branches in order to get a structure ===================================== debian/control.stub ===================================== @@ -31,7 +31,8 @@ Description: Debian Edu tasks for tasksel XS-Comment: This is a specific package which reorganizes the menu. It doesn't make sense to put in tasks. Package: education-menus Section: misc -Architecture: any +Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: Debian Edu menu reorganization A package to reorganize menu branches in order to get a structure View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/5d33386e828f68d53b99270509ff650888963c45...b49ad9728ec49e436c7c2d41399666407af30563 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/5d33386e828f68d53b99270509ff650888963c45...b49ad9728ec49e436c7c2d41399666407af30563 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/20200307/c17e09aa/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 7 08:50:00 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 07 Mar 2020 08:50:00 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu] Pushed new tag 2.11.12 Message-ID: <5e636038d091b_6dca2ad41afdaef829498@godard.mail> Holger Levsen pushed new tag 2.11.12 at Debian Edu / debian-edu -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/tree/2.11.12 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/20200307/41bd33f9/attachment.html> From gitlab at salsa.debian.org Sat Mar 7 08:54:31 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 07 Mar 2020 08:54:31 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config] Pushed new tag 2.11.16 Message-ID: <5e636148cf759_6dca2ad41bf418602956fe@godard.mail> Holger Levsen pushed new tag 2.11.16 at Debian Edu / debian-edu-config -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/tree/2.11.16 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/20200307/b9caa0cd/attachment.html> From gitlab at salsa.debian.org Sat Mar 7 08:54:33 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 07 Mar 2020 08:54:33 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] release as 2.11.16 Message-ID: <5e63614aaae94_6dca2ad41b2d9744295934@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: d2962639 by Holger Levsen at 2020-03-07T09:50:24+01:00 release as 2.11.16 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,6 @@ -debian-edu-config (2.11.16) UNRELEASED; urgency=medium +debian-edu-config (2.11.16) unstable; urgency=medium + [ Wolfgang Schweer ] * Rework welcome page and localization: - ldap-bootstrap/root.ldif: + Use https://www/ instead of http://www/. @@ -66,7 +67,7 @@ debian-edu-config (2.11.16) UNRELEASED; urgency=medium - Drop Stretch related conditional removal, add LTSP related new one. * Adjust debian/debian-edu-config.lintian-overrides. Thanks lintian. - -- Wolfgang Schweer <wschweer at arcor.de> Fri, 06 Mar 2020 10:37:20 +0100 + -- Holger Levsen <holger at debian.org> Sat, 07 Mar 2020 09:50:16 +0100 debian-edu-config (2.11.15) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/d2962639792654f0eb2cc910fb31d2c3ede77b4d -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/d2962639792654f0eb2cc910fb31d2c3ede77b4d 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/20200307/2f9f7155/attachment.html> From jenkins at jenkins.debian.net Sun Mar 8 05:31:52 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 8 Mar 2020 05:31:52 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-main-server/1671 Message-ID: <230106116.161.1583645512830.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-main-server/1671//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-main-server/1671/ for more information. From jenkins at jenkins.debian.net Sun Mar 8 05:40:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 8 Mar 2020 05:40:59 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-standalone/1670 Message-ID: <1289694168.163.1583646059831.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-standalone/1670//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-standalone/1670/ for more information. From gitlab at salsa.debian.org Sun Mar 8 12:56:39 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sun, 08 Mar 2020 12:56:39 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 9 commits: Translation: Debian Edu Documentation/Audacity manual Message-ID: <5e64eb872926d_6dca2ad41592a3d8414067@godard.mail> Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc Commits: f031d925 by Wellington Terumi Uemura at 2020-02-28T23:34:32+01:00 Translation: Debian Edu Documentation/Audacity manual Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (154 of 154 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/audacity/pt_BR/ - - - - - bb7f7e26 by Ma Yong at 2020-03-01T05:33:08+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.3% (805 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - a766e139 by Ma Yong at 2020-03-01T05:33:09+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 78.7% (1105 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - a2dc4fbc by Ma Yong at 2020-03-04T01:33:00+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.4% (807 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 8aceb1b3 by Ma Yong at 2020-03-04T01:33:01+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 78.8% (1107 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 15ec49a3 by Ma Yong at 2020-03-07T01:32:56+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.8% (811 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - c27cf5ca by Ma Yong at 2020-03-07T01:32:57+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.1% (1111 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - e34d5b78 by Ma Yong at 2020-03-08T13:56:07+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.9% (813 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - b6db1e3c by Ma Yong at 2020-03-08T13:56:08+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.2% (1113 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 3 changed files: - documentation/audacity/audacity-manual.pt_BR.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/audacity/audacity-manual.pt_BR.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-28 19:20+0000\n" +"PO-Revision-Date: 2020-02-28 22:01+0000\n" "Last-Translator: Wellington Terumi Uemura <wellingtonuemura at gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "debian-edu-documentation/audacity/pt_BR/>\n" @@ -494,7 +494,6 @@ msgid "Translation copyright and authors" msgstr "Direitos autorais de tradução e autores" #. type: Content of: <article><section><para> -#, fuzzy msgid "" "The Bokmål translation is copyrighted by Jon Nordby (2014), Petter " "Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is " @@ -521,8 +520,8 @@ msgid "" "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2018, " "2019, 2020) and is released under the GPL v2 or any later version." msgstr "" -"O direito autoral para a tradução Alemã é de Frans Spiesschaert (2014, 2018, " -"2019) e é lançada sob a GPL v2 ou qualquer outra versão posterior." +"O direito autoral da tradução para o Alemão é de Frans Spiesschaert (2014, " +"2018, 2019) e é lançada sob a GPL v2 ou qualquer outra versão posterior." #. type: Content of: <article><section><para> msgid "" @@ -535,13 +534,12 @@ msgstr "" "versão posterior." #. type: Content of: <article><section><para> -#, fuzzy msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " "Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " "later version." msgstr "" -"O direito autoral para a tradução para o chinês simplificado é de Zhang Miao " +"O direito autoral da tradução para o chinês simplificado é de Zhang Miao " "(2017), Ma Yong (2018) e zlffcn (2019) e é lançada sob a GPL v2 ou qualquer " "outra versão posterior." ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-02-28 11:49+0000\n" +"PO-Revision-Date: 2020-03-08 12:56+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5065,13 +5065,13 @@ msgstr "" msgid "" "For new systems added with GOsa², Kerberos host keytab files are generated " "automatically." -msgstr "" +msgstr "对于以 GOsa² 添加的新系统，自动生成 Kerberos 主机密钥表文件。" #. type: Content of: <article><section><section><para> msgid "" "To create one for a system already configured with GOsa², log in on the main " "server as root and run" -msgstr "" +msgstr "要为一个已用 GOsa² 配置过的系统创建这个，作为 root 登录主服务器并运行" #. type: CDATA #, no-wrap @@ -5248,6 +5248,7 @@ msgid "" "are pushed into the stable suite regularly when stable point releases are " "done, which roughly happens every two months." msgstr "" +"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。" #. type: Content of: <article><section><section><title> msgid "Using backports to install newer software" @@ -5382,6 +5383,8 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " +"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5450,6 +5453,9 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" +"wakeup</computeroutput> 支持的主板和 BIOS " +"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5469,6 +5475,12 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" +"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " +"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " +"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " +"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " +"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5706,6 +5718,10 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " +"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " +"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" +"应该在 /Students 之下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5717,6 +5733,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" +"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5732,6 +5750,10 @@ msgid "" "Samba tabs, maybe take screenshots to have information ready for the new " "template." msgstr "" +"从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " +"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " +"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5739,6 +5761,8 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" +"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-02-28 11:49+0000\n" +"PO-Revision-Date: 2020-03-08 12:56+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -5239,18 +5239,23 @@ msgid "" "server and workstation increases with the security level, <emphasis>krb5i</" "emphasis> might be a good choice." msgstr "" +"使用 Kerberos 对于 NFS 挂载主目录是一个安全特性。支持 " +"<emphasis>krb5</emphasis>，<emphasis>krb5i</emphasis> 和 " +"<emphasis>krb5p</emphasis> 级别（<emphasis>krb5</emphasis> 是指 Kerberos " +"验证，<emphasis>i</emphasis> 是完整检查的缩略而 <emphasis>p</emphasis> " +"是关于私人权利，即隐私）；服务器和工作站两者负载的增加与其安全级别一致，<emphasis>krb5i</emphasis> 可能是一个好选择。" #. type: Content of: <article><section><section><para> msgid "" "For new systems added with GOsa², Kerberos host keytab files are generated " "automatically." -msgstr "" +msgstr "对于以 GOsa² 添加的新系统，自动生成 Kerberos 主机密钥表文件。" #. type: Content of: <article><section><section><para> msgid "" "To create one for a system already configured with GOsa², log in on the main " "server as root and run" -msgstr "" +msgstr "要为一个已用 GOsa² 配置过的系统创建这个，作为 root 登录主服务器并运行" #. type: CDATA #, no-wrap @@ -5266,6 +5271,9 @@ msgid "" "<emphasis>sshfs</emphasis> to mount home directories, so there's nothing to " "do for diskless workstations." msgstr "" +"<emphasis role=\"strong\">请注意：</emphasis> 主机密钥表的创建适合于<emphasis>工作站</emphasis>" +"，<emphasis>服务器</emphasis>和<emphasis>终端</emphasis>类型的系统但不是那些<emphasis>网络设备</em" +"phasis>的类型。还有，LTSP 客户端使用 <emphasis>sshfs</emphasis> 挂载主目录，所以那对于无盘工作站没什么要做的。" #. type: Content of: <article><section><section><section><title> msgid "How to enable it" @@ -5312,6 +5320,8 @@ msgid "" "run <computeroutput>exportfs</computeroutput> to control if <emphasis>gss/" "krb5i</emphasis> is active for both entries." msgstr "" +"如果两项 <emphasis>gss/krb5i</emphasis> 条目是有效的就运行 " +"<computeroutput>exportfs</computeroutput> 来管理。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "login as root." @@ -5408,6 +5418,7 @@ msgid "" "are pushed into the stable suite regularly when stable point releases are " "done, which roughly happens every two months." msgstr "" +"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。" #. type: Content of: <article><section><section><title> msgid "Using backports to install newer software" @@ -5542,6 +5553,8 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " +"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5610,6 +5623,9 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" +"wakeup</computeroutput> 支持的主板和 BIOS " +"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5629,6 +5645,12 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" +"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " +"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " +"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " +"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " +"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5845,6 +5867,10 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " +"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " +"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" +"应该在 /Students 之下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5856,6 +5882,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" +"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5871,6 +5899,10 @@ msgid "" "Samba tabs, maybe take screenshots to have information ready for the new " "template." msgstr "" +"从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " +"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " +"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5878,6 +5910,8 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" +"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/8c76447cc303319c2d28fc92131d742829952863...b6db1e3cfa18d30c1a30058b05ce9cd934df405d -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/8c76447cc303319c2d28fc92131d742829952863...b6db1e3cfa18d30c1a30058b05ce9cd934df405d 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/20200308/ad27b01f/attachment-0001.html> From gitlab at salsa.debian.org Sun Mar 8 13:07:53 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sun, 08 Mar 2020 13:07:53 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 3 commits: translation update by Wellington Terumi Uemura Message-ID: <5e64ee2a2a23d_6dca2ad41736377c4146d2@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: ed091933 by Frans Spiesschaert at 2020-03-08T14:04:23+01:00 translation update by Wellington Terumi Uemura Translation: Debian Edu Documentation/Audacity manual Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (154 of 154 strings) - - - - - 9467aeb4 by Frans Spiesschaert at 2020-03-08T14:05:49+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.3% (805 of 1196 strings) - - - - - f7cf4a75 by Frans Spiesschaert at 2020-03-08T14:07:36+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 78.7% (1105 of 1404 strings) - - - - - 3 changed files: - documentation/audacity/audacity-manual.pt_BR.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/audacity/audacity-manual.pt_BR.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-28 19:20+0000\n" +"PO-Revision-Date: 2020-02-28 22:01+0000\n" "Last-Translator: Wellington Terumi Uemura <wellingtonuemura at gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "debian-edu-documentation/audacity/pt_BR/>\n" @@ -494,7 +494,6 @@ msgid "Translation copyright and authors" msgstr "Direitos autorais de tradução e autores" #. type: Content of: <article><section><para> -#, fuzzy msgid "" "The Bokmål translation is copyrighted by Jon Nordby (2014), Petter " "Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is " @@ -521,8 +520,8 @@ msgid "" "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2018, " "2019, 2020) and is released under the GPL v2 or any later version." msgstr "" -"O direito autoral para a tradução Alemã é de Frans Spiesschaert (2014, 2018, " -"2019) e é lançada sob a GPL v2 ou qualquer outra versão posterior." +"O direito autoral da tradução para o Alemão é de Frans Spiesschaert (2014, " +"2018, 2019) e é lançada sob a GPL v2 ou qualquer outra versão posterior." #. type: Content of: <article><section><para> msgid "" @@ -535,13 +534,12 @@ msgstr "" "versão posterior." #. type: Content of: <article><section><para> -#, fuzzy msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " "Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " "later version." msgstr "" -"O direito autoral para a tradução para o chinês simplificado é de Zhang Miao " +"O direito autoral da tradução para o chinês simplificado é de Zhang Miao " "(2017), Ma Yong (2018) e zlffcn (2019) e é lançada sob a GPL v2 ou qualquer " "outra versão posterior." ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-02-28 11:49+0000\n" +"PO-Revision-Date: 2020-03-08 12:56+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5065,13 +5065,13 @@ msgstr "" msgid "" "For new systems added with GOsa², Kerberos host keytab files are generated " "automatically." -msgstr "" +msgstr "对于以 GOsa² 添加的新系统，自动生成 Kerberos 主机密钥表文件。" #. type: Content of: <article><section><section><para> msgid "" "To create one for a system already configured with GOsa², log in on the main " "server as root and run" -msgstr "" +msgstr "要为一个已用 GOsa² 配置过的系统创建这个，作为 root 登录主服务器并运行" #. type: CDATA #, no-wrap @@ -5248,6 +5248,7 @@ msgid "" "are pushed into the stable suite regularly when stable point releases are " "done, which roughly happens every two months." msgstr "" +"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。" #. type: Content of: <article><section><section><title> msgid "Using backports to install newer software" @@ -5382,6 +5383,8 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " +"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5450,6 +5453,9 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" +"wakeup</computeroutput> 支持的主板和 BIOS " +"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5469,6 +5475,12 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" +"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " +"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " +"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " +"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " +"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5706,6 +5718,10 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " +"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " +"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" +"应该在 /Students 之下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5717,6 +5733,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" +"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5732,6 +5750,10 @@ msgid "" "Samba tabs, maybe take screenshots to have information ready for the new " "template." msgstr "" +"从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " +"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " +"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5739,6 +5761,8 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" +"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-02-28 11:49+0000\n" +"PO-Revision-Date: 2020-03-08 12:56+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -5239,18 +5239,23 @@ msgid "" "server and workstation increases with the security level, <emphasis>krb5i</" "emphasis> might be a good choice." msgstr "" +"使用 Kerberos 对于 NFS 挂载主目录是一个安全特性。支持 " +"<emphasis>krb5</emphasis>，<emphasis>krb5i</emphasis> 和 " +"<emphasis>krb5p</emphasis> 级别（<emphasis>krb5</emphasis> 是指 Kerberos " +"验证，<emphasis>i</emphasis> 是完整检查的缩略而 <emphasis>p</emphasis> " +"是关于私人权利，即隐私）；服务器和工作站两者负载的增加与其安全级别一致，<emphasis>krb5i</emphasis> 可能是一个好选择。" #. type: Content of: <article><section><section><para> msgid "" "For new systems added with GOsa², Kerberos host keytab files are generated " "automatically." -msgstr "" +msgstr "对于以 GOsa² 添加的新系统，自动生成 Kerberos 主机密钥表文件。" #. type: Content of: <article><section><section><para> msgid "" "To create one for a system already configured with GOsa², log in on the main " "server as root and run" -msgstr "" +msgstr "要为一个已用 GOsa² 配置过的系统创建这个，作为 root 登录主服务器并运行" #. type: CDATA #, no-wrap @@ -5266,6 +5271,9 @@ msgid "" "<emphasis>sshfs</emphasis> to mount home directories, so there's nothing to " "do for diskless workstations." msgstr "" +"<emphasis role=\"strong\">请注意：</emphasis> 主机密钥表的创建适合于<emphasis>工作站</emphasis>" +"，<emphasis>服务器</emphasis>和<emphasis>终端</emphasis>类型的系统但不是那些<emphasis>网络设备</em" +"phasis>的类型。还有，LTSP 客户端使用 <emphasis>sshfs</emphasis> 挂载主目录，所以那对于无盘工作站没什么要做的。" #. type: Content of: <article><section><section><section><title> msgid "How to enable it" @@ -5312,6 +5320,8 @@ msgid "" "run <computeroutput>exportfs</computeroutput> to control if <emphasis>gss/" "krb5i</emphasis> is active for both entries." msgstr "" +"如果两项 <emphasis>gss/krb5i</emphasis> 条目是有效的就运行 " +"<computeroutput>exportfs</computeroutput> 来管理。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "login as root." @@ -5408,6 +5418,7 @@ msgid "" "are pushed into the stable suite regularly when stable point releases are " "done, which roughly happens every two months." msgstr "" +"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。" #. type: Content of: <article><section><section><title> msgid "Using backports to install newer software" @@ -5542,6 +5553,8 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " +"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5610,6 +5623,9 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" +"wakeup</computeroutput> 支持的主板和 BIOS " +"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5629,6 +5645,12 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" +"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " +"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " +"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " +"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " +"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5845,6 +5867,10 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " +"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " +"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" +"应该在 /Students 之下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5856,6 +5882,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" +"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5871,6 +5899,10 @@ msgid "" "Samba tabs, maybe take screenshots to have information ready for the new " "template." msgstr "" +"从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " +"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " +"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5878,6 +5910,8 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" +"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/488dfef4592dbb33205b014dcb15d123add6618b...f7cf4a752e7c2663accac10879b300e31be606d9 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/488dfef4592dbb33205b014dcb15d123add6618b...f7cf4a752e7c2663accac10879b300e31be606d9 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/20200308/3235f1f4/attachment-0001.html> From jenkins at jenkins.debian.net Mon Mar 9 04:40:07 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:40:07 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-music/1667 Message-ID: <417314149.210.1583728808057.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-music/1667//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-music/1667/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:40:34 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:40:34 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-workstation/1677 Message-ID: <248110718.212.1583728834651.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-workstation/1677//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-workstation/1677/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:43:46 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:43:46 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-language/239 Message-ID: <1996208811.214.1583729026111.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-language/239//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-language/239/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:45:38 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:45:38 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-gnome/1670 Message-ID: <314939762.216.1583729138308.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-gnome/1670//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-gnome/1670/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:47:54 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:47:54 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-development/1670 Message-ID: <1562448387.218.1583729274957.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-development/1670//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-development/1670/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:50:43 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:50:43 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-geography/1668 Message-ID: <1024952055.220.1583729443947.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-geography/1668//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-geography/1668/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:04:22 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:04:22 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-astronomy/1673 Message-ID: <1355166719.222.1583730262577.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-astronomy/1673//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-astronomy/1673/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:05:52 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:05:52 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-chemistry/1676 Message-ID: <185050287.224.1583730352514.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-chemistry/1676//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-chemistry/1676/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:17:15 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:17:15 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-lxde/1674 Message-ID: <167472925.226.1583731035130.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxde/1674//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxde/1674/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:17:17 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:17:17 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-kde/1678 Message-ID: <109127165.228.1583731037522.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-kde/1678//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-kde/1678/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:19:29 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:19:29 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-lxqt/699 Message-ID: <17474306.230.1583731169575.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxqt/699//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxqt/699/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:21:19 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:21:19 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-electronics/1669 Message-ID: <503094579.232.1583731280019.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-electronics/1669//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-electronics/1669/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:23:22 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:23:22 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-mate/1671 Message-ID: <1577815436.234.1583731402605.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-mate/1671//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-mate/1671/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:24:25 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:24:25 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-graphics/1668 Message-ID: <189830658.236.1583731465211.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-graphics/1668//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-graphics/1668/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:27:13 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:27:13 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-logic-games/1667 Message-ID: <1549697419.238.1583731634061.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-logic-games/1667//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-logic-games/1667/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:29:30 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:29:30 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-xfce/1677 Message-ID: <2139388427.240.1583731770918.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-xfce/1677//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-xfce/1677/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:31:02 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:31:02 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-ltsp-server/920 Message-ID: <827096147.243.1583731862474.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-ltsp-server/920//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-ltsp-server/920/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:32:03 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:32:03 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-mathematics/1672 Message-ID: <1211604278.245.1583731923748.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-mathematics/1672//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-mathematics/1672/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:32:36 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:32:36 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-main-server/1672 In-Reply-To: <230106116.161.1583645512830.JavaMail.jenkins@jenkins> References: <230106116.161.1583645512830.JavaMail.jenkins@jenkins> Message-ID: <2125724898.247.1583731956810.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-main-server/1672//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-main-server/1672/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:34:13 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:34:13 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-misc/1668 Message-ID: <1245874980.249.1583732053784.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-misc/1668//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-misc/1668/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:35:42 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:35:42 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-physics/1669 Message-ID: <1486933768.251.1583732142057.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-physics/1669//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-physics/1669/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:37:38 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:37:38 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-primaryschool/691 Message-ID: <1355902552.253.1583732258264.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-primaryschool/691//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-primaryschool/691/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:43:07 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:43:07 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-standalone/1671 In-Reply-To: <1289694168.163.1583646059831.JavaMail.jenkins@jenkins> References: <1289694168.163.1583646059831.JavaMail.jenkins@jenkins> Message-ID: <538478204.255.1583732587182.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-standalone/1671//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-standalone/1671/ for more information. From gitlab at salsa.debian.org Tue Mar 10 08:45:36 2020 From: gitlab at salsa.debian.org (hoxp18) Date: Tue, 10 Mar 2020 08:45:36 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] (ja) Debian Edu Buster manual translation update. Message-ID: <5e6753b033a59_6dca2ad41d365ee0638223@godard.mail> hoxp18 pushed to branch master at Debian Edu / debian-edu-doc Commits: 8a596450 by hoxp18 at 2020-03-10T17:44:12+09:00 (ja) Debian Edu Buster manual translation update. - - - - - 1 changed file: - documentation/debian-edu-buster/debian-edu-buster-manual.ja.po Changes: ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.ja.po ===================================== @@ -9753,19 +9753,14 @@ msgstr "" "以降で提供されています。" #. type: Content of: <article><section><para> -#, fuzzy -#| msgid "" -#| "The Polish translation is copyrighted by Stanisław Krukowski (2016, " -#| "2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is " -#| "released under the GPL v2 or any later version." msgid "" "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), " "Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) " "and is released under the GPL v2 or any later version." msgstr "" "ポーランド語の翻訳版は、Stanisław Krukowski (2016, 2017)、Wiktor " -"Wandachowicz (2019) そして Adrian Bystrek (2019) に著作権があり、GPL v2 とそ" -"れ以降のライセンスで提供されています。" +"Wandachowicz (2019)、Adrian Bystrek (2019)、そして Michal Biesiada (2020) に" +"著作権があり、GPL v2 とそれ以降のライセンスで提供されています。" #. type: Content of: <article><section><para> msgid "" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/8a596450fd791041c4a91f86ba138bfdcc96d645 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/8a596450fd791041c4a91f86ba138bfdcc96d645 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/20200310/58955d23/attachment.html> From gitlab at salsa.debian.org Tue Mar 10 11:28:44 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Tue, 10 Mar 2020 11:28:44 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Add changelog entry for Japanese Debian Edu Buster manual translation update Message-ID: <5e6779ec4af00_6dca2ad41d380628651163@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: 41647912 by Frans Spiesschaert at 2020-03-10T12:28:19+01:00 Add changelog entry for Japanese Debian Edu Buster manual translation update - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -21,6 +21,7 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium * Buster manual: - Chinese (Simplified): Ma Yong - Dutch: Frans Spiesschaert + - Japanese: hoxp18 -- Holger Levsen <holger at debian.org> Fri, 28 Feb 2020 16:24:40 +0100 View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/41647912b1e91fa0242555f78f9d096977b3468d -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/41647912b1e91fa0242555f78f9d096977b3468d 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/20200310/5d1cb54a/attachment-0001.html> From jenkins at jenkins.debian.net Tue Mar 10 12:47:04 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Tue, 10 Mar 2020 12:47:04 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-main-server_upgrade_to_sid/81 Message-ID: <1198683697.23.1583844426612.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-main-server_upgrade_to_sid/81//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-main-server_upgrade_to_sid/81/ for more information. From jenkins at jenkins.debian.net Tue Mar 10 14:11:00 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Tue, 10 Mar 2020 14:11:00 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-standalone_upgrade_to_sid/81 Message-ID: <16341551.26.1583849460397.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-standalone_upgrade_to_sid/81//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-standalone_upgrade_to_sid/81/ for more information. From gitlab at salsa.debian.org Tue Mar 10 16:33:38 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Tue, 10 Mar 2020 16:33:38 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] Adjust tftpd-hpa preseeding. Message-ID: <5e67c163a779_6dca2ad41d343ac068831@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install Commits: f79781af by Wolfgang Schweer at 2020-03-10T17:29:55+01:00 Adjust tftpd-hpa preseeding. Tests have shown that the --secure option still needs to be dropped to be able to both serve LTSP clients and provide the PXE installation menue on the main network. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2 changed files: - debian/changelog - preseed-values/defaults.main-server Changes: ===================================== debian/changelog ===================================== @@ -4,8 +4,8 @@ debian-edu-install (2.11.5) UNRELEASED; urgency=medium * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. [ Wolfgang Schweer ] - * preseed-values/defaults.main-server: Drop no longer needed preseeding for - tftpd-hpa, the defaults are just fine for working with the re-written LTSP. + * preseed-values/defaults.main-server: Drop no longer needed preseed value + for tftpd-hpa; the default directory will now be used for LTSP and PXE. * preseed-values/defaults.networked: Fix default-x-display-manager preseeding. -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 12:40:42 +0000 ===================================== preseed-values/defaults.main-server ===================================== @@ -45,6 +45,9 @@ sitesummary-client sitesummary-client/hostclass string main-server #Configure bind9 options debian-edu. bind9 bind9/default-start-options string -4 -u bind +# Unset '--secure' option so that both LTSP and PXE can be served. +tftpd-hpa tftpd-hpa/options string + # Ask for info on initial user before it is created in LDAP user-setup-udeb passwd/make-user boolean true View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/f79781afa1b73a0b3ff4fa4d047e6295b9f243e9 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/f79781afa1b73a0b3ff4fa4d047e6295b9f243e9 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/20200310/66b50b6b/attachment-0001.html> From gitlab at salsa.debian.org Tue Mar 10 20:12:20 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Tue, 10 Mar 2020 20:12:20 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] release as 2.11.5 Message-ID: <5e67f4a4e7117_6dca2ad41d3b32e471719f@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: a77aed7b by Holger Levsen at 2020-03-10T21:03:18+01:00 release as 2.11.5 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,14 +1,14 @@ -debian-edu-install (2.11.5) UNRELEASED; urgency=medium - - [ Holger Levsen ] - * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. +debian-edu-install (2.11.5) unstable; urgency=medium [ Wolfgang Schweer ] * preseed-values/defaults.main-server: Drop no longer needed preseed value for tftpd-hpa; the default directory will now be used for LTSP and PXE. * preseed-values/defaults.networked: Fix default-x-display-manager preseeding. - -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 12:40:42 +0000 + [ Holger Levsen ] + * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. + + -- Holger Levsen <holger at debian.org> Tue, 10 Mar 2020 21:03:08 +0100 debian-edu-install (2.11.4) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/a77aed7b1aaa689a2df4c00f406705aed9f7b176 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/a77aed7b1aaa689a2df4c00f406705aed9f7b176 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/20200310/cce2a4f0/attachment.html> From gitlab at salsa.debian.org Tue Mar 10 20:12:23 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Tue, 10 Mar 2020 20:12:23 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install] Pushed new tag 2.11.5 Message-ID: <5e67f4a77f241_6dca2ad41d343ac0717439@godard.mail> Holger Levsen pushed new tag 2.11.5 at Debian Edu / debian-edu-install -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/tree/2.11.5 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/20200310/60e389d3/attachment-0001.html> From jenkins at jenkins.debian.net Fri Mar 13 12:39:46 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:39:46 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-language_upgrade_to_sid/82 Message-ID: <724136514.5.1584103186586.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-language_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-language_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 12:43:17 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:43:17 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/82 Message-ID: <1378308242.7.1584103397915.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 12:47:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:47:57 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/82 Message-ID: <796115413.10.1584103677537.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 12:54:24 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:54:24 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/82 Message-ID: <1173407977.12.1584104064191.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 12:56:02 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:56:02 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/82 Message-ID: <1915468939.14.1584104162573.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:08:40 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:08:40 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/82 Message-ID: <2107031567.16.1584104920257.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:10:04 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:10:04 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/82 Message-ID: <1081495587.18.1584105004305.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:15:06 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:15:06 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-physics_upgrade_to_sid/82 Message-ID: <454037415.20.1584105306795.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-physics_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-physics_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:21:32 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:21:32 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/82 Message-ID: <1430196716.22.1584105692216.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:27:50 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:27:50 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-music_upgrade_to_sid/82 Message-ID: <1220535651.24.1584106070176.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-music_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-music_upgrade_to_sid/82/ for more information. From gitlab at salsa.debian.org Fri Mar 13 13:39:18 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Fri, 13 Mar 2020 13:39:18 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] d/rules: add workaround to fix (unreported) issue in blends-dev. Closes: #953359. Message-ID: <5e6b8d0679ffe_6dca2ad418fa92b01017948@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 7b316679 by Holger Levsen at 2020-03-13T14:39:02+01:00 d/rules: add workaround to fix (unreported) issue in blends-dev. Closes: #953359. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +debian-edu (2.11.13) UNRELEASED; urgency=medium + + * d/rules: add workaround to fix (unreported) issue in blends-dev. + Closes: #953359. + + -- Holger Levsen <holger at debian.org> Fri, 13 Mar 2020 14:37:26 +0100 + debian-edu (2.11.12) unstable; urgency=medium * debian/control: ===================================== debian/rules ===================================== @@ -1,3 +1,8 @@ #!/usr/bin/make -f include /usr/share/blends-dev/rules + +# workaround to fix #953359 +override_dh_install: + $(BLEND_INSTALL_HELPER) + dh_install -a $(BLENDNAME)-tasks.desc usr/share/tasksel/descs View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/7b316679288f178c7fb946008450973e3359e888 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/7b316679288f178c7fb946008450973e3359e888 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/20200313/eebc7e13/attachment-0001.html> From jenkins at jenkins.debian.net Fri Mar 13 13:44:56 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:44:56 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/82 Message-ID: <1849593642.27.1584107096636.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:51:39 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:51:39 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/82 Message-ID: <561273013.29.1584107499420.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:53:50 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:53:50 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/82 Message-ID: <187464411.31.1584107630329.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:19:35 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:19:35 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/82 Message-ID: <835162647.35.1584109175427.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:19:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:19:59 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/82 Message-ID: <1853598282.37.1584109199529.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:20:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:20:57 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/82 Message-ID: <203427940.39.1584109257866.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:22:21 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:22:21 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/82 Message-ID: <1407837126.41.1584109341365.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:23:53 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:23:53 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-geography_upgrade_to_sid/82 Message-ID: <445351437.43.1584109433543.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-geography_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-geography_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:27:25 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:27:25 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-misc_upgrade_to_sid/82 Message-ID: <1932067021.45.1584109645473.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-misc_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-misc_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:29:28 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:29:28 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-development_upgrade_to_sid/82 Message-ID: <52546687.47.1584109769006.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-development_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-development_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:30:15 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:30:15 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/82 Message-ID: <250011305.49.1584109815450.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/82/ for more information. From gitlab at salsa.debian.org Sat Mar 14 18:09:46 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 14 Mar 2020 18:09:46 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] release as 2.11.13 Message-ID: <5e6d1deaef0aa_6dca3fa29b39c9d4118313c@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: c43e182c by Holger Levsen at 2020-03-14T19:08:55+01:00 release as 2.11.13 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,9 @@ -debian-edu (2.11.13) UNRELEASED; urgency=medium +debian-edu (2.11.13) unstable; urgency=medium * d/rules: add workaround to fix (unreported) issue in blends-dev. Closes: #953359. - -- Holger Levsen <holger at debian.org> Fri, 13 Mar 2020 14:37:26 +0100 + -- Holger Levsen <holger at debian.org> Sat, 14 Mar 2020 19:08:21 +0100 debian-edu (2.11.12) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/c43e182c240b9a47fb13e994585036c3762cc8ef -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/c43e182c240b9a47fb13e994585036c3762cc8ef 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/20200314/fe9f42cf/attachment.html> From gitlab at salsa.debian.org Sat Mar 14 18:09:49 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 14 Mar 2020 18:09:49 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu] Pushed new tag 2.11.13 Message-ID: <5e6d1ded22a99_6dca2ad419bd1cb8118348f@godard.mail> Holger Levsen pushed new tag 2.11.13 at Debian Edu / debian-edu -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/tree/2.11.13 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/20200314/f6570841/attachment.html> From gitlab at salsa.debian.org Sat Mar 14 18:14:19 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 14 Mar 2020 18:14:19 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] nitpick on package description: less questions. Message-ID: <5e6d1efbdb719_6dca2ad419bd1cb81183763@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: bfb520df by Holger Levsen at 2020-03-14T19:13:07+01:00 nitpick on package description: less questions. Change package description: Set d-i values to install Debian Edu *with* *less* questions (not without). Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - debian/control Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +debian-edu-install (2.11.6) UNRELEASED; urgency=medium + + * Change package description: Set d-i values to install Debian Edu *with* + *less* questions (not without). + + -- Holger Levsen <holger at debian.org> Sat, 14 Mar 2020 19:12:12 +0100 + debian-edu-install (2.11.5) unstable; urgency=medium [ Wolfgang Schweer ] ===================================== debian/control ===================================== @@ -22,7 +22,7 @@ Depends: ${misc:Depends}, etckeeper, libgtk3-perl, lsb-base, -Description: Set d-i values to install Debian Edu without questions +Description: Set d-i values to install Debian Edu with less questions This package provides default answers for packages using debconf, and configures services to work out of the box after an installation. . View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/bfb520df43913321c91f49bcfa951bcd7ef5b6c6 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/bfb520df43913321c91f49bcfa951bcd7ef5b6c6 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/20200314/eb6fa348/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 14 21:14:20 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sat, 14 Mar 2020 21:14:20 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 8 commits: Translation: Debian Edu Documentation/Bullseye manual Message-ID: <5e6d492c9bd81_6dca2ad41c0c9624120278b@godard.mail> Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc Commits: 551f93e1 by Ma Yong at 2020-03-10T14:33:05+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.2% (816 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - f48245eb by EldersJavas at 2020-03-10T14:33:05+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.2% (816 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 0f2b563e by EldersJavas at 2020-03-10T14:33:06+01:00 Translation: Debian Edu Documentation/Audacity manual Translated using Weblate (Chinese (Simplified)) Currently translated at 44.8% (69 of 154 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/audacity/zh_Hans/ - - - - - fda9883f by EldersJavas at 2020-03-10T14:33:06+01:00 Translation: Debian Edu Documentation/Rosegarden manual Translated using Weblate (Chinese (Simplified)) Currently translated at 2.1% (15 of 692 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/rosegarden/zh_Hans/ - - - - - 77482a9b by Ma Yong at 2020-03-10T14:33:07+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.4% (1116 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 029198b4 by EldersJavas at 2020-03-10T14:33:08+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.4% (1116 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 7003c74f by Ma Yong at 2020-03-13T11:23:49+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.3% (818 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - b2b7df6a by Ma Yong at 2020-03-13T11:23:49+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.9% (1122 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 4 changed files: - documentation/audacity/audacity-manual.zh.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po - documentation/rosegarden/rosegarden-manual.zh.po Changes: ===================================== documentation/audacity/audacity-manual.zh.po ===================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-24 01:33+0000\n" -"Last-Translator: Ma Yong <debuser at yeah.net>\n" +"PO-Revision-Date: 2020-03-10 13:33+0000\n" +"Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/audacity/zh_Hans/>\n" "Language: zh\n" @@ -183,7 +183,6 @@ msgid "" msgstr "当你录音时最好记住不要将音量设置的过大，往往设置低一点比较合适。" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/recording.png'/></imageobject>" msgstr "" @@ -203,7 +202,6 @@ msgstr "" "音量而不会有部分声音过载的危险。" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/normalize.png'/></imageobject>" msgstr "" @@ -218,7 +216,6 @@ msgid "And after you have normalized the recorded segment, it looks like this:" msgstr "而后你有一小段合格的录音，看着像这样：" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/normalized.png'/></imageobject>" msgstr "" @@ -247,7 +244,6 @@ msgid "1. First zoom out so you more clearly can see the recording." msgstr "" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "<imageobject><imagedata fileref='./images/zoom.png'/></imageobject>" msgstr "" "<imageobject><imagedata fileref=\"./images/toolbox.png\"/></imageobject>" @@ -1076,7 +1072,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #~ msgid "HowTo translate this document" #~ msgstr "如何翻译本文档" ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-08 12:56+0000\n" +"PO-Revision-Date: 2020-03-13 10:23+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5795,6 +5795,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " +"“assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5830,7 +5832,7 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "" +msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5855,7 +5857,7 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "" +msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -5880,6 +5882,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " +"导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -8309,7 +8313,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #. type: Content of: <article><section><title> msgid "Appendix B - no Debian Edu Live CD/DVDs for Bullseye yet" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-08 12:56+0000\n" +"PO-Revision-Date: 2020-03-13 10:23+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -5944,6 +5944,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " +"“assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5979,7 +5981,7 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "" +msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5988,6 +5990,8 @@ msgid "" "automatically mounted and it is possible to access it browsing to the /media/" "$user folder. This is quite difficult for many non experienced users." msgstr "" +"当用户插入 USB 驱动器或者 DVD / CD-ROM 到瘦客户机时只显示一个通知窗口几秒钟。该媒体被自动挂载并且能够浏览 /media/$user " +"文件夹来访问它。这对于很多没有经验的用户不很困难。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5998,6 +6002,10 @@ msgid "" "enable</computeroutput> on the terminal server. (When using GNOME, device " "icons will be placed on the desktop allowing easy access)." msgstr "" +"如果 KDE “Plasma”（或者，并行安装到 KDE “Plasma” 的 LDXE）是作为桌面环境使用则能有默认的 KDE “Plasma” " +"文件管理器 Dolphin 出现。要配置这个，在终端服务器上简单地执行 <computeroutput>/usr/share/" +"debian-edu-config/ltspfs-mounter-kde enable</computeroutput>。（当使用 GNOME " +"时，设备图标会放在桌面上使之易于访问）。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -6006,6 +6014,8 @@ msgid "" "ROM / DVD or whatever media is connected to the thin client. This might come " "in handy if users want to edit files directly on their plugged in media." msgstr "" +"另外为了易于访问连到瘦客户机的 USB 驱动器，CD-ROM / DVD 或其他类似媒体将使用下面的脚本对所有用户在他们的主文件夹中创建 “media” " +"的符号链接。这可以对方便用户需要直接在插入的媒体中编辑文件起作用。" #. type: CDATA #, no-wrap @@ -6042,7 +6052,7 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "" +msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -6061,6 +6071,8 @@ msgid "" "Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this " "manual." msgstr "" +"作为使用 GOsa² 添加 <computeroutput>server</computeroutput> 类型新系统的要点在本手册的<link " +"linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">起步</link>一章中。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6068,6 +6080,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " +"导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -9283,7 +9297,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #. type: Content of: <article><section><title> msgid "Appendix B - no Debian Edu Live CD/DVDs for Buster yet" ===================================== documentation/rosegarden/rosegarden-manual.zh.po ===================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-24 01:33+0000\n" -"Last-Translator: Ma Yong <debuser at yeah.net>\n" +"PO-Revision-Date: 2020-03-10 13:33+0000\n" +"Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/rosegarden/zh_Hans/>\n" "Language: zh\n" @@ -3478,7 +3478,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #~ msgid "HowTo translate this document" #~ msgstr "如何翻译本文档" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/b6db1e3cfa18d30c1a30058b05ce9cd934df405d...b2b7df6a7122869ceecea39e9122ef9dd293ce1a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/b6db1e3cfa18d30c1a30058b05ce9cd934df405d...b2b7df6a7122869ceecea39e9122ef9dd293ce1a 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/20200314/d767e9bc/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 14 21:36:31 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sat, 14 Mar 2020 21:36:31 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 4 commits: translation update by Ma Yong and EldersJavas Message-ID: <5e6d4e6014969_6dca3fa29e004968120670@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: c950dd19 by Frans Spiesschaert at 2020-03-14T22:30:15+01:00 translation update by Ma Yong and EldersJavas Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.2% (816 of 1196 strings) - - - - - 62b56246 by Frans Spiesschaert at 2020-03-14T22:32:21+01:00 translation update by Ma Yong and EldersJavas Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.4% (1116 of 1404 strings) - - - - - 1eaf58f2 by Frans Spiesschaert at 2020-03-14T22:34:09+01:00 translation update by EldersJavas Translation: Debian Edu Documentation/Audacity manual Translated using Weblate (Chinese (Simplified)) Currently translated at 44.8% (69 of 154 strings) - - - - - 0a833d3b by Frans Spiesschaert at 2020-03-14T22:36:07+01:00 translation update by EldersJavas Translation: Debian Edu Documentation/Rosegarden manual Translated using Weblate (Chinese (Simplified)) Currently translated at 2.1% (15 of 692 strings) - - - - - 4 changed files: - documentation/audacity/audacity-manual.zh.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po - documentation/rosegarden/rosegarden-manual.zh.po Changes: ===================================== documentation/audacity/audacity-manual.zh.po ===================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-24 01:33+0000\n" -"Last-Translator: Ma Yong <debuser at yeah.net>\n" +"PO-Revision-Date: 2020-03-10 13:33+0000\n" +"Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/audacity/zh_Hans/>\n" "Language: zh\n" @@ -183,7 +183,6 @@ msgid "" msgstr "当你录音时最好记住不要将音量设置的过大，往往设置低一点比较合适。" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/recording.png'/></imageobject>" msgstr "" @@ -203,7 +202,6 @@ msgstr "" "音量而不会有部分声音过载的危险。" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/normalize.png'/></imageobject>" msgstr "" @@ -218,7 +216,6 @@ msgid "And after you have normalized the recorded segment, it looks like this:" msgstr "而后你有一小段合格的录音，看着像这样：" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/normalized.png'/></imageobject>" msgstr "" @@ -247,7 +244,6 @@ msgid "1. First zoom out so you more clearly can see the recording." msgstr "" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "<imageobject><imagedata fileref='./images/zoom.png'/></imageobject>" msgstr "" "<imageobject><imagedata fileref=\"./images/toolbox.png\"/></imageobject>" @@ -1076,7 +1072,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #~ msgid "HowTo translate this document" #~ msgstr "如何翻译本文档" ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-08 12:56+0000\n" +"PO-Revision-Date: 2020-03-13 10:23+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5795,6 +5795,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " +"“assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5830,7 +5832,7 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "" +msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5855,7 +5857,7 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "" +msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -5880,6 +5882,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " +"导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -8309,7 +8313,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #. type: Content of: <article><section><title> msgid "Appendix B - no Debian Edu Live CD/DVDs for Bullseye yet" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-08 12:56+0000\n" +"PO-Revision-Date: 2020-03-13 10:23+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -5944,6 +5944,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " +"“assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5979,7 +5981,7 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "" +msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5988,6 +5990,8 @@ msgid "" "automatically mounted and it is possible to access it browsing to the /media/" "$user folder. This is quite difficult for many non experienced users." msgstr "" +"当用户插入 USB 驱动器或者 DVD / CD-ROM 到瘦客户机时只显示一个通知窗口几秒钟。该媒体被自动挂载并且能够浏览 /media/$user " +"文件夹来访问它。这对于很多没有经验的用户不很困难。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5998,6 +6002,10 @@ msgid "" "enable</computeroutput> on the terminal server. (When using GNOME, device " "icons will be placed on the desktop allowing easy access)." msgstr "" +"如果 KDE “Plasma”（或者，并行安装到 KDE “Plasma” 的 LDXE）是作为桌面环境使用则能有默认的 KDE “Plasma” " +"文件管理器 Dolphin 出现。要配置这个，在终端服务器上简单地执行 <computeroutput>/usr/share/" +"debian-edu-config/ltspfs-mounter-kde enable</computeroutput>。（当使用 GNOME " +"时，设备图标会放在桌面上使之易于访问）。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -6006,6 +6014,8 @@ msgid "" "ROM / DVD or whatever media is connected to the thin client. This might come " "in handy if users want to edit files directly on their plugged in media." msgstr "" +"另外为了易于访问连到瘦客户机的 USB 驱动器，CD-ROM / DVD 或其他类似媒体将使用下面的脚本对所有用户在他们的主文件夹中创建 “media” " +"的符号链接。这可以对方便用户需要直接在插入的媒体中编辑文件起作用。" #. type: CDATA #, no-wrap @@ -6042,7 +6052,7 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "" +msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -6061,6 +6071,8 @@ msgid "" "Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this " "manual." msgstr "" +"作为使用 GOsa² 添加 <computeroutput>server</computeroutput> 类型新系统的要点在本手册的<link " +"linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">起步</link>一章中。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6068,6 +6080,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " +"导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -9283,7 +9297,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #. type: Content of: <article><section><title> msgid "Appendix B - no Debian Edu Live CD/DVDs for Buster yet" ===================================== documentation/rosegarden/rosegarden-manual.zh.po ===================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-24 01:33+0000\n" -"Last-Translator: Ma Yong <debuser at yeah.net>\n" +"PO-Revision-Date: 2020-03-10 13:33+0000\n" +"Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/rosegarden/zh_Hans/>\n" "Language: zh\n" @@ -3478,7 +3478,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #~ msgid "HowTo translate this document" #~ msgstr "如何翻译本文档" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/41647912b1e91fa0242555f78f9d096977b3468d...0a833d3b4b566b41883adaa3708a7e118b7eb94a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/41647912b1e91fa0242555f78f9d096977b3468d...0a833d3b4b566b41883adaa3708a7e118b7eb94a 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/20200314/9a5680b0/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 14 21:40:41 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sat, 14 Mar 2020 21:40:41 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] add changelog entries for this weeks weblate translation updates Message-ID: <5e6d4f59b9af8_6dca2ad41c0c96241207087@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: f19838c6 by Frans Spiesschaert at 2020-03-14T22:40:31+01:00 add changelog entries for this weeks weblate translation updates - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -8,18 +8,18 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium [ Translation updates ] * Audacity manual: - Norwegian Bokmål: Allan Nordhøy - - Chinese (Simplified): Ma Yong + - Chinese (Simplified): Ma Yong and EldersJavas - Portuguese (Brazil): Wellington Terumi Uemura * Rosegarden manual: - - Chinese (Simplified): Ma Yong + - Chinese (Simplified): Ma Yong and EldersJavas * ITIL manual: - Chinese (Simplified): Ma Yong * Bullseye manual: - - Chinese (Simplified): Ma Yong + - Chinese (Simplified): Ma Yong and EldersJavas - Norwegian Bokmål: Allan Nordhøy - Dutch: Frans Spiesschaert * Buster manual: - - Chinese (Simplified): Ma Yong + - Chinese (Simplified): Ma Yong and EldersJavas - Dutch: Frans Spiesschaert - Japanese: hoxp18 View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/f19838c6dda5e715513657d4e56128305d5f19c4 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/f19838c6dda5e715513657d4e56128305d5f19c4 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/20200314/582e2d5e/attachment-0001.html> From jenkins at jenkins.debian.net Sun Mar 15 04:44:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 04:44:59 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-music/1673 Message-ID: <1323185218.111.1584247499717.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-music/1673//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-music/1673/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 04:51:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 04:51:59 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-gnome/1676 Message-ID: <1385832748.114.1584247919271.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-gnome/1676//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-gnome/1676/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 04:52:04 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 04:52:04 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-lxqt/705 Message-ID: <513049189.116.1584247924759.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxqt/705//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxqt/705/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:00:20 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:00:20 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-kde/1684 Message-ID: <930445129.118.1584248420240.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-kde/1684//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-kde/1684/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:10:35 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:10:35 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-astronomy/1679 Message-ID: <1597476970.121.1584249035786.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-astronomy/1679//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-astronomy/1679/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:11:34 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:11:34 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-chemistry/1682 Message-ID: <1381938903.123.1584249094445.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-chemistry/1682//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-chemistry/1682/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:27:40 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:27:40 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-development/1676 Message-ID: <2039616730.126.1584250060559.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-development/1676//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-development/1676/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:29:13 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:29:13 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-lxde/1680 Message-ID: <967595340.128.1584250153571.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxde/1680//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxde/1680/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:29:35 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:29:35 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-electronics/1675 Message-ID: <297572563.130.1584250176000.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-electronics/1675//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-electronics/1675/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:30:49 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:30:49 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-mate/1677 Message-ID: <2070652768.134.1584250249311.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-mate/1677//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-mate/1677/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:31:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:31:57 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-xfce/1683 Message-ID: <1532141560.136.1584250317320.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-xfce/1683//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-xfce/1683/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:32:50 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:32:50 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-geography/1674 Message-ID: <468890030.138.1584250370175.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-geography/1674//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-geography/1674/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:33:34 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:33:34 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-graphics/1674 Message-ID: <2031636430.140.1584250414067.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-graphics/1674//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-graphics/1674/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:34:49 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:34:49 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-language/245 Message-ID: <460264215.142.1584250489715.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-language/245//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-language/245/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:36:18 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:36:18 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-logic-games/1673 Message-ID: <568741127.144.1584250578734.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-logic-games/1673//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-logic-games/1673/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:41:32 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:41:32 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-misc/1674 Message-ID: <843773437.146.1584250892233.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-misc/1674//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-misc/1674/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:41:50 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:41:50 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-mathematics/1678 Message-ID: <1462290891.148.1584250910673.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-mathematics/1678//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-mathematics/1678/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:42:41 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:42:41 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-ltsp-server/926 Message-ID: <117600017.150.1584250961251.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-ltsp-server/926//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-ltsp-server/926/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:46:49 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:46:49 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-physics/1675 Message-ID: <470148334.152.1584251210116.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-physics/1675//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-physics/1675/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:48:12 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:48:12 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-primaryschool/697 Message-ID: <2140829404.154.1584251292899.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-primaryschool/697//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-primaryschool/697/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:59:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:59:59 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-workstation/1683 Message-ID: <1362799885.156.1584252000077.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-workstation/1683//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-workstation/1683/ for more information. From gitlab at salsa.debian.org Sun Mar 15 22:40:31 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Sun, 15 Mar 2020 22:40:31 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Rework PXE installation setup to be compliant with re-written LTSP. Message-ID: <5e6eaedf849d3_6dca2ad41f85dea0130414b@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: 168da215 by Wolfgang Schweer at 2020-03-15T23:34:08+01:00 Rework PXE installation setup to be compliant with re-written LTSP. These changes have the additional benefit to provide network booting for both BIOS and UEFI based systems due to the change to iPXE. - ldap-bootstrap/gosa-server.ldif: + Add DHCP options to provide an iPXE related config space. + Add system architecture related DHCP option. + Add DHCP statement to be able to conditionally hand out the correct boot file. This also makes sure that both PXE and iPXE capable systems are supported via chainloading iPXE. - sbin/debian-edu-pxeinstall: + Switch to iPXE to provide the installation menu. + Modify the existing iPXE menu in case of a combined server, i.e. main server and LTSP server. + Generate an iPXE menue in case of a plain main server. + Cleanup from outdated and obsolete comments and code. + Whitespace fixes. - etc/debian-edu/pxeinstall.conf: + Use the graphical installer by default. + Adjust entries and comments to reflect the changes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 4 changed files: - debian/changelog - etc/debian-edu/pxeinstall.conf - ldap-bootstrap/gosa-server.ldif - sbin/debian-edu-pxeinstall Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,27 @@ +debian-edu-config (2.11.17) UNRELEASED; urgency=medium + + * Rework PXE installation setup to be compliant with re-written LTSP. These + changes have the additional benefit to provide network booting for both + BIOS and UEFI based systems due to the change to iPXE. + - ldap-bootstrap/gosa-server.ldif: + + Add DHCP options to provide an iPXE related config space. + + Add system architecture related DHCP option. + + Add DHCP statement to be able to conditionally hand out the correct boot + file. This also makes sure that both PXE and iPXE capable systems are + supported via chainloading iPXE. + - sbin/debian-edu-pxeinstall: + + Switch to iPXE to provide the installation menu. + + Modify the existing iPXE menu in case of a combined server, i.e. main + server and LTSP server. + + Generate an iPXE menue in case of a plain main server. + + Cleanup from outdated and obsolete comments and code. + + Whitespace fixes. + - etc/debian-edu/pxeinstall.conf: + + Use the graphical installer by default. + + Adjust entries and comments to reflect the changes. + + -- Wolfgang Schweer <wschweer at arcor.de> Sat, 14 Mar 2020 23:08:36 +0100 + debian-edu-config (2.11.16) unstable; urgency=medium [ Wolfgang Schweer ] ===================================== etc/debian-edu/pxeinstall.conf ===================================== @@ -1,26 +1,15 @@ -# Examples for local settings. Run 'debian-edu-pxeinstall' to regenerate -# the PXE menu for any changes to take effect. - -# Default LTSP chroot arch is like the server arch. -# If set differently, an appropriate LTSP chroot and changes in LDAP are -# needed; see the manual for details. -#ltsparch=i386 - -# Set if NFS instead of default NBD is to be used for LTSP (10.0.0.0/8 network); -# see the manual for details. -#rootdev=nfs +# Examples for local settings. Run 'debian-edu-pxeinstall' to re-generate the netboot +# environment and the iPXE menu each time any changes have been made.. # Set a different desktop environment for new installations instead of the default xfce one. #mydesktop=mate -# Set if the Debian Installer should be run in graphical instead of text mode. -#graphicdi=true +# Comment the next entry if the Debian Installer should be run in text mode. +graphicdi=true # If e.g. 'apt-cacher-ng' is running on the gateway and should be used for installation. #http_proxy=http://10.0.0.1:3142 #ftp_proxy=http://10.0.0.1:3142 # Set this during development to test if daily d-i netboot.tar.gz is working. -# Run 'rm -rf /var/lib/tftpboot/debian-installer' followed by 'debian-edu-pxeinstall' after -# setting it, and remember to run both commands also once this is commented again. #dailydi=true ===================================== ldap-bootstrap/gosa-server.ldif ===================================== @@ -20,12 +20,17 @@ ipHostNumber: 10.0.2.2 gotoMode: locked dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no -dhcpOption: smtp-server code 69 = array of ip-address -dhcpOption: wpad-url code 252 = text dhcpStatements: authoritative dhcpStatements: ddns-update-style none dhcpStatements: max-lease-time 3600 dhcpStatements: default-lease-time 1800 +dhcpOption: smtp-server code 69 = array of ip-address +dhcpOption: wpad-url code 252 = text +dhcpOption: space ipxe +dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe +dhcpOption: ipxe.menu code 39 = unsigned integer 8 +dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8 +dhcpOption: arch code 93 = unsigned integer 16 cn: dhcp objectClass: top objectClass: dhcpService @@ -228,11 +233,11 @@ dhcpOption: domain-name-servers 10.0.2.2 dhcpStatements: default-lease-time 1800 dhcpStatements: max-lease-time 3600 dhcpStatements: next-server tjener -dhcpStatements: filename "/var/lib/tftpboot/pxelinux.0" dhcpStatements: authoritative dhcpStatements: allow unknown-clients dhcpStatements: allow bootp dhcpStatements: allow booting +dhcpStatements: if exists ipxe.menu { filename "ltsp/ltsp.ipxe"; } elsif option arch = 00:00 { filename "ltsp/undionly.kpxe"; } elsif option arch = 00:07 { filename "ltsp/snponly.efi"; } elsif option arch = 00:09 { filename "ltsp/snponly.efi"; } else { filename "ltsp/unmatched-client"; } cn: intern objectClass: top objectClass: dhcpSharedNetwork ===================================== sbin/debian-edu-pxeinstall ===================================== @@ -4,9 +4,6 @@ # # A better idea might be to use di-netboot-assistant, # <URL:http://www.klabs.be/~fpiat/linux/debian/di-netboot-assistant/>. -# See also the original bin/debian-edu-pxelinux.cfg -# (bin/debian-edu-pxelinux.cfg has been removed from the -# debian-edu-config source after 1.443~svn66662) set -e @@ -18,23 +15,23 @@ export LC_ALL ## Try to find the DNS from the leases file, if that fails use ## default DNS: if [ ! -s /etc/resolv.conf ] ; then - DNS="10.0.2.2" - LEASEDIR=/var/lib/dhcp/ - if [ -d $LEASEDIR ] ; then - LEASEFILE=$LEASEDIR`ls -tr -1 $LEASEDIR | tail -n 1` - if [ -r $LEASEFILE ] ; then - if DNSLEASE=`cat $LEASEFILE | grep domain-name-servers | \ - tail -n 1 | \ - grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+"` ; then - DNS=$DNSLEASE - echo "info: Found leases file and domain-name-server: $DNS." - else - echo "info: Could not extract DNS from leases file." - fi + DNS="10.0.2.2" + LEASEDIR=/var/lib/dhcp/ + if [ -d $LEASEDIR ] ; then + LEASEFILE=$LEASEDIR`ls -tr -1 $LEASEDIR | tail -n 1` + if [ -r $LEASEFILE ] ; then + if DNSLEASE=`cat $LEASEFILE | grep domain-name-servers | \ + tail -n 1 | \ + grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+"` ; then + DNS=$DNSLEASE + echo "info: Found leases file and domain-name-server: $DNS." + else + echo "info: Could not extract DNS from leases file." + fi + fi fi - fi - echo "info: Create temporary /etc/resolv.conf with DNS: $DNS." - cat >> /etc/resolv.conf <<EOF + echo "info: Create temporary /etc/resolv.conf with DNS: $DNS." + cat >> /etc/resolv.conf <<EOF ## This is a temporary resolv.conf created by $0. ## If you find it after installation, something went wrong. Try to replace it ## by a symlink: /etc/resolv.conf -> /etc/resolvconf/run/resolv.conf, i.e.: @@ -42,7 +39,7 @@ if [ ! -s /etc/resolv.conf ] ; then nameserver $DNS search intern EOF -fi + fi # Make sure the created directories and files are readable by tfptd # run as user nobody. @@ -50,31 +47,29 @@ umask 022 # Fetch ftp_proxy and http_proxy if set globally if [ -f /etc/environment ] ; then - . /etc/environment + . /etc/environment fi [ "$dist" ] || dist=$(lsb_release -sc) [ "$archs" ] || archs="amd64 i386" -[ "$ltsparch" ] || ltsparch=$(dpkg --print-architecture) [ "$mirrorurl" ] || mirrorurl=http://deb.debian.org/debian [ "$hostname" ] || hostname=pxeinstall [ "$domain" ] || domain=intern [ "$mydesktop" ] || mydesktop=xfce [ "$graphicdi" ] || graphicdi=false [ "$dailydi" ] || dailydi=false -[ "$rootdev" ] || rootdev=nbd0 # Not hardcoded to allow PXE installation of a main-server without a # proxy set #[ "$http_proxy" ] || http_proxy=http://webcache:3128 #[ "$ftp_proxy" ] || ftp_proxy=http://webcache:3128 if [ -f /etc/debian-edu/config ] ; then - . /etc/debian-edu/config + . /etc/debian-edu/config fi # Allow site specific overrides to the variables if [ -f /etc/debian-edu/pxeinstall.conf ] ; then - . /etc/debian-edu/pxeinstall.conf + . /etc/debian-edu/pxeinstall.conf fi # This part does not work from within debian-installer, as it is @@ -84,30 +79,30 @@ fi # debian-edu-install, copying the files a bit earlier. installconfig="" for template in debian-installer/locale \ - keyboard-configuration/xkb-keymap \ - tasksel/desktop; do - value="$(debconf-get-selections --installer | grep $template | awk '{print $4}')" - if [ -z "$value" ] ; then - # If there is no value in the installer debconf database, set the default one. - # Useful if modular main server installation has been used (no desktop). - value="$mydesktop" - fi - - # Using desktop= as kernel argument work, while tasksel/desktop= - # do not. No idea why, but lets use the one that work. - if [ "tasksel/desktop" = $template ] ; then template=desktop ; desktop=$value; fi - - # Map the long name to the short alias, to keep the argument list - # shorter. - if [ "debian-installer/locale" = $template ] ; then template=locale; fi - if [ "keyboard-configuration/xkb-keymap" = $template ] ; then template=keymap; fi - - if [ "$value" ] ; then + keyboard-configuration/xkb-keymap \ + tasksel/desktop; do + value="$(debconf-get-selections --installer | grep $template | awk '{print $4}')" + if [ -z "$value" ] ; then + # If there is no value in the installer debconf database, set the default one. + # Useful if modular main server installation has been used (no desktop). + value="$mydesktop" + fi + + # Using desktop= as kernel argument work, while tasksel/desktop= + # do not. No idea why, but lets use the one that work. + if [ "tasksel/desktop" = $template ] ; then template=desktop ; desktop=$value; fi + + # Map the long name to the short alias, to keep the argument list + # shorter. + if [ "debian-installer/locale" = $template ] ; then template=locale; fi + if [ "keyboard-configuration/xkb-keymap" = $template ] ; then template=keymap; fi + + if [ "$value" ] ; then installconfig="$installconfig $template=$value" - fi + fi done -tftpdir=/var/lib/tftpboot +tftpdir=/srv/tftp # Where to find the preseed file on the web preseedurl=http://www/debian-edu-install.dat @@ -115,76 +110,88 @@ preseedurl=http://www/debian-edu-install.dat # Where the preseed file is on the disk. preseedfile=/etc/debian-edu/www/debian-edu-install.dat -# Start from a clean state if run after LTSP chroot arch changes. -if [ -d $tftpdir/debian-edu ] ; then - rm -rf $tftpdir/debian-edu +# Start from a clean state after any configuration changes have been made. +if [ -d $tftpdir/ltsp ] ; then + rm -rf $tftpdir/debian-edu + rm -rf $tftpdir/debian-installer + rm -f $tftpdir/ltsp/ltsp.ipxe + # re-generate clean ipxe menu file in case of LTSP client support. + if [ -d /srv/ltsp/images ] ; then + ltsp ipxe + # adjust ipxe menue for Debian Edu use. + sed -i 's#ltsp/ltsp.img#ltsp/${img}/ltsp.img#' /srv/tftp/ltsp/ltsp.ipxe + fi fi [ -d $tftpdir ] || mkdir $tftpdir [ -d $tftpdir/debian-edu ] || mkdir $tftpdir/debian-edu for arch in $archs ; do - ( - if [ true = "$dailydi" ] ; then - diurl=https://d-i.debian.org/daily-images/$arch/daily/netboot - else - diurl=$mirrorurl/dists/$dist/main/installer-$arch/current/images/netboot - fi - [ -d $tftpdir/debian-installer ] || \ - mkdir $tftpdir/debian-installer - cd $tftpdir/debian-installer - di_ver=10 - tarball="" - if [ -d /usr/lib/debian-installer/images/$di_ver/$arch ]; then - di_img_dir="/usr/lib/debian-installer/images/$di_ver/$arch" - # Use the debian/installer netboot debs - tarball="" - if [ true = "$graphicdi" ]; then - ln -sf $di_img_dir/gtk/debian-installer/$arch $arch - else - ln -sf $di_img_dir/text/debian-installer/$arch $arch - fi - elif [ ! -f netboot-$arch.tar.gz ] ; then - if [ true = "$graphicdi" ]; then - # Use this URL for graphical installer, and fix - # gtkvideo setting below - url=$diurl/gtk/netboot.tar.gz - else - url=$diurl/netboot.tar.gz - fi - echo "Fetching $url" - if wget -q -O netboot-$arch.tar.gz.new $url ; then - mv netboot-$arch.tar.gz.new netboot-$arch.tar.gz - tarball=netboot-$arch.tar.gz - else - echo "error: Unable to download $url" - exit 1 - fi - fi - if [ "$tarball" ] ; then - tar --strip-components=2 -zxvf $tarball - fi - if [ true = "$graphicdi" ]; then - # Replace Debian installer logo with Debian Edu one. - TMP=$(mktemp -d) - mkdir $TMP/$arch - cd $TMP/$arch - mkdir new - cd new - unmkinitramfs /var/lib/tftpboot/debian-installer/$arch/initrd.gz . - cp /usr/share/pixmaps/debian-edu-$dist-installer-logo.png usr/share/graphics/logo_debian.png - find . | cpio -H newc -o > ../initrd - cd .. - gzip initrd - cp initrd.gz /var/lib/tftpboot/debian-installer/$arch - rm -rf $TMP/$arch - fi - ) + ( + if [ true = "$dailydi" ] ; then + diurl=https://d-i.debian.org/daily-images/$arch/daily/netboot + else + diurl=$mirrorurl/dists/$dist/main/installer-$arch/current/images/netboot + fi + [ -d $tftpdir/debian-installer ] || \ + mkdir $tftpdir/debian-installer + cd $tftpdir/debian-installer + di_ver=11 + tarball="" + if [ -d /usr/lib/debian-installer/images/$di_ver/$arch ]; then + di_img_dir="/usr/lib/debian-installer/images/$di_ver/$arch" + # Use the debian/installer netboot debs + tarball="" + if [ true = "$graphicdi" ]; then + ln -sf $di_img_dir/gtk/debian-installer/$arch $arch + else + ln -sf $di_img_dir/text/debian-installer/$arch $arch + fi + elif [ ! -f netboot-$arch.tar.gz ] ; then + if [ true = "$graphicdi" ]; then + # Use this URL for graphical installer, and fix + # gtkvideo setting below + url=$diurl/gtk/netboot.tar.gz + else + url=$diurl/netboot.tar.gz + fi + echo "Fetching $url" + if wget -q -O netboot-$arch.tar.gz.new $url ; then + mv netboot-$arch.tar.gz.new netboot-$arch.tar.gz + tarball=netboot-$arch.tar.gz + else + echo "error: Unable to download $url" + exit 1 + fi + fi + if [ "$tarball" ] ; then + tar --strip-components=2 -zxvf $tarball + fi + if [ true = "$graphicdi" ]; then + # Replace Debian installer logo with Debian Edu one. + TMP=$(mktemp -d) + mkdir $TMP/$arch + cd $TMP/$arch + mkdir new + cd new + unmkinitramfs $tftpdir/debian-installer/$arch/initrd.gz . + if grep -q sid /etc/debian_version ; then + cp /usr/share/pixmaps/debian-edu-buster-installer-logo.png usr/share/graphics/logo_debian.png + else + cp /usr/share/pixmaps/debian-edu-$dist-installer-logo.png usr/share/graphics/logo_debian.png + fi + find . | cpio -H newc -o > ../initrd + cd .. + gzip initrd + cp initrd.gz $tftpdir/debian-installer/$arch + rm -rf $TMP + fi + ) done echo "Generating $preseedfile" ( - cat <<EOF + cat <<EOF # Enable the Debian Edu installer overrides d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Debian-Edu debian-installer profile @@ -199,7 +206,7 @@ d-i mirror/http/proxy string $http_proxy d-i mirror/ftp/proxy string $ftp_proxy # list extra packages to install here -#d-i pkgsel/include string acroread +#d-i pkgsel/include string <pkg_name> # if you want popcon enabled by default #d-i debian-edu-install/participate-popcon boolean true @@ -213,10 +220,6 @@ d-i mirror/ftp/proxy string $ftp_proxy # If you want to avoid the password question #d-i passwd/root-password-crypted password passwordhash -# Tell LTSP to not use the CDROM, but a HTTP mirror -d-i ltsp-client-builder/use_cdrom boolean false -d-i ltsp-client-builder/build-client-opts string --mirror $mirrorurl --dist $dist - # Tell PXE clients to fetch the correct time from the central NTP server # d-i is unable to discover the ntp-server DHCP option. Hardcode # setting here instead. FIXME: Remove when #714288 in netcfg is fixed. @@ -224,12 +227,12 @@ d-i netcfg/dhcp_ntp_servers string ntp # Pass on the time zone used on the main-server EOF - debconf-get-selections --installer | grep -w 'time/zone' + debconf-get-selections --installer | grep -w 'time/zone' - # No use copying the installation mirror setting if a DVD or USB - # stick was used. - if grep -qi 'dvd|bd' /etc/apt/sources.list ; then -cat <<EOF + # No use copying the installation mirror setting if a DVD or USB + # stick was used. + if grep -qi 'dvd|bd' /etc/apt/sources.list ; then + cat <<EOF # Avoid questions about mirrors, using manual setup choose-mirror-bin mirror/country string manual @@ -238,143 +241,124 @@ choose-mirror-bin mirror/http/mirror select choose-mirror-bin mirror/http/hostname string deb.debian.org choose-mirror-bin mirror/http/directory string /debian EOF - else + else debconf-get-selections --installer | egrep -w 'mirror/http/mirror|mirror/country|mirror/protocol|mirror/http/hostname|mirror/http/directory|mirror/ftp/hostname|mirror/ftp/directory' | sort - fi + fi - # Make it easier to have local overrides and still be able to - # rerun debian-edu-pxeinstall. - if [ -f $preseedfile.local ] ; then - cat $preseedfile.local - fi + # Make it easier to have local overrides and still be able to + # rerun debian-edu-pxeinstall. + if [ -f $preseedfile.local ] ; then + cat $preseedfile.local + fi ) > $preseedfile -if [ "$passwdmd5hash" ]; then - cat <<EOF > $tftpdir/debian-edu/menupasswd.cfg - MENU PASSWD $passwdmd5hash -EOF -fi - menufile=$tftpdir/debian-edu/install.cfg echo "Generating $menufile" ( - if [ true = "$graphicdi" ]; then - gtkvideo="vga=788" - fi - for arch in $archs ; do - cat <<EOF - # Based on the values used in Debian, and added the preseed URL -LABEL neteduboot-$arch - MENU LABEL Install Edu/^$arch ($desktop) - kernel debian-installer/$arch/linux - append $gtkvideo initrd=debian-installer/$arch/initrd.gz auto url=$preseedurl hostname=$hostname domain=$domain $installconfig --- quiet - ipappend 2 -include menupassword.cfg - + if [ true = "$graphicdi" ]; then + gtkvideo="vga=788" + fi + for arch in $archs ; do + cat <<EOF + +# Based upon locale, keymap and desktop values used during main-server installation; auto URL added. +:$arch +set params auto url=http://www/debian-edu-install.dat hostname=$hostname domain=$domain $installconfig $gtkvideo --- quiet ipappend 2 +kernel /debian-installer/$arch/linux initrd=initrd.gz \${params} +initrd /debian-installer/$arch/initrd.gz +boot || goto failed EOF - done + done ) > $menufile -memtest= -if [ -f /boot/memtest86.bin ] ; then - memtest=/boot/memtest86.bin -fi -if [ -f /boot/memtest86+.bin ] ; then - memtest=/boot/memtest86+.bin -fi -if [ "$memtest" ] ; then - cp $memtest $tftpdir/debian-edu/memtest86 - cat <<EOF > $tftpdir/debian-edu/memtest.cfg -LABEL memtest86 - MENU LABEL Test ^memory - kernel debian-edu/memtest86 - -EOF +if grep -q sid /etc/debian_version ; then + cp /usr/share/pixmaps/debian-edu-buster-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png +else + cp /usr/share/pixmaps/debian-edu-$dist-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png fi -if [ -d /var/lib/tftpboot/ltsp/$ltsparch ] ; then - ltsproot=/opt/ltsp/$ltsparch - - cat <<EOF > $tftpdir/debian-edu/ltsp-thin.cfg - -LABEL ltsp-thin - MENU LABEL LTSP ^thin client - KERNEL ltsp/$ltsparch/vmlinuz - APPEND initrd=ltsp/$ltsparch/initrd.img init=/sbin/init-ltsp root=/dev/$rootdev ro LTSP_FATCLIENT=False quiet - IPAPPEND 2 -EOF - cat > $tftpdir/debian-edu/default-thin.cfg <<EOF -DEFAULT ltsp/$ltsparch/vmlinuz initrd=ltsp/$ltsparch/initrd.img init=/sbin/init-ltsp root=/dev/$rootdev ro LTSP_FATCLIENT=False quiet ipappend 2 - -EOF - -# See if LTSP also have diskless workstation support - if [ -e $ltsproot/lib/x86_64-linux-gnu/security/pam_krb5.so -a "amd64" = $ltsparch ] || \ - [ -e $ltsproot/lib/x86_64-linux-gnu/security/pam_ldap.so -a "amd64" = $ltsparch ] || \ - [ -e $ltsproot/lib/x86_64-linux-gnu/security/pam_sss.so -a "amd64" = $ltsparch ] || \ - [ -e $ltsproot/lib/i386-linux-gnu/security/pam_krb5.so -a "i386" = $ltsparch ] || \ - [ -e $ltsproot/lib/i386-linux-gnu/security/pam_ldap.so -a "i386" = $ltsparch ] || \ - [ -e $ltsproot/lib/i386-linux-gnu/security/pam_sss.so -a "i386" = $ltsparch ] ; then - cat <<EOF > $tftpdir/debian-edu/ltsp-diskless.cfg - -LABEL ltsp-diskless - MENU LABEL LTSP ^diskless workstation - KERNEL ltsp/$ltsparch/vmlinuz - APPEND initrd=ltsp/$ltsparch/initrd.img init=/sbin/init-ltsp root=/dev/$rootdev ro quiet - IPAPPEND 2 - -EOF - cat > $tftpdir/debian-edu/default-diskless.cfg <<EOF -DEFAULT ltsp/$ltsparch/vmlinuz initrd=ltsp/$ltsparch/initrd.img init=/sbin/init-ltsp root=/dev/$rootdev ro quiet ipappend 2 +# Generate/modify the iPXE menu file +if [ -f $tftpdir/ltsp/ltsp.ipxe ] ; then + # ltsp is installed already, modify existing ipxe menu + if ! grep -q main-server $tftpdir/ltsp/ltsp.ipxe ; then + echo "Modifying $tftpdir/ltsp/ltsp.ipxe" + sed -i '/^menu.*/ a item\ +item --gap Installation:\ +item --key a amd64 Install Debian Edu/amd64 (64-Bit)\ +item --key i i386 Install Debian Edu/i386 (32-Bit)\ +item\ +' /srv/tftp/ltsp/ltsp.ipxe + cat $menufile >> $tftpdir/ltsp/ltsp.ipxe + fi +else + # generate ipxe menu on a plain main server for PXE installations + mkdir -p $tftpdir/ltsp/ + cp /usr/lib/ipxe/undionly.kpxe $tftpdir/ltsp/ + cp /usr/lib/ipxe/snponly.efi $tftpdir/ltsp/ + cp /boot/memtest86+.bin $tftpdir/ltsp/ + echo "Generating $tftpdir/ltsp/ltsp.ipxe" + cat <<EOF > /srv/tftp/ltsp/ltsp.ipxe +#!ipxe +# +# Configure iPXE for network installations + +# Set the default image (img) based on arch, or to root-path if it's not empty +cpuid --ext 29 && set img amd64 || set img i386 + +goto start + +:start +# To completely hide the menu, set menu-timeout to -1 +isset \${menu-timeout} || set menu-timeout 5000 +iseq "\${menu-timeout}" "-1" && goto \${img} || +menu Debian Edu iPXE boot menu || goto \${img} +item +item --gap Debian Edu installation: +item --key a amd64 Install Debian Edu/amd64 (64-Bit) +item --key i i386 Install Debian Edu/i386 (32-Bit) +item +item --gap Other options: +item --key m memtest Memory test +item --key c config Enter iPXE configuration +item --key s shell Drop to iPXE shell +item --key d disk Boot from the first local disk +item +item --key x exit Exit iPXE and continue BIOS boot +choose --timeout \${menu-timeout} --default \${img} img || goto cancel +goto \${img} + +:memtest +iseq \${platform} pcbios && kernel memtest86+.bin || kernel memtest.efi +# Boot "fails" on normal memtest exit with Esc, so show the menu again +boot || +goto start + +:config +config +goto start + +:shell +echo Type 'exit' to get the back to the menu +shell +goto start + +:disk +# Boot the first local HDD +sanboot --no-describe --drive 0x80 || goto failed + +:exit +exit 1 + +:cancel +echo You cancelled the menu, dropping to a shell +goto shell + +:failed +echo Booting failed, dropping to a shell +goto shell EOF - fi + if ! grep -q main-server $tftpdir/ltsp/ltsp.ipxe ; then + cat $menufile >> $tftpdir/ltsp/ltsp.ipxe + fi fi -cat <<EOF > $tftpdir/debian-edu/localboot.cfg -LABEL localboot - MENU LABEL Boot from ^local harddrive - MENU DEFAULT - localboot 0 - -EOF - -ln -sf /usr/lib/PXELINUX/pxelinux.0 $tftpdir/pxelinux.0 -ln -sf /usr/lib/syslinux/modules/bios $tftpdir/syslinux -ln -sf /usr/share/pixmaps/debian-edu-$dist-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png - -defaultfile=$tftpdir/debian-edu/default-menu.cfg -echo "Generating $defaultfile" -( - cat <<EOF -include debian-edu/localboot.cfg -MENU SEPARATOR -include debian-edu/ltsp-diskless.cfg -include debian-edu/ltsp-thin.cfg -MENU SEPARATOR -include debian-edu/install.cfg -MENU SEPARATOR -include debian-edu/memtest.cfg - -menu color title * #FFFFFFFF * -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * -menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none - -menu vshift 4 -menu rows 10 -menu hshift 13 -menu width 49 -menu background debian-edu/debian-edu-pxe.png -menu tabmsg Press ENTER to boot or TAB to edit a menu entry -default vesamenu.c32 -prompt 0 -timeout 0 -EOF -) > $defaultfile - -# Use the complete menu by default -pxecfgdir=$tftpdir/pxelinux.cfg -[ -d $pxecfgdir ] || mkdir $pxecfgdir -ln -sf ../debian-edu/default-menu.cfg $pxecfgdir/default View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/168da2151903d78ef80cb0703c4633d7fe034158 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/168da2151903d78ef80cb0703c4633d7fe034158 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/20200315/27928a41/attachment-0001.html> From gitlab at salsa.debian.org Sun Mar 15 22:40:41 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Sun, 15 Mar 2020 22:40:41 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] preseed-values/defaults.main-server: Drop tftpd-hpa preseeding Message-ID: <5e6eaee9d1ca8_6dca2ad41714fbd4130448@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install Commits: 92735a4e by Wolfgang Schweer at 2020-03-15T23:35:54+01:00 preseed-values/defaults.main-server: Drop tftpd-hpa preseeding now that iPXE is used for PXE installations. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2 changed files: - debian/changelog - preseed-values/defaults.main-server Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,13 @@ debian-edu-install (2.11.6) UNRELEASED; urgency=medium + [ Holger Levsen ] * Change package description: Set d-i values to install Debian Edu *with* *less* questions (not without). + [ Wolfgang Schweer ] + * preseed-values/defaults.main-server: Drop tftpd-hpa preseeding now that + iPXE is used for PXE installations. + -- Holger Levsen <holger at debian.org> Sat, 14 Mar 2020 19:12:12 +0100 debian-edu-install (2.11.5) unstable; urgency=medium ===================================== preseed-values/defaults.main-server ===================================== @@ -45,9 +45,6 @@ sitesummary-client sitesummary-client/hostclass string main-server #Configure bind9 options debian-edu. bind9 bind9/default-start-options string -4 -u bind -# Unset '--secure' option so that both LTSP and PXE can be served. -tftpd-hpa tftpd-hpa/options string - # Ask for info on initial user before it is created in LDAP user-setup-udeb passwd/make-user boolean true View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/92735a4e907b02c17e4c2ecbe419b074be95145f -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/92735a4e907b02c17e4c2ecbe419b074be95145f 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/20200315/117c2bf9/attachment.html> From gitlab at salsa.debian.org Sun Mar 15 22:40:59 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Sun, 15 Mar 2020 22:40:59 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] tasks/main-server: Recommend ipxe (required for the PXE installation environment) Message-ID: <5e6eaefba9679_6dca2ad41714fbd413047a3@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu Commits: 39f3d64d by Wolfgang Schweer at 2020-03-15T23:38:51+01:00 tasks/main-server: Recommend ipxe (required for the PXE installation environment) Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2 changed files: - debian/changelog - tasks/main-server Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +debian-edu (2.11.14) UNRELEASED; urgency=medium + + * tasks/main-server: + Recommend ipxe (required for the PXE installation environment). + + -- Wolfgang Schweer <wschweer at arcor.de> Sun, 15 Mar 2020 19:44:15 +0100 + debian-edu (2.11.13) unstable; urgency=medium * d/rules: add workaround to fix (unreported) issue in blends-dev. ===================================== tasks/main-server ===================================== @@ -36,6 +36,7 @@ Recommends: debian-installer-11-netboot-i386, debian-installer-11-netboot-amd64, tftpd-hpa, + ipxe, NeedConfig: yes - set local IP range, DNS name and default routing Recommends: View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/39f3d64df510691ba3735f3c079266d8b2c03776 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/39f3d64df510691ba3735f3c079266d8b2c03776 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/20200315/b747dce0/attachment-0001.html> From gitlab at salsa.debian.org Mon Mar 16 10:03:14 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Mon, 16 Mar 2020 10:03:14 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] No longer recommend pxelinux and syslinux-common. Message-ID: <5e6f4ee236f8e_6dca2ad41714fbd41336489@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu Commits: b0604883 by Wolfgang Schweer at 2020-03-16T11:00:55+01:00 No longer recommend pxelinux and syslinux-common. debian/control: Update after running 'make dist'. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 3 changed files: - debian/changelog - debian/control - tasks/main-server Changes: ===================================== debian/changelog ===================================== @@ -1,7 +1,9 @@ debian-edu (2.11.14) UNRELEASED; urgency=medium * tasks/main-server: - Recommend ipxe (required for the PXE installation environment). + Recommend ipxe (required for the PXE installation environment), no longer + recommend pxelinux and syslinux-common. + * debian/control: Update after running 'make dist'. -- Wolfgang Schweer <wschweer at arcor.de> Sun, 15 Mar 2020 19:44:15 +0100 ===================================== debian/control ===================================== @@ -542,12 +542,12 @@ Recommends: dia, education-menus, gimp, inkscape, + librecad, pencil2d, scribus, xpaint Suggests: blender, hugin, - librecad, pinta, tgif, xaos, @@ -705,6 +705,7 @@ Recommends: apache2, icinga2, icingaweb2, iptables, + ipxe, isc-dhcp-server-ldap, krb5-admin-server, krb5-kdc, @@ -722,7 +723,6 @@ Recommends: apache2, nagios-nrpe-plugin, nfs-kernel-server, ntp, - pxelinux, samba, samba-common-bin, sitesummary, @@ -731,7 +731,6 @@ Recommends: apache2, slbackup-php, smbclient, squid, - syslinux-common, task-print-service, tdb-tools, tftpd-hpa @@ -822,6 +821,7 @@ Depends: ${misc:Depends}, education-tasks (= ${binary:Version}) Recommends: audacious, audacity, + denemo, education-menus, fluidsynth, freebirth, @@ -838,8 +838,7 @@ Recommends: audacious, terminatorx, timgm6mb-soundfont, tuxguitar -Suggests: denemo, - festival, +Suggests: festival, hydrogen, lilypond, musescore ===================================== tasks/main-server ===================================== @@ -31,8 +31,6 @@ NeedConfig: yes - touch the corresponding bind zone file Recommends: isc-dhcp-server-ldap, - pxelinux, - syslinux-common, debian-installer-11-netboot-i386, debian-installer-11-netboot-amd64, tftpd-hpa, View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/b060488349d593ce60637d5c59add7d09f6e2772 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/b060488349d593ce60637d5c59add7d09f6e2772 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/20200316/26a12e8b/attachment-0001.html> From jenkins at jenkins.debian.net Mon Mar 16 12:16:54 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:16:54 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-music_upgrade_to_sid/83 In-Reply-To: <1220535651.24.1584106070176.JavaMail.jenkins@jenkins> References: <1220535651.24.1584106070176.JavaMail.jenkins@jenkins> Message-ID: <1295503830.211.1584361014870.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-music_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-music_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:25:13 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:25:13 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/83 In-Reply-To: <250011305.49.1584109815450.JavaMail.jenkins@jenkins> References: <250011305.49.1584109815450.JavaMail.jenkins@jenkins> Message-ID: <156498793.213.1584361513794.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:37:12 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:37:12 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/83 In-Reply-To: <1081495587.18.1584105004305.JavaMail.jenkins@jenkins> References: <1081495587.18.1584105004305.JavaMail.jenkins@jenkins> Message-ID: <688480812.215.1584362232603.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:37:24 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:37:24 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/83 In-Reply-To: <835162647.35.1584109175427.JavaMail.jenkins@jenkins> References: <835162647.35.1584109175427.JavaMail.jenkins@jenkins> Message-ID: <7508171.217.1584362244459.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:42:51 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:42:51 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/83 In-Reply-To: <1915468939.14.1584104162573.JavaMail.jenkins@jenkins> References: <1915468939.14.1584104162573.JavaMail.jenkins@jenkins> Message-ID: <1629018733.219.1584362572042.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:52:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:52:59 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/83 In-Reply-To: <1853598282.37.1584109199529.JavaMail.jenkins@jenkins> References: <1853598282.37.1584109199529.JavaMail.jenkins@jenkins> Message-ID: <1478947170.221.1584363179758.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:03:25 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:03:25 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/83 In-Reply-To: <2107031567.16.1584104920257.JavaMail.jenkins@jenkins> References: <2107031567.16.1584104920257.JavaMail.jenkins@jenkins> Message-ID: <1561580237.223.1584363805930.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:05:41 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:05:41 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/83 In-Reply-To: <561273013.29.1584107499420.JavaMail.jenkins@jenkins> References: <561273013.29.1584107499420.JavaMail.jenkins@jenkins> Message-ID: <1049124101.226.1584363941581.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:06:17 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:06:17 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/83 In-Reply-To: <203427940.39.1584109257866.JavaMail.jenkins@jenkins> References: <203427940.39.1584109257866.JavaMail.jenkins@jenkins> Message-ID: <356169829.228.1584363977748.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:08:31 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:08:31 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/83 In-Reply-To: <1173407977.12.1584104064191.JavaMail.jenkins@jenkins> References: <1173407977.12.1584104064191.JavaMail.jenkins@jenkins> Message-ID: <800317568.230.1584364111986.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:10:31 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:10:31 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-geography_upgrade_to_sid/83 In-Reply-To: <445351437.43.1584109433543.JavaMail.jenkins@jenkins> References: <445351437.43.1584109433543.JavaMail.jenkins@jenkins> Message-ID: <1803396659.232.1584364231863.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-geography_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-geography_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:13:22 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:13:22 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/83 In-Reply-To: <1849593642.27.1584107096636.JavaMail.jenkins@jenkins> References: <1849593642.27.1584107096636.JavaMail.jenkins@jenkins> Message-ID: <1054403999.234.1584364403041.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:14:05 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:14:05 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-development_upgrade_to_sid/83 In-Reply-To: <52546687.47.1584109769006.JavaMail.jenkins@jenkins> References: <52546687.47.1584109769006.JavaMail.jenkins@jenkins> Message-ID: <1523133382.236.1584364445789.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-development_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-development_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:15:33 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:15:33 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-language_upgrade_to_sid/83 In-Reply-To: <724136514.5.1584103186586.JavaMail.jenkins@jenkins> References: <724136514.5.1584103186586.JavaMail.jenkins@jenkins> Message-ID: <434573526.238.1584364533760.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-language_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-language_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:18:44 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:18:44 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/83 In-Reply-To: <796115413.10.1584103677537.JavaMail.jenkins@jenkins> References: <796115413.10.1584103677537.JavaMail.jenkins@jenkins> Message-ID: <2124314945.240.1584364724740.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:24:05 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:24:05 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/83 In-Reply-To: <1407837126.41.1584109341365.JavaMail.jenkins@jenkins> References: <1407837126.41.1584109341365.JavaMail.jenkins@jenkins> Message-ID: <1361919680.243.1584365045337.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/83/ for more information. From gitlab at salsa.debian.org Mon Mar 16 13:25:07 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:25:07 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config] Pushed new tag 2.11.17 Message-ID: <5e6f7e334cfb1_6dca2ad41f861ce41367015@godard.mail> Holger Levsen pushed new tag 2.11.17 at Debian Edu / debian-edu-config -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/tree/2.11.17 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/20200316/ccf3765b/attachment-0001.html> From gitlab at salsa.debian.org Mon Mar 16 13:25:05 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:25:05 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] release as 2.11.17 Message-ID: <5e6f7e31f33cb_6dca2ad41afdd48c13667c3@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: 74fd78fb by Holger Levsen at 2020-03-16T14:22:48+01:00 release as 2.11.17 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,6 @@ -debian-edu-config (2.11.17) UNRELEASED; urgency=medium +debian-edu-config (2.11.17) unstable; urgency=medium + [ Wolfgang Schweer ] * Rework PXE installation setup to be compliant with re-written LTSP. These changes have the additional benefit to provide network booting for both BIOS and UEFI based systems due to the change to iPXE. @@ -20,7 +21,7 @@ debian-edu-config (2.11.17) UNRELEASED; urgency=medium + Use the graphical installer by default. + Adjust entries and comments to reflect the changes. - -- Wolfgang Schweer <wschweer at arcor.de> Sat, 14 Mar 2020 23:08:36 +0100 + -- Holger Levsen <holger at debian.org> Mon, 16 Mar 2020 14:22:30 +0100 debian-edu-config (2.11.16) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/74fd78fba38087b454764378ba27c7cfb5c23371 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/74fd78fba38087b454764378ba27c7cfb5c23371 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/20200316/119831b0/attachment-0001.html> From jenkins at jenkins.debian.net Mon Mar 16 13:27:25 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:27:25 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/83 In-Reply-To: <187464411.31.1584107630329.JavaMail.jenkins@jenkins> References: <187464411.31.1584107630329.JavaMail.jenkins@jenkins> Message-ID: <1953326886.245.1584365245661.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/83/ for more information. From gitlab at salsa.debian.org Mon Mar 16 13:28:03 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:28:03 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] release as 2.11.6 Message-ID: <5e6f7ee33b981_6dca2ad41714fbd4136923c@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: b6c37c4c by Holger Levsen at 2020-03-16T14:27:21+01:00 release as 2.11.6 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,4 +1,4 @@ -debian-edu-install (2.11.6) UNRELEASED; urgency=medium +debian-edu-install (2.11.6) unstable; urgency=medium [ Holger Levsen ] * Change package description: Set d-i values to install Debian Edu *with* @@ -8,7 +8,7 @@ debian-edu-install (2.11.6) UNRELEASED; urgency=medium * preseed-values/defaults.main-server: Drop tftpd-hpa preseeding now that iPXE is used for PXE installations. - -- Holger Levsen <holger at debian.org> Sat, 14 Mar 2020 19:12:12 +0100 + -- Holger Levsen <holger at debian.org> Mon, 16 Mar 2020 14:27:11 +0100 debian-edu-install (2.11.5) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/b6c37c4c9ddfec94f19ceb923a0f8052cf1c3ddf -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/b6c37c4c9ddfec94f19ceb923a0f8052cf1c3ddf 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/20200316/a081a7d6/attachment.html> From gitlab at salsa.debian.org Mon Mar 16 13:28:04 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:28:04 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install] Pushed new tag 2.11.6 Message-ID: <5e6f7ee4c9ab1_6dca2ad41714fbd413695d7@godard.mail> Holger Levsen pushed new tag 2.11.6 at Debian Edu / debian-edu-install -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/tree/2.11.6 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/20200316/f2ea25ae/attachment.html> From jenkins at jenkins.debian.net Mon Mar 16 13:28:35 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:28:35 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/83 In-Reply-To: <1378308242.7.1584103397915.JavaMail.jenkins@jenkins> References: <1378308242.7.1584103397915.JavaMail.jenkins@jenkins> Message-ID: <1786364549.247.1584365316043.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:30:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:30:57 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-misc_upgrade_to_sid/83 In-Reply-To: <1932067021.45.1584109645473.JavaMail.jenkins@jenkins> References: <1932067021.45.1584109645473.JavaMail.jenkins@jenkins> Message-ID: <1106922250.249.1584365457911.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-misc_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-misc_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:34:01 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:34:01 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-physics_upgrade_to_sid/83 In-Reply-To: <454037415.20.1584105306795.JavaMail.jenkins@jenkins> References: <454037415.20.1584105306795.JavaMail.jenkins@jenkins> Message-ID: <1562261663.251.1584365641669.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-physics_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-physics_upgrade_to_sid/83/ for more information. From gitlab at salsa.debian.org Mon Mar 16 13:44:58 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:44:58 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] Fix workaround from 2.11.13. Message-ID: <5e6f82da440f2_6dca2ad41afdd48c137252e@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 36a908f0 by Holger Levsen at 2020-03-16T14:44:32+01:00 Fix workaround from 2.11.13. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,14 @@ debian-edu (2.11.14) UNRELEASED; urgency=medium + [ Wolfgang Schweer ] * tasks/main-server: Recommend ipxe (required for the PXE installation environment), no longer recommend pxelinux and syslinux-common. * debian/control: Update after running 'make dist'. + [ Holger Levsen ] + * Fix workaround from 2.11.13. + -- Wolfgang Schweer <wschweer at arcor.de> Sun, 15 Mar 2020 19:44:15 +0100 debian-edu (2.11.13) unstable; urgency=medium ===================================== debian/rules ===================================== @@ -6,3 +6,4 @@ include /usr/share/blends-dev/rules override_dh_install: $(BLEND_INSTALL_HELPER) dh_install -a $(BLENDNAME)-tasks.desc usr/share/tasksel/descs + dh_install View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/36a908f0e8e83f18dc597a514aefa965fd4bac16 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/36a908f0e8e83f18dc597a514aefa965fd4bac16 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/20200316/52070309/attachment.html> From jenkins at jenkins.debian.net Mon Mar 16 13:46:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:46:57 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/83 In-Reply-To: <1430196716.22.1584105692216.JavaMail.jenkins@jenkins> References: <1430196716.22.1584105692216.JavaMail.jenkins@jenkins> Message-ID: <733649839.253.1584366417697.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/83/ for more information. From gitlab at salsa.debian.org Mon Mar 16 13:48:11 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:48:11 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] release as 2.11.14 Message-ID: <5e6f839b4d133_6dca2ad41afdd48c13732ec@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 1a555dd0 by Holger Levsen at 2020-03-16T14:46:36+01:00 release as 2.11.14 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,4 +1,4 @@ -debian-edu (2.11.14) UNRELEASED; urgency=medium +debian-edu (2.11.14) unstable; urgency=medium [ Wolfgang Schweer ] * tasks/main-server: @@ -9,7 +9,7 @@ debian-edu (2.11.14) UNRELEASED; urgency=medium [ Holger Levsen ] * Fix workaround from 2.11.13. - -- Wolfgang Schweer <wschweer at arcor.de> Sun, 15 Mar 2020 19:44:15 +0100 + -- Holger Levsen <holger at debian.org> Mon, 16 Mar 2020 14:46:29 +0100 debian-edu (2.11.13) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/1a555dd0970daf0fa408bb22e43c1b8fdf6f53a9 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/1a555dd0970daf0fa408bb22e43c1b8fdf6f53a9 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/20200316/d566b685/attachment.html> From gitlab at salsa.debian.org Mon Mar 16 13:48:13 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:48:13 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu] Pushed new tag 2.11.14 Message-ID: <5e6f839da9262_6dca2ad41f84cb78137357b@godard.mail> Holger Levsen pushed new tag 2.11.14 at Debian Edu / debian-edu -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/tree/2.11.14 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/20200316/5ff4f002/attachment.html> From gitlab at salsa.debian.org Mon Mar 23 09:59:01 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Mon, 23 Mar 2020 09:59:01 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 6 commits: Translation: Debian Edu Documentation/Bullseye manual Message-ID: <5e7888652bf9f_6dca2ad418f49d10234384e@godard.mail> Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc Commits: 03fff967 by Ma Yong at 2020-03-16T02:36:24+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.4% (819 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 5aaf56ef by Ma Yong at 2020-03-16T02:36:25+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.9% (1123 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 9bcdbb64 by Ma Yong at 2020-03-17T11:36:34+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.0% (1124 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - a5c69831 by Ma Yong at 2020-03-19T12:36:37+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.2% (1127 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 464958e2 by Ma Yong at 2020-03-21T00:36:30+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.5% (820 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 00012325 by Ma Yong at 2020-03-21T00:36:31+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.4% (1129 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 2 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-13 10:23+0000\n" +"PO-Revision-Date: 2020-03-20 23:36+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5952,6 +5952,7 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6118,6 +6119,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " +"<emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-13 10:23+0000\n" +"PO-Revision-Date: 2020-03-20 23:36+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -6150,6 +6150,7 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6164,25 +6165,28 @@ msgstr "" msgid "" "Enable access in case diskless workstations are used. This is a special " "case, because sshfs is used instead of NFS and automount:" -msgstr "" +msgstr "在使用无盘工作站的情况下启用访问。这是特殊情况，因为使用 sshfs 取代 NFS 和 automount：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Create the mount point directories in the LTSP diskless client's root " "(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well." msgstr "" +"而且在 LTSP 无盘客户端的根（默认 <computeroutput>/opt/ltsp/i386/</computeroutput>）创建挂载点目录。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/" "opt/ltsp/i386/etc/lts.conf</computeroutput> (example)." msgstr "" +"添加内容为 ‘LOCAL_APPS_EXTRAMOUNTS=/storage’ 的一行到 <computeroutput>/opt/ltsp/i386/" +"etc/lts.conf</computeroutput>（示例）。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Create a link in each user's home dir like 'ln -s /storage Storage' to help " "users find the resources." -msgstr "" +msgstr "在每个用户的主目录创建类似 ‘ln -s /storage Storage’ 的链接来帮助用户找到该资源。" #. type: Content of: <article><section><section><para> msgid "" @@ -6191,6 +6195,8 @@ msgid "" "application on any workstation, LTSP thin client or LTSP server, and " "visiting ~/Storage in case an LTSP diskless client is used." msgstr "" +"现在用户应该能够在任何工作站，LTSP 瘦客户机或 LTSP 服务器上使用任何应用程序只通过浏览 ‘/tjener/nas-server/storage/" +"’ 目录直接访问 ‘nas-server.intern’ 上的文件，而在使用 LTSP 无盘客户机的情况下浏览 ~/Storage。" #. type: Content of: <article><section><section><title> msgid "Restrict ssh login access" @@ -6341,6 +6347,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " +"<emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/b2b7df6a7122869ceecea39e9122ef9dd293ce1a...0001232517f52094807a342978e89cf593ff6225 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/b2b7df6a7122869ceecea39e9122ef9dd293ce1a...0001232517f52094807a342978e89cf593ff6225 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/20200323/2c7fffb3/attachment-0001.html> From gitlab at salsa.debian.org Mon Mar 23 10:20:04 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Mon, 23 Mar 2020 10:20:04 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: translation update by Ma Yong Message-ID: <5e788d543751e_6dca2ad418f49d102345024@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: d8b5e10c by Frans Spiesschaert at 2020-03-23T11:17:08+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.4% (1129 of 1404 strings) - - - - - 4f53d7d4 by Frans Spiesschaert at 2020-03-23T11:19:47+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.5% (820 of 1196 strings) - - - - - 2 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-13 10:23+0000\n" +"PO-Revision-Date: 2020-03-20 23:36+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5952,6 +5952,7 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6118,6 +6119,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " +"<emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-13 10:23+0000\n" +"PO-Revision-Date: 2020-03-20 23:36+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -6150,6 +6150,7 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6164,25 +6165,28 @@ msgstr "" msgid "" "Enable access in case diskless workstations are used. This is a special " "case, because sshfs is used instead of NFS and automount:" -msgstr "" +msgstr "在使用无盘工作站的情况下启用访问。这是特殊情况，因为使用 sshfs 取代 NFS 和 automount：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Create the mount point directories in the LTSP diskless client's root " "(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well." msgstr "" +"而且在 LTSP 无盘客户端的根（默认 <computeroutput>/opt/ltsp/i386/</computeroutput>）创建挂载点目录。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/" "opt/ltsp/i386/etc/lts.conf</computeroutput> (example)." msgstr "" +"添加内容为 ‘LOCAL_APPS_EXTRAMOUNTS=/storage’ 的一行到 <computeroutput>/opt/ltsp/i386/" +"etc/lts.conf</computeroutput>（示例）。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Create a link in each user's home dir like 'ln -s /storage Storage' to help " "users find the resources." -msgstr "" +msgstr "在每个用户的主目录创建类似 ‘ln -s /storage Storage’ 的链接来帮助用户找到该资源。" #. type: Content of: <article><section><section><para> msgid "" @@ -6191,6 +6195,8 @@ msgid "" "application on any workstation, LTSP thin client or LTSP server, and " "visiting ~/Storage in case an LTSP diskless client is used." msgstr "" +"现在用户应该能够在任何工作站，LTSP 瘦客户机或 LTSP 服务器上使用任何应用程序只通过浏览 ‘/tjener/nas-server/storage/" +"’ 目录直接访问 ‘nas-server.intern’ 上的文件，而在使用 LTSP 无盘客户机的情况下浏览 ~/Storage。" #. type: Content of: <article><section><section><title> msgid "Restrict ssh login access" @@ -6341,6 +6347,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " +"<emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/f19838c6dda5e715513657d4e56128305d5f19c4...4f53d7d47d7a99c3656692e0377aa72e118c5a1e -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/f19838c6dda5e715513657d4e56128305d5f19c4...4f53d7d47d7a99c3656692e0377aa72e118c5a1e 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/20200323/7c896ece/attachment-0001.html> From jenkins at jenkins.debian.net Mon Mar 23 11:06:53 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 23 Mar 2020 11:06:53 +0000 (UTC) Subject: [debian-edu-commits] Build failed in Jenkins: edu-packages_sid_debian-edu-doc #1319 Message-ID: <1886809448.149.1584961613869.JavaMail.jenkins@jenkins> See <https://jenkins.debian.net/job/edu-packages_sid_debian-edu-doc/1319/display/redirect?page=changes> Changes: [Frans.Spiesschaert] translation update by Ma Yong [Frans.Spiesschaert] translation update by Ma Yong ------------------------------------------ Started by an SCM change Running as SYSTEM [EnvInject] - Loading node environment variables. Building on master in workspace <https://jenkins.debian.net/job/edu-packages_sid_debian-edu-doc/ws/> No credentials specified Wiping out workspace first. Cloning the remote Git repository Cloning repository https://salsa.debian.org/debian-edu/debian-edu-doc > git init <https://jenkins.debian.net/job/edu-packages_sid_debian-edu-doc/ws/> # timeout=10 Fetching upstream changes from https://salsa.debian.org/debian-edu/debian-edu-doc > git --version # timeout=10 > git fetch --tags --force --progress -- https://salsa.debian.org/debian-edu/debian-edu-doc +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url https://salsa.debian.org/debian-edu/debian-edu-doc # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url https://salsa.debian.org/debian-edu/debian-edu-doc # timeout=10 Fetching upstream changes from https://salsa.debian.org/debian-edu/debian-edu-doc > git fetch --tags --force --progress -- https://salsa.debian.org/debian-edu/debian-edu-doc +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse origin/master^{commit} # timeout=10 Checking out Revision 4f53d7d47d7a99c3656692e0377aa72e118c5a1e (origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 4f53d7d47d7a99c3656692e0377aa72e118c5a1e # timeout=10 Commit message: "translation update by Ma Yong Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.5% (820 of 1196 strings)" > git rev-list --no-walk f19838c6dda5e715513657d4e56128305d5f19c4 # timeout=10 [workspace] $ /bin/sh -xe /tmp/jenkins17790818032714523577.sh + /srv/jenkins/bin/chroot-run.sh sid debuild -b -uc -us ==================================================================================== Mon 23 Mar 10:20:31 UTC 2020 - running /srv/jenkins/bin/chroot-run.sh (for job edu-packages_sid_debian-edu-doc) on jenkins, called using "sid debuild -b -uc -us" as arguments. Mon 23 Mar 10:20:31 UTC 2020 - actually running "chroot-run.sh" (md5sum 10c3539c8461754ab1134a66d2bb5d1b) as "/tmp/jenkins-script-FETdYaGa" Please send feedback to qa-jenkins-dev at lists.alioth.debian.org or even better, provide https://salsa.debian.org/qa/jenkins.debian.net/merge_requests ! To dig deeper: git clone https://salsa.debian.org/qa/jenkins.debian.net.git && less README INSTALL CONTRIBUTING TODO ==================================================================================== Mon Mar 23 10:20:31 UTC 2020 - bootstraping sid into /chroots/chroot-run-sid.T9XYJrT2r now. I: automatically chosen mode: root I: chroot architecture amd64 is equal to the host's architecture I: Reading sources.list from standard input... I: running apt-get update... I: downloading packages with apt... I: extracting archives... I: installing packages... I: downloading apt... I: installing apt... I: installing remaining packages inside the chroot... I: cleaning package lists and apt cache... Preseeding man-db/auto-update to false Configuring dpkg to not fsync() Get:1 http://cdn-fastly.deb.debian.org/debian sid InRelease [146 kB] Get:2 http://cdn-fastly.deb.debian.org/debian sid/main Sources [8563 kB] Get:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages [8213 kB] Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Ign:4 http://cdn-fastly.deb.debian.org/debian sid/main Translation-en Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Ign:4 http://cdn-fastly.deb.debian.org/debian sid/main Translation-en Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Ign:4 http://cdn-fastly.deb.debian.org/debian sid/main Translation-en Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Err:4 http://cdn-fastly.deb.debian.org/debian sid/main Translation-en Connection failed [IP: 78.137.99.97 3128] Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Fetched 8709 kB in 17min 24s (8340 B/s) Reading package lists... W: Failed to fetch http://cdn-fastly.deb.debian.org/debian/dists/sid/main/i18n/Translation-en Connection failed [IP: 78.137.99.97 3128] W: Some index files failed to download. They have been ignored, or old ones used instead. Reading package lists... Building dependency tree... Reading state information... E: Unable to locate package build-essential E: Unable to locate package devscripts E: Unable to locate package git Mon 23 Mar 11:06:53 UTC 2020 - chroot-run.sh stopped running as /tmp/jenkins-script-FETdYaGa, which will now be removed. Build step 'Execute shell' marked build as failure From gitlab at salsa.debian.org Wed Mar 25 22:45:20 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 22:45:20 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 7 commits: Add new script share/debian-edu-config/tools/edu-icinga-setup. Message-ID: <5e7bdf008cd84_6dca3fa2985b52b427240bf@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: e160abf7 by Wolfgang Schweer at 2020-03-25T23:27:53+01:00 Add new script share/debian-edu-config/tools/edu-icinga-setup. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1f651bba by Wolfgang Schweer at 2020-03-25T23:29:10+01:00 Add cf3/cf.icinga file for setting up Icinga via cfengine. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 7a36c790 by Wolfgang Schweer at 2020-03-25T23:30:35+01:00 Rework all files in the www/ directory to reflect the changes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2e15ca12 by Wolfgang Schweer at 2020-03-25T23:32:19+01:00 Adjust Makefile and cf3/promises.cf to reflect the changes Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 5e9d36d6 by Wolfgang Schweer at 2020-03-25T23:33:46+01:00 Add entry to debian/debian-edu-config.lintian-overrides This is required as the new tool uses debconf to fetch the first user uid value. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 59a668a4 by Wolfgang Schweer at 2020-03-25T23:36:05+01:00 Improve the share/debian-edu-config/tools/edu-ltsp-install script. Also mask the mariadb service now that Icinga is using it. Drop no longer needed workaround for the tftpd-hpa package. Add workaround for resolv.conf if the tool is run on a combined server. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - f7f8d823 by Wolfgang Schweer at 2020-03-25T23:37:11+01:00 Add changelog entries for last commits. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 30 changed files: - Makefile - + cf3/cf.icinga - cf3/promises.cf - debian/changelog - debian/debian-edu-config.lintian-overrides - + share/debian-edu-config/tools/edu-icinga-setup - share/debian-edu-config/tools/edu-ltsp-install - www/ca.po - www/da.po - www/de.po - www/es-es.po - www/fr.po - www/id.po - www/index.html.ca - www/index.html.da - www/index.html.de - www/index.html.en - www/index.html.es-es - www/index.html.fr - www/index.html.id - www/index.html.it - www/index.html.ja - www/index.html.nb-no - www/index.html.nl - www/index.html.pt - www/index.html.pt-br - www/index.html.ro - www/index.html.ru - www/index.html.zh-tw - www/index.pot The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/74fd78fba38087b454764378ba27c7cfb5c23371...f7f8d82390e9d79a703d337bd69acbb06c10dc1d -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/74fd78fba38087b454764378ba27c7cfb5c23371...f7f8d82390e9d79a703d337bd69acbb06c10dc1d 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/20200325/8c081eae/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 22:45:37 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 22:45:37 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: tasks/main-server: Recommend mariadb-server, needed for icinga2 setup. Message-ID: <5e7bdf11c4f93_6dca3fa296292520272435a@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu Commits: 6a26da10 by Wolfgang Schweer at 2020-03-25T23:40:47+01:00 tasks/main-server: Recommend mariadb-server, needed for icinga2 setup. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 65f64182 by Wolfgang Schweer at 2020-03-25T23:41:42+01:00 debian/control: Update after running 'make dist'. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 3 changed files: - debian/changelog - debian/control - tasks/main-server Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +debian-edu (2.11.15) UNRELEASED; urgency=medium + + * tasks/main-server: Recommend mariadb-server, needed for icinga2 setup. + * debian/control: Update after running 'make dist'. + + -- Wolfgang Schweer <wschweer at arcor.de> Mon, 23 Mar 2020 20:38:58 +0100 + debian-edu (2.11.14) unstable; urgency=medium [ Wolfgang Schweer ] ===================================== debian/control ===================================== @@ -716,6 +716,7 @@ Recommends: apache2, libsasl2-modules-gssapi-mit, links, makepasswd, + mariadb-server, memtest86+, monitoring-plugins-standard, munin, ===================================== tasks/main-server ===================================== @@ -114,9 +114,10 @@ NeedConfig: yes - done automatically by preseeding sitesummary Recommends: icinga2, icingaweb2, + mariadb-server, monitoring-plugins-standard, nagios-nrpe-plugin, -NeedConfig: yes - done via preseeding: icingaadmin password, enable cgi. +NeedConfig: yes - done via preseeding: enable icinga-ido-mysql connection. Recommends: sitesummary, View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/1a555dd0970daf0fa408bb22e43c1b8fdf6f53a9...65f641825aa731185af7e8ba64b4e376d8f3b65c -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/1a555dd0970daf0fa408bb22e43c1b8fdf6f53a9...65f641825aa731185af7e8ba64b4e376d8f3b65c 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/20200325/3a8d58b8/attachment-0001.html> From gitlab at salsa.debian.org Wed Mar 25 22:45:48 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 22:45:48 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] preseed-values/defaults.main-server: Drop preseeding for Icinga 2. Message-ID: <5e7bdf1c2a03d_6dca2ad41c66089427246a@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install Commits: b20fef30 by Wolfgang Schweer at 2020-03-25T23:43:02+01:00 preseed-values/defaults.main-server: Drop preseeding for Icinga 2. The reworked icinga2 and icingaweb2 setup now cares for the login configuration; the first user will be able to log into the Icinga web UI. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2 changed files: - debian/changelog - preseed-values/defaults.main-server Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +debian-edu-install (2.11.7) UNRELEASED; urgency=medium + + * preseed-values/defaults.main-server: Drop preseeding for Icinga 2. + The reworked icinga2 and icingaweb2 setup now cares for the login + configuration; the first user will be able to log into the web UI. + + -- Wolfgang Schweer <wschweer at arcor.de> Mon, 23 Mar 2020 20:25:35 +0100 + debian-edu-install (2.11.6) unstable; urgency=medium [ Holger Levsen ] ===================================== preseed-values/defaults.main-server ===================================== @@ -29,10 +29,6 @@ debian-edu-config debian-edu-config/update-hostname boolean false # Kerberos KDC and admin server krb5-admin-server krb5-admin-server/kadmind boolean true -# Provide a default icingaadmin password. -icinga2-classicui icinga2-classicui/adminpassword password skolelinux -icinga2-classicui icinga2-classicui/adminpassword-repeat password skolelinux - # Do not enable the WINS feature of samba-common, because this profile # does not get a address via DHCP samba-common samba-common/dhcp boolean false View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/b20fef30fa2e9a055e4686635222a50cd2786133 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/b20fef30fa2e9a055e4686635222a50cd2786133 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/20200325/053e3270/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:12:23 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 23:12:23 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Add closes statement for bug #793677 Message-ID: <5e7be557d31a0_6dca3fa2985b52b427259f3@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: e7e9a1d6 by Wolfgang Schweer at 2020-03-26T00:11:36+01:00 Add closes statement for bug #793677 Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -4,6 +4,7 @@ debian-edu-config (2.11.18) UNRELEASED; urgency=medium icinga2-classicui package has been dropped. The setup follows a more complex approach involving databases and authentication against LDAP. The first user is enabled to log into the web interface as Icinga Administrator. + (Closes: #793677). - Add new script share/debian-edu-config/tools/edu-icinga-setup. - Add cf3/cf.icinga file for setting up Icinga via cfengine. - Rework all files in the www/ directory to reflect the changes. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e7e9a1d643b9c2d1736b892d61a00ab7ec7c0fae -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e7e9a1d643b9c2d1736b892d61a00ab7ec7c0fae 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/20200325/0ff17c85/attachment-0001.html> From gitlab at salsa.debian.org Wed Mar 25 23:17:16 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:17:16 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] release as 2.11.7 Message-ID: <5e7be67c21df8_6dca2ad41a78467827262bd@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: a3cd62ed by Holger Levsen at 2020-03-26T00:16:24+01:00 release as 2.11.7 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,11 @@ -debian-edu-install (2.11.7) UNRELEASED; urgency=medium +debian-edu-install (2.11.7) unstable; urgency=medium + [ Wolfgang Schweer ] * preseed-values/defaults.main-server: Drop preseeding for Icinga 2. The reworked icinga2 and icingaweb2 setup now cares for the login configuration; the first user will be able to log into the web UI. - -- Wolfgang Schweer <wschweer at arcor.de> Mon, 23 Mar 2020 20:25:35 +0100 + -- Holger Levsen <holger at debian.org> Thu, 26 Mar 2020 00:16:06 +0100 debian-edu-install (2.11.6) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/a3cd62ed91125bb22de48c889e28f2946e5d875a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/a3cd62ed91125bb22de48c889e28f2946e5d875a 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/20200325/f03cba10/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:17:17 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:17:17 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install] Pushed new tag 2.11.7 Message-ID: <5e7be67ded59b_6dca3fa2962925202726565@godard.mail> Holger Levsen pushed new tag 2.11.7 at Debian Edu / debian-edu-install -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/tree/2.11.7 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/20200325/28eb582a/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:18:16 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:18:16 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] release as 2.11.15 Message-ID: <5e7be6b8cf180_6dca2ad41d36faf8272729b@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 558cde36 by Holger Levsen at 2020-03-26T00:17:33+01:00 release as 2.11.15 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,10 @@ -debian-edu (2.11.15) UNRELEASED; urgency=medium +debian-edu (2.11.15) unstable; urgency=medium + [ Wolfgang Schweer ] * tasks/main-server: Recommend mariadb-server, needed for icinga2 setup. * debian/control: Update after running 'make dist'. - -- Wolfgang Schweer <wschweer at arcor.de> Mon, 23 Mar 2020 20:38:58 +0100 + -- Holger Levsen <holger at debian.org> Thu, 26 Mar 2020 00:17:26 +0100 debian-edu (2.11.14) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/558cde3663225b679cd8db906f7a09fbd4bfa675 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/558cde3663225b679cd8db906f7a09fbd4bfa675 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/20200325/0c30213b/attachment-0001.html> From gitlab at salsa.debian.org Wed Mar 25 23:18:18 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:18:18 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu] Pushed new tag 2.11.15 Message-ID: <5e7be6bae2118_6dca3fa2985b52b4272753d@godard.mail> Holger Levsen pushed new tag 2.11.15 at Debian Edu / debian-edu -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/tree/2.11.15 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/20200325/3ed80cf7/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:21:30 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:21:30 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] drop whitespaces Message-ID: <5e7be77a74178_6dca3fa2985b52b427280ec@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: e92ea770 by Holger Levsen at 2020-03-26T00:21:20+01:00 drop whitespaces Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - share/debian-edu-config/tools/edu-icinga-setup Changes: ===================================== debian/changelog ===================================== @@ -9,7 +9,7 @@ debian-edu-config (2.11.18) UNRELEASED; urgency=medium - Add cf3/cf.icinga file for setting up Icinga via cfengine. - Rework all files in the www/ directory to reflect the changes. - Adjust Makefile and cf3/promises.cf accordingly. - - Add a related line to debian/debian-edu-config.lintian-overrides because + - Add a related line to debian/debian-edu-config.lintian-overrides because the new tool uses debconf to fetch the first user uid value. * share/debian-edu-config/tools/edu-ltsp-install: - Also mask the mariadb service now that Icinga is using it. ===================================== share/debian-edu-config/tools/edu-icinga-setup ===================================== @@ -7,7 +7,7 @@ # Author/Copyright: Wolfgang Schweer <wschweer at arcor.de> # Licence: GPL2+ # first edited: 2020-03-23 -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e92ea7701e07d7603c3d24d1dcaf6fbf9f779a39 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e92ea7701e07d7603c3d24d1dcaf6fbf9f779a39 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/20200325/d3a41c8a/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:25:15 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 23:25:15 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Add hint for database removals share/debian-edu-config/tools/edu-icinga-setup, Message-ID: <5e7be85bae632_6dca3fa29629252027294ad@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: a219e61b by Wolfgang Schweer at 2020-03-26T00:24:02+01:00 Add hint for database removals share/debian-edu-config/tools/edu-icinga-setup, thanks Holger. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1 changed file: - share/debian-edu-config/tools/edu-icinga-setup Changes: ===================================== share/debian-edu-config/tools/edu-icinga-setup ===================================== @@ -25,7 +25,9 @@ set -ex db_get debian-edu-config/first-user-name FIRSTUSERNAME="$RET" -# Secure the MariaDB installation +# Secure the MariaDB installation, see the next mysql commands. +# Also, the automatically generated initial database incinga2 will be removed +# at the end of the script. # TODO: Set mysql root password after first reboot of a main server. # (Add instruction to the manual's 'Getting started' chapter, i.e. # run 'mysql_secure_installation'.) View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/a219e61b4c72c64157790bdfe693c20b840079ee -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/a219e61b4c72c64157790bdfe693c20b840079ee 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/20200325/4f2c2bdd/attachment-0001.html> From gitlab at salsa.debian.org Wed Mar 25 23:35:52 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:35:52 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] release as 2.11.18 Message-ID: <5e7bead8571cd_6dca2ad41c66089427305f2@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: 892593c9 by Holger Levsen at 2020-03-26T00:28:25+01:00 release as 2.11.18 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,6 @@ -debian-edu-config (2.11.18) UNRELEASED; urgency=medium +debian-edu-config (2.11.18) unstable; urgency=medium + [ Wolfgang Schweer ] * Setup and configure the Icinga 2 monitoring system now that the icinga2-classicui package has been dropped. The setup follows a more complex approach involving databases and authentication against LDAP. The first user @@ -16,7 +17,7 @@ debian-edu-config (2.11.18) UNRELEASED; urgency=medium - Drop no longer needed workaround for the tftpd-hpa package. - Add workaround for resolv.conf if the tool is run on a combined server. - -- Wolfgang Schweer <wschweer at arcor.de> Wed, 25 Mar 2020 13:51:54 +0100 + -- Holger Levsen <holger at debian.org> Thu, 26 Mar 2020 00:28:17 +0100 debian-edu-config (2.11.17) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/892593c9fd85a94e641d0f59183020c1af768cbf -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/892593c9fd85a94e641d0f59183020c1af768cbf 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/20200325/4fc31c0c/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:35:53 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:35:53 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config] Pushed new tag 2.11.18 Message-ID: <5e7bead9c9e0b_6dca3fa29629252027308d6@godard.mail> Holger Levsen pushed new tag 2.11.18 at Debian Edu / debian-edu-config -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/tree/2.11.18 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/20200325/27645c2d/attachment-0001.html> From gitlab at salsa.debian.org Thu Mar 26 11:47:04 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Thu, 26 Mar 2020 11:47:04 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 4 commits: Translation: Debian Edu Documentation/Bullseye manual Message-ID: <5e7c9638637e8_6dca2ad41d36faf827858e6@godard.mail> Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc Commits: b82b369a by Ma Yong at 2020-03-24T23:46:55+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.6% (821 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - b85efbff by Ma Yong at 2020-03-24T23:46:57+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.4% (1130 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 993ea945 by Ma Yong at 2020-03-26T12:45:16+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.7% (822 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 20893577 by Ma Yong at 2020-03-26T12:45:18+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.5% (1131 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 2 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-20 23:36+0000\n" +"PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -6040,6 +6040,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " +"从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6057,6 +6059,8 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " +"客户端网络也会获得 ssh 访问 LTSP 服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-20 23:36+0000\n" +"PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -6268,6 +6268,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " +"从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6285,6 +6287,8 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " +"客户端网络也会获得 ssh 访问 LTSP 服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/0001232517f52094807a342978e89cf593ff6225...2089357726d82f2485dc0acd386aa5e92c392041 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/0001232517f52094807a342978e89cf593ff6225...2089357726d82f2485dc0acd386aa5e92c392041 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/20200326/46564ec1/attachment-0001.html> From gitlab at salsa.debian.org Thu Mar 26 13:09:13 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Thu, 26 Mar 2020 13:09:13 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: translation update by Ma Yong Message-ID: <5e7ca9795048a_6dca2ad41a78467827924b7@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: 426afd4d by Frans Spiesschaert at 2020-03-26T14:04:30+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.5% (1131 of 1404 strings) - - - - - d42d9466 by Frans Spiesschaert at 2020-03-26T14:06:19+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.7% (822 of 1196 strings) - - - - - 2 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-20 23:36+0000\n" +"PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -6040,6 +6040,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " +"从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6057,6 +6059,8 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " +"客户端网络也会获得 ssh 访问 LTSP 服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-20 23:36+0000\n" +"PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -6268,6 +6268,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " +"从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6285,6 +6287,8 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " +"客户端网络也会获得 ssh 访问 LTSP 服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/4f53d7d47d7a99c3656692e0377aa72e118c5a1e...d42d9466390be0f33a81985a2b27305a61c8778a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/4f53d7d47d7a99c3656692e0377aa72e118c5a1e...d42d9466390be0f33a81985a2b27305a61c8778a 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/20200326/7e786508/attachment-0001.html> From wiki at debian.org Thu Mar 26 13:13:25 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:13:25 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Manuals/Audacity/CopyRight=22_by_FransSpie?= =?utf-8?q?sschaert?= Message-ID: <158522840529.31434.7154053408619226684@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Manuals/Audacity/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/CopyRight?action=diff&rev1=33&rev2=34 Comment: update copyright information for Simplified Chinese The Swedish translation is copyrighted by Erik Sundin (2016), Anders Jonsson (2018) and Mattias Münster (2019) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2017), Damian Nadolski (2019), Piotrek Pastuszak (2020) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. From wiki at debian.org Thu Mar 26 13:15:14 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:15:14 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Manuals/Rosegarden/CopyRight=22_by_FransSp?= =?utf-8?q?iesschaert?= Message-ID: <158522851467.31434.1307569681658874612@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Manuals/Rosegarden/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/CopyRight?action=diff&rev1=28&rev2=29 Comment: update copyright information for Simplified Chinese The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS (2018) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma Yong (2019, 2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong (2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Thu Mar 26 13:21:21 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:21:21 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Buster/CopyRight=22_by_FransSpiesschaert?= Message-ID: <158522888141.1784.7544241354104704258@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Buster/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/Buster/CopyRight?action=diff&rev1=13&rev2=14 Comment: update copyright information for Simplified Chinese, Japanese and Dutch The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, 2016, 2019) and is released under the GPL v2 or any later version. - The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, 2016, 2017, 2018, 2019) and is released under the GPL v2 or any later version. + The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and is released under the GPL v2 or any later version. - The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 (2019) and is released under the GPL v2 or any later version. + The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 (2019-2020) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, 2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Thu Mar 26 13:23:46 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:23:46 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Bullseye/CopyRight=22_by_FransSpiesschaert?= Message-ID: <158522902670.1787.13206774972084542171@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Bullseye/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/Bullseye/CopyRight?action=diff&rev1=4&rev2=5 Comment: update copyright information for Simplified Chinese The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Thu Mar 26 13:27:21 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:27:21 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/ITIL/CopyRight=22_by_FransSpiesschaert?= Message-ID: <158522924142.1783.8917571705681541350@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/ITIL/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/ITIL/CopyRight?action=diff&rev1=15&rev2=16 Comment: update copyright information for Simplified Chinese The Norwegian Bokmål translation is copyrighted by Ole-Erik Yrvin (2015), Ingrid Yrvin (2015) and Allan Nordhøy (2018, 2019) and is released under the GPL v3 or any later version. - The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma Yong (2018, 2019) and is released under the GPL v3 or any later version. + The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma Yong (2018-2020) and is released under the GPL v3 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2017-2020) and is released under the GPL v3 or any later version. From jenkins at jenkins.debian.net Thu Mar 26 13:31:28 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Thu, 26 Mar 2020 13:31:28 +0000 (UTC) Subject: [debian-edu-commits] Jenkins build is back to normal : edu-packages_sid_debian-edu-doc #1320 In-Reply-To: <1886809448.149.1584961613869.JavaMail.jenkins@jenkins> References: <1886809448.149.1584961613869.JavaMail.jenkins@jenkins> Message-ID: <1101912892.79.1585229488209.JavaMail.jenkins@jenkins> See <https://jenkins.debian.net/job/edu-packages_sid_debian-edu-doc/1320/display/redirect?page=changes> From wiki at debian.org Sat Mar 28 10:29:18 2020 From: wiki at debian.org (Debian Wiki) Date: Sat, 28 Mar 2020 10:29:18 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Manuals/Audacity/CopyRight=22_by_HolgerLev?= =?utf-8?q?sen?= Message-ID: <158539135826.16958.1869749653311494980@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Manuals/Audacity/CopyRight" page has been changed by HolgerLevsen: https://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/CopyRight?action=diff&rev1=34&rev2=35 Comment: fix CamelCase The Swedish translation is copyrighted by Erik Sundin (2016), Anders Jonsson (2018) and Mattias Münster (2019) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and !EldersJavas (2020) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2017), Damian Nadolski (2019), Piotrek Pastuszak (2020) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. From wiki at debian.org Sat Mar 28 10:30:29 2020 From: wiki at debian.org (Debian Wiki) Date: Sat, 28 Mar 2020 10:30:29 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Bullseye/CopyRight=22_by_HolgerLevsen?= Message-ID: <158539142986.18352.16937838751162425196@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Bullseye/CopyRight" page has been changed by HolgerLevsen: https://wiki.debian.org/DebianEdu/Documentation/Bullseye/CopyRight?action=diff&rev1=5&rev2=6 Comment: fix CamelCase The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and !EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Sat Mar 28 10:31:01 2020 From: wiki at debian.org (Debian Wiki) Date: Sat, 28 Mar 2020 10:31:01 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Buster/CopyRight=22_by_HolgerLevsen?= Message-ID: <158539146135.18347.12518207469029761455@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Buster/CopyRight" page has been changed by HolgerLevsen: https://wiki.debian.org/DebianEdu/Documentation/Buster/CopyRight?action=diff&rev1=14&rev2=15 Comment: fix CamelCase The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and !EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Sat Mar 28 10:31:38 2020 From: wiki at debian.org (Debian Wiki) Date: Sat, 28 Mar 2020 10:31:38 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Manuals/Rosegarden/CopyRight=22_by_HolgerL?= =?utf-8?q?evsen?= Message-ID: <158539149863.18354.15338503602513978743@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Manuals/Rosegarden/CopyRight" page has been changed by HolgerLevsen: https://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/CopyRight?action=diff&rev1=29&rev2=30 Comment: fix CamelCase The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS (2018) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong (2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong (2019, 2020) and !EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From gitlab at salsa.debian.org Sat Mar 28 10:36:28 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 28 Mar 2020 10:36:28 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: Update debian/copyright from the wikis. Message-ID: <5e7f28acc0d3a_78e93fe0a0a55da02328f6@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc Commits: 299bad3e by Holger Levsen at 2020-03-28T11:32:31+01:00 Update debian/copyright from the wikis. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - e4e44721 by Holger Levsen at 2020-03-28T11:36:14+01:00 Update Audacity manual from the wiki. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 16 changed files: - debian/copyright - documentation/audacity/audacity-manual.cs.po - documentation/audacity/audacity-manual.fr.po - documentation/audacity/audacity-manual.ja.po - documentation/audacity/audacity-manual.nb.po - documentation/audacity/audacity-manual.nl.po - documentation/audacity/audacity-manual.pl.po - documentation/audacity/audacity-manual.pot - documentation/audacity/audacity-manual.pt_BR.po - documentation/audacity/audacity-manual.pt_PT.po - documentation/audacity/audacity-manual.sv.po - documentation/audacity/audacity-manual.uk.po - documentation/audacity/audacity-manual.xml - documentation/audacity/audacity-manual.zh.po - documentation/audacity/audacity-manual.zh_Hant.po - documentation/audacity/source/AllInOne-audacity-manual.xml Changes: ===================================== debian/copyright ===================================== @@ -94,6 +94,7 @@ Files: documentation/audacity/audacity-manual.zh.po Copyright: 2017 Zhang Miao 2018, 2020 Ma Yong 2019 zlffcn + 2020 EldersJavas License: GPL-2+ Files: documentation/audacity/audacity-manual.pl.po @@ -235,6 +236,7 @@ Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po Copyright: 2016-2020 Ma Yong 2017 Boyuan Yang 2017 Roy Zhang + 2020 EldersJavas License: GPL-2+ Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh_Hant.po @@ -331,12 +333,12 @@ Copyright: 2012, 2013, 2014, 2015, 2016, 2019 Joe Hansen License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.nl.po -Copyright: 2014, 2015, 2016, 2017, 2018, 2019 Frans Spiesschaert +Copyright: 2014-2020 Frans Spiesschaert License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.ja.po Copyright: 2016, 2017 victory - 2019 hoxp18 + 2019-2020 hoxp18 License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.pl.po @@ -347,9 +349,10 @@ Copyright: 2016, 2017 Stanisław Krukowski License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.zh.po -Copyright: 2016, 2017, 2018, 2019, 2020 Ma Yong +Copyright: 2016-2020 Ma Yong 2017 Boyuan Yang 2017 Roy Zhang + 2020 EldersJavas License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.zh_Hant.po @@ -381,7 +384,7 @@ License: GPL-3+ Files: documentation/debian-edu-itil/debian-edu-itil-manual.zh.po Copyright: 2017 Liang Guo - 2018, 2019 Ma Yong + 2018-2020 Ma Yong License: GPL-3+ Files: documentation/debian-edu-itil/debian-edu-itil-manual.nl.po @@ -429,6 +432,7 @@ License: GPL-2+ Files: documentation/rosegarden/rosegarden-manual.zh.po Copyright: 2018 杨玉印 2019, 2020 Ma Yong + 2020 EldersJavas License: GPL-2+ Files: documentation/rosegarden/rosegarden-manual.zh_Hant.po ===================================== documentation/audacity/audacity-manual.cs.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2018-01-12 09:01+0000\n" "Last-Translator: Jiří Kučera <redwoodstudio at seznam.cz>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/debian-edu-" @@ -447,8 +447,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.fr.po ===================================== @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2012-02-25 17:05+0100\n" "Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n" "Language-Team: French <debian-l10n-french at lists.debian.org>\n" @@ -680,8 +680,8 @@ msgstr "" #| "Enjoy!" msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "Le document est écrit par Alf Tonny Bätz (2008, 2009), Holger Levsen (2009). " "Les droits de copie sont la propriété des auteurs. Ce document est distribué " ===================================== documentation/audacity/audacity-manual.ja.po ===================================== @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2019-06-10 23:29+0900\n" "Last-Translator: hoxp18 <hoxp18 at noramail.jp>\n" "Language-Team: Japanese <debian-japanese at lists.debian.org>\n" @@ -463,8 +463,8 @@ msgid "" "released under the GPL v2 or any later version." msgstr "" "ノルウェー語 (ブークモール) 翻訳版は、Jon Nordby (2014)、Petter Reinholdtsen " -"(2014, 2018)、Allan Nordhøy (2018, 2019, 2020) に著作権があり GPL v2 以降のライセン" -"スで提供されています。" +"(2014, 2018)、Allan Nordhøy (2018, 2019, 2020) に著作権があり GPL v2 以降のラ" +"イセンスで提供されています。" #. type: Content of: <article><section><para> msgid "" @@ -496,13 +496,18 @@ msgstr "" "Münster (2019) に著作権があり、GPL v2 以降のライセンスで提供されています。" #. type: Content of: <article><section><para> +#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), " +#| "Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 " +#| "or any later version." msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" -"中国語(簡易体)翻訳版は、Zhang Miao (2017)、Ma Yong (2018, 2020)、zlffcn (2019) に著" -"作権があり、GPL v2 以降のライセンスで提供されています。" +"中国語(簡易体)翻訳版は、Zhang Miao (2017)、Ma Yong (2018, 2020)、zlffcn " +"(2019) に著作権があり、GPL v2 以降のライセンスで提供されています。" #. type: Content of: <article><section><para> #, fuzzy ===================================== documentation/audacity/audacity-manual.nb.po ===================================== @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-02-25 15:32+0000\n" "Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n" "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-" @@ -497,8 +497,8 @@ msgid "" "released under the GPL v2 or any later version." msgstr "" "Rettighetene for oversettelsen til norsk bokmål tilhører Jon Nordby (2014), " -"Petter Reinholdtsen (2014, 2018) og Allan Nordhøy (2018, 2019, 2020), og er utgitt " -"under GPL v2 eller en senere versjon." +"Petter Reinholdtsen (2014, 2018) og Allan Nordhøy (2018, 2019, 2020), og er " +"utgitt under GPL v2 eller en senere versjon." #. type: Content of: <article><section><para> msgid "" @@ -534,14 +534,19 @@ msgstr "" "GPL v2 eller enhver senere versjon." #. type: Content of: <article><section><para> +#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), " +#| "Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 " +#| "or any later version." msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "Rettigheten til oversettelsen til forenklet kinesisk tilhører Zhang Miao " -"(2017), Ma Yong (2018, 2020) og zlffcn (2019), utgitt med lisensen GPL v2 eller " -"enhver senere versjon." +"(2017), Ma Yong (2018, 2020) og zlffcn (2019), utgitt med lisensen GPL v2 " +"eller enhver senere versjon." #. type: Content of: <article><section><para> #, fuzzy ===================================== documentation/audacity/audacity-manual.nl.po ===================================== @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: audacity-manual.nl\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-02-26 21:45+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n" @@ -505,8 +505,8 @@ msgid "" msgstr "" "De auteursrechten van de vertaling naar het Noorse Bokmål berusten bij Jon " "Nordby (2014), Petter Reinholdtsen (2014, 2018) en Allan Nordhøy (2018, " -"2019, 2020). Het document werd uitgegeven onder de licentie GPL v2 of een latere " -"versie." +"2019, 2020). Het document werd uitgegeven onder de licentie GPL v2 of een " +"latere versie." #. type: Content of: <article><section><para> msgid "" @@ -543,12 +543,13 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten " -"bij Zhang Miao (2017), Ma Yong (2018, 2020) en zlffcn (2019). De vertaling is " -"uitgebracht onder de GPL-licentie versie 2 of een latere versie." +"bij Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) en EldersJavas " +"(2020). De vertaling is uitgebracht onder de GPL-licentie versie 2 of een " +"latere versie." #. type: Content of: <article><section><para> msgid "" ===================================== documentation/audacity/audacity-manual.pl.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-02-21 15:33+0000\n" "Last-Translator: Michal Biesiada <blade-14 at o2.pl>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-" @@ -494,8 +494,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.pot ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+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" @@ -441,8 +441,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.pt_BR.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-02-28 22:01+0000\n" "Last-Translator: Wellington Terumi Uemura <wellingtonuemura at gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" @@ -536,12 +536,12 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "O direito autoral da tradução para o chinês simplificado é de Zhang Miao " -"(2017), Ma Yong (2018) e zlffcn (2019) e é lançada sob a GPL v2 ou qualquer " -"outra versão posterior." +"(2017), Ma Yong (2018), zlffcn (2019) e EldersJavas (2020) e é lançada sob a " +"GPL v2 ou qualquer outra versão posterior." #. type: Content of: <article><section><para> msgid "" ===================================== documentation/audacity/audacity-manual.pt_PT.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2019-10-28 14:38+0000\n" "Last-Translator: Manuela Silva <mmsrs at sky.com>\n" "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/" @@ -515,8 +515,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.sv.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2019-11-12 15:04+0000\n" "Last-Translator: Mattias Münster <mattiasmun at gmail.com>\n" "Language-Team: Swedish <https://hosted.weblate.org/projects/debian-edu-" @@ -542,8 +542,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.uk.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2018-09-30 16:07+0000\n" "Last-Translator: Володимир Бриняк <bardvv at gmail.com>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/debian-edu-" @@ -583,8 +583,8 @@ msgstr "" #, fuzzy msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "Китайський (спрощений китайський) переклад захищений авторським правом Чжан " "Мяо (2017) і випущений за версією GPL v2 або будь-якою пізнішою версією." ===================================== documentation/audacity/audacity-manual.xml ===================================== @@ -170,7 +170,7 @@ </para> <para>The Swedish translation is copyrighted by Erik Sundin (2016), Anders Jonsson (2018) and Mattias Münster (2019) and is released under the GPL v2 or any later version. </para> -<para>The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any later version. +<para>The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released under the GPL v2 or any later version. </para> <para>The Polish translation is copyrighted by Stanisław Krukowski (2017), Damian Nadolski (2019), Piotrek Pastuszak (2020) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. </para> ===================================== documentation/audacity/audacity-manual.zh.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-03-10 13:33+0000\n" "Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" @@ -495,8 +495,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.zh_Hant.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2019-01-26 19:04+0000\n" "Last-Translator: Louies <louies0623 at gmail.com>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" @@ -508,8 +508,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/source/AllInOne-audacity-manual.xml ===================================== @@ -1 +1 @@ -<?xml version="1.0" encoding="utf-8"?><!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN' 'http://www.docbook.org/xml/4.4/docbookx.dtd'><article><articleinfo><title>DebianEdu/Documentation/Manuals/Audacity/AllInOne

msgid "en" @@ -27,7 +27,7 @@ msgstr "Handleiding Debian Edu/Skolelinux Buster 10+edu0" #. type: Content of:

msgid "Publish date:" -msgstr "" +msgstr "Publicatiedatum:" #. type: Content of:

msgid "Manual for Debian Edu 10+edu0 Codename Buster" @@ -10281,19 +10281,15 @@ msgstr "" "een latere versie." #. type: Content of: <article><section><para> -#, fuzzy -#| msgid "" -#| "The Polish translation is copyrighted by Stanisław Krukowski (2016, " -#| "2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is " -#| "released under the GPL v2 or any later version." msgid "" "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), " "Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) " "and is released under the GPL v2 or any later version." msgstr "" "De auteursrechten van de Poolse vertaling berusten bij Stanisław Krukowski " -"(2016, 2017), Wiktor Wandachowicz (2019) en Adrian Bystrek (2019). De " -"vertaling is vrijgegeven onder de licentie GPL v2 of een latere versie." +"(2016, 2017), Wiktor Wandachowicz (2019), Adrian Bystrek (2019) en Michal " +"Biesiada (2020). De vertaling is vrijgegeven onder de licentie GPL v2 of een " +"latere versie." #. type: Content of: <article><section><para> msgid "" @@ -10468,8 +10464,8 @@ msgstr "" "bestand voor uw taal als er zo nog geen bestaat. U vindt er ook informatie " "over hoe u vertalingen moet bijwerken." -#. <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 " View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/1ae9e691e32b10ea78c97edbdd1aba5c201ddc64 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/1ae9e691e32b10ea78c97edbdd1aba5c201ddc64 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/20200301/8523c557/attachment-0001.html> From gitlab at salsa.debian.org Thu Mar 5 12:32:37 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Thu, 05 Mar 2020 12:32:37 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] debian/control: Update after running 'make dist'. Message-ID: <5e60f1667afd_2b23ff34a52f97c6137f2@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 5d33386e by Holger Levsen at 2020-03-05T13:32:26+01:00 debian/control: Update after running 'make dist'. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - debian/control Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +debian-edu (2.11.12) UNRELEASED; urgency=medium + + * debian/control: Update after running 'make dist'. + + -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 13:32:12 +0100 + debian-edu (2.11.11) unstable; urgency=medium [ Wolfgang Schweer ] ===================================== debian/control ===================================== @@ -832,6 +832,7 @@ Recommends: audacious, pianobooster, qsynth, rosegarden, + solfege, swh-plugins, terminatorx, timgm6mb-soundfont, @@ -840,8 +841,7 @@ Suggests: denemo, festival, hydrogen, lilypond, - musescore, - solfege + musescore Description: Debian Edu music and sound applications This metapackage depends on various applications that can be used to teach music. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/5d33386e828f68d53b99270509ff650888963c45 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/5d33386e828f68d53b99270509ff650888963c45 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/20200305/269f9dc7/attachment.html> From gitlab at salsa.debian.org Thu Mar 5 12:41:33 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Thu, 05 Mar 2020 12:41:33 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] Wrap long lines in changelog entries: 0.658, 0.654. Message-ID: <5e60f37dad0ce_2b23ff342bc5424614060@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: 76fe6673 by Holger Levsen at 2020-03-05T13:41:23+01:00 Wrap long lines in changelog entries: 0.658, 0.654. Fixes: lintian: debian-changelog-line-too-long See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +debian-edu-install (2.11.5) UNRELEASED; urgency=medium + + * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. + + -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 12:40:42 +0000 + debian-edu-install (2.11.4) unstable; urgency=medium [ Wolfgang Schweer ] @@ -3106,8 +3112,8 @@ debian-edu-install (0.658) unstable; urgency=low Add ltsp-chroot preseeds here * Added the preseeds for automatic installation using the new partman templates partman-auto/method and partman-lvm/confirm - * make partman commit.d script, that will feed partman with debian-edu's wanted - mountoptions. + * make partman commit.d script, that will feed partman with debian-edu's + wanted mountoptions. [ Petter Reinholdtsen ] * Add preseeding for uswsusp/encrypt to avoid question during installation. @@ -3225,7 +3231,8 @@ debian-edu-install (0.654) unstable; urgency=low return the d-e-install-udeb as a meta-package. * Revert to using autopartkit, now that it is working. Use partman in standalone mode, and manual partman partitioning in debian-edu-expert mode. - * Use the multiseat udeb as part of the debian-edu-install profile, if present. + * Use the multiseat udeb as part of the debian-edu-install profile, if + present. * In debian-edu-preseed, make sure /target/etc/bind/ exist before trying to make a symlink there. * Make sure /proc/ isn't mounted before trying to mount it in /target/. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/76fe66736d76115d7c72a9445ae558c2f47b31c3 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/76fe66736d76115d7c72a9445ae558c2f47b31c3 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/20200305/1d85673b/attachment-0001.html> From gitlab at salsa.debian.org Thu Mar 5 13:08:59 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Thu, 05 Mar 2020 13:08:59 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] Wrap long lines in changelog entries: 0.0.5. Message-ID: <5e60f9eb34b49_2b22aade3f0f06c6163e6@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-artwork Commits: f65a7c07 by Holger Levsen at 2020-03-05T14:02:50+01:00 Wrap long lines in changelog entries: 0.0.5. Fixes: lintian: debian-changelog-line-too-long See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +debian-edu-artwork (2.11.0.1-2) UNRELEASED; urgency=medium + + * Wrap long lines in changelog entries: 0.0.5, thanks lintian-brush. + + -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 13:00:04 +0000 + debian-edu-artwork (2.11.0.1-1) unstable; urgency=medium [ Wolfgang Schweer ] @@ -1421,8 +1427,8 @@ debian-edu-artwork (0.0.5) unstable; urgency=low yet, so the enabling code is commented out. * Copy <URL:http://www.skolelinux.de/~ralf/artwork/wallpapers/skoletux-wallpaper.png> - and use it as the KDE background image. Thanks, Ralf. Found via - skolelinux bug #397. + and use it as the KDE background image. Thanks, Ralf. Found via skolelinux + bug #397. * Add instructions for the CD splash image. * Replace CD splash image with one with black background and both the mascot, the logo and 'Debian Edu'. Tried to include gimp "source" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/commit/f65a7c0719610ef339d3e6ec73c2ee429ec4945f -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/commit/f65a7c0719610ef339d3e6ec73c2ee429ec4945f 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/20200305/e31b69d3/attachment.html> From gitlab at salsa.debian.org Thu Mar 5 15:58:16 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Thu, 05 Mar 2020 15:58:16 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] (nl) Debian Edu Bullseye manual translation update. Message-ID: <5e6121999f4_2b22aade3f0f06c63313c@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: 488dfef4 by Frans Spiesschaert at 2020-03-05T16:58:12+01:00 (nl) Debian Edu Bullseye manual translation update. - - - - - 2 changed files: - debian/changelog - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nl.po Changes: ===================================== debian/changelog ===================================== @@ -17,6 +17,7 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium * Bullseye manual: - Chinese (Simplified): Ma Yong - Norwegian Bokmål: Allan Nordhøy + - Dutch: Frans Spiesschaert * Buster manual: - Chinese (Simplified): Ma Yong - Dutch: Frans Spiesschaert ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nl.po ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/488dfef4592dbb33205b014dcb15d123add6618b -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/488dfef4592dbb33205b014dcb15d123add6618b 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/20200305/337d57b3/attachment-0001.html> From gitlab at salsa.debian.org Fri Mar 6 20:05:46 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Fri, 06 Mar 2020 20:05:46 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] Adjust preseeding Message-ID: <5e62ad1aaca8f_6dca2ad41d2ead44203696@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install Commits: 6eb7fc37 by Wolfgang Schweer at 2020-03-06T18:20:02+01:00 Adjust preseeding preseed-values/defaults.main-server: Drop no longer needed preseeding for tftpd-hpa, the defaults are just fine for working with the re-written LTSP. preseed-values/defaults.networked: Fix default-x-display-manager preseeding. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 3 changed files: - debian/changelog - preseed-values/defaults.main-server - preseed-values/defaults.networked Changes: ===================================== debian/changelog ===================================== @@ -1,7 +1,13 @@ debian-edu-install (2.11.5) UNRELEASED; urgency=medium + [ Holger Levsen ] * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. + [ Wolfgang Schweer ] + * preseed-values/defaults.main-server: Drop no longer needed preseeding for + tftpd-hpa, the defaults are just fine for working with the re-written LTSP. + * preseed-values/defaults.networked: Fix default-x-display-manager preseeding. + -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 12:40:42 +0000 debian-edu-install (2.11.4) unstable; urgency=medium ===================================== preseed-values/defaults.main-server ===================================== @@ -45,11 +45,6 @@ sitesummary-client sitesummary-client/hostclass string main-server #Configure bind9 options debian-edu. bind9 bind9/default-start-options string -4 -u bind -# Set up tftpd-hpa to work with PXE installs. Also, unset '--secure' option to be -# able to serve both LTSP and PXE. -tftpd-hpa tftpd-hpa/directory string /var/lib/tftpboot -tftpd-hpa tftpd-hpa/options string - # Ask for info on initial user before it is created in LDAP user-setup-udeb passwd/make-user boolean true ===================================== preseed-values/defaults.networked ===================================== @@ -44,5 +44,4 @@ exim4-config exim4/dc_minimaldns boolean false exim4-config exim4/dc_other_hostnames string intern # Prefer lightdm, sddm doesn't provide a language chooser -lightdm shared/default-x-display-manager select lightdm sddm shared/default-x-display-manager select lightdm View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/6eb7fc37f7caf164052e39f69edfa3f0a1546657 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/6eb7fc37f7caf164052e39f69edfa3f0a1546657 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/20200306/634f7326/attachment-0001.html> From gitlab at salsa.debian.org Fri Mar 6 20:06:09 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Fri, 06 Mar 2020 20:06:09 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 16 commits: Adjust ldap-bootstrap/root.ldif Message-ID: <5e62ad3141057_6dca2ad420116ac42039df@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: 77809b59 by Wolfgang Schweer at 2020-03-06T18:24:26+01:00 Adjust ldap-bootstrap/root.ldif Use https://www/ instead of http://www/. Cleanup file from 10 year old commented entries, also adjust outdated comment concerning the gosa ldap admin. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - d93caece by Wolfgang Schweer at 2020-03-06T18:31:26+01:00 Adjust tools/show-welcome-webpage to improve internal webpage localization Only query the internal webserver for localized files and store the base URL instead of the whole welcome URL. (Closes: #952665) Use the localized blends web page for the 'Standalone' profile. Whitespace fixes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 5cead286 by Wolfgang Schweer at 2020-03-06T18:34:13+01:00 Rework files in www/ to adjust and improve internal web page. Set correct language identifier in localized files (es-es,pt-br,zh-tw). Rename existing localization variants {es-es,nb-no,pt-br,zh-tw} to give the web server's Multiviews feature a better chance to choose the right file when the web browser is asking for content negotiation. Link index.html.nb-no to index.html.no to let the correct page be found just in case [no] is added as favourite language to a web browser. Use the localized blends web page. Remove link to no longer existing linuxsignpost.org website. Adjust related Makefile. Trivial unfuzzy for all PO files. Updated after running 'make' in the www directory. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 0decb9f4 by Wolfgang Schweer at 2020-03-06T18:40:42+01:00 www/: Remove now obsolete files. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 78aa0c57 by Wolfgang Schweer at 2020-03-06T18:50:47+01:00 Add new tool share/debian-edu-config/tools/edu-ltsp-install to be able to provide LTSP diskless workstation and thin client support. The tool contains basic usage instructions, more needs to go into the manual once everything has been integrated and is actually working like expected.. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 9f6ca44f by Wolfgang Schweer at 2020-03-06T19:02:24+01:00 Use kerberized NFS for mounting home directories Replace sec=sys with sec=krb5i in ldap-bootstrap/autofs.ldif file. Use dedicated edu.exports file shipped in the etc/exports.d/ directory, avoiding to modify the /etc/exports file as a benefit. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - b4a12a8f by Wolfgang Schweer at 2020-03-06T20:34:26+01:00 Drop now obsolete LTSP5 related files. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 30794eee by Wolfgang Schweer at 2020-03-06T20:37:55+01:00 Adjust share/debian-edu-config/d-i/finish-install Add code to set up LTSP client support during installation of systems with profile 'LTSP-Server'. Whitespace fixes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - bc90c03a by Wolfgang Schweer at 2020-03-06T20:40:09+01:00 Drop no longer needed cf3/cf.tftpd file. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1ba92af1 by Wolfgang Schweer at 2020-03-06T20:46:00+01:00 Adjust cfengine related files: cf3/cf.{chromium,firefox-esr} (http -> https related) cf3/cf.homes (Kerberized NFS related) cf3/cf.{finalize,ntp,pxeinstall,squid] and cf3/edu.cf (LTSP related) cf3/cf.workarounds (no workarounds needed atm) Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - cef05fca by Wolfgang Schweer at 2020-03-06T20:53:32+01:00 Cleanup LDIF files ldap-bootstrap/{gosa,samba}.ldif: Drop generation of outdated LanManager password and cleanup the files from 10 year old commented entries. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2aaa1adf by Wolfgang Schweer at 2020-03-06T20:55:53+01:00 Drop outdated (and obsolete) lib/mime/packages/debian-edu-mailcap file Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 24f26f25 by Wolfgang Schweer at 2020-03-06T20:58:33+01:00 Adjust debian/{dirs,debian-edu-config.links,debian-edu-config.postinst, debian-edu-config.maintscript}, cf3/promises.cf and Makefile to reflect the changes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - f1b76600 by Wolfgang Schweer at 2020-03-06T21:01:25+01:00 debian/debian-edu-config.preinst: Drop Stretch related conditional removal, add LTSP related new one. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1ab228fc by Wolfgang Schweer at 2020-03-06T21:02:36+01:00 Adjust debian/debian-edu-config.lintian-overrides. Thanks lintian. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 62717efc by Wolfgang Schweer at 2020-03-06T21:04:02+01:00 Add changelog entries for last commits. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 30 changed files: - Makefile - cf3/cf.chromium - cf3/cf.finalize - cf3/cf.firefox-esr - cf3/cf.grub - cf3/cf.homes - cf3/cf.ntp - cf3/cf.pxeinstall - cf3/cf.squid - − cf3/cf.tftpd - cf3/cf.workarounds - cf3/edu.cf - cf3/promises.cf - debian/changelog - debian/debian-edu-config.links - debian/debian-edu-config.lintian-overrides - debian/debian-edu-config.maintscript - debian/debian-edu-config.postinst - debian/debian-edu-config.preinst - debian/dirs - + etc/exports.d/edu.exports - − etc/ltsp/ltsp-build-client.conf - − etc/ltspfs/mounter.d/edu-notify - ldap-bootstrap/autofs.ldif - ldap-bootstrap/gosa.ldif - ldap-bootstrap/root.ldif - ldap-bootstrap/samba.ldif - − lib/mime/packages/debian-edu-mailcap - share/debian-edu-config/d-i/finish-install - − share/debian-edu-config/ltspfs-mounter-kde The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/94c04be2e45531502297d69d0e936559a42e9a25...62717efcb61f0a92de7fd7826945e41697a61437 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/94c04be2e45531502297d69d0e936559a42e9a25...62717efcb61f0a92de7fd7826945e41697a61437 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/20200306/3ddc0e3b/attachment.html> From gitlab at salsa.debian.org Fri Mar 6 20:12:05 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Fri, 06 Mar 2020 20:12:05 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Trim trailing whitespace, thanks lintian-brush. Message-ID: <5e62ae95bd2f8_6dca2ad41d2ead4420475c@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: 91d2d30c by Holger Levsen at 2020-03-06T21:11:44+01:00 Trim trailing whitespace, thanks lintian-brush. Fixes: lintian: file-contains-trailing-whitespace See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -63,8 +63,8 @@ debian-edu-config (2.11.16) UNRELEASED; urgency=medium * Adjust debian/{dirs,debian-edu-config.links,debian-edu-config.postinst}, cf3/promises.cf and Makefile to reflect the changes. * debian/debian-edu-config.preinst: - - Drop Stretch related conditional removal, add LTSP related new one. - * Adjust debian/debian-edu-config.lintian-overrides. Thanks lintian. + - Drop Stretch related conditional removal, add LTSP related new one. + * Adjust debian/debian-edu-config.lintian-overrides. Thanks lintian. -- Wolfgang Schweer <wschweer at arcor.de> Fri, 06 Mar 2020 10:37:20 +0100 View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/91d2d30c519772be86236f30d9b3d72e582f535a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/91d2d30c519772be86236f30d9b3d72e582f535a 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/20200306/15f38186/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 7 08:49:59 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 07 Mar 2020 08:49:59 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: convert education-menus into arch:all and mark it Multi-Arch:foreign. Message-ID: <5e636037887fb_6dca2ad41afdaef82946bb@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 448a1d6d by Holger Levsen at 2020-03-07T09:47:27+01:00 convert education-menus into arch:all and mark it Multi-Arch:foreign. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - b49ad972 by Holger Levsen at 2020-03-07T09:48:56+01:00 release as 2.11.12 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 3 changed files: - debian/changelog - debian/control - debian/control.stub Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,10 @@ -debian-edu (2.11.12) UNRELEASED; urgency=medium +debian-edu (2.11.12) unstable; urgency=medium - * debian/control: Update after running 'make dist'. + * debian/control: + - convert education-menus into arch:all and mark it Multi-Arch:foreign. + - update after running 'make dist'. - -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 13:32:12 +0100 + -- Holger Levsen <holger at debian.org> Sat, 07 Mar 2020 09:48:47 +0100 debian-edu (2.11.11) unstable; urgency=medium ===================================== debian/control ===================================== @@ -32,7 +32,8 @@ Description: Debian Edu tasks for tasksel XS-Comment: This is a specific package which reorganizes the menu. It doesn't make sense to put in tasks. Package: education-menus Section: misc -Architecture: any +Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: Debian Edu menu reorganization A package to reorganize menu branches in order to get a structure ===================================== debian/control.stub ===================================== @@ -31,7 +31,8 @@ Description: Debian Edu tasks for tasksel XS-Comment: This is a specific package which reorganizes the menu. It doesn't make sense to put in tasks. Package: education-menus Section: misc -Architecture: any +Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: Debian Edu menu reorganization A package to reorganize menu branches in order to get a structure View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/5d33386e828f68d53b99270509ff650888963c45...b49ad9728ec49e436c7c2d41399666407af30563 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/5d33386e828f68d53b99270509ff650888963c45...b49ad9728ec49e436c7c2d41399666407af30563 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/20200307/c17e09aa/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 7 08:50:00 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 07 Mar 2020 08:50:00 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu] Pushed new tag 2.11.12 Message-ID: <5e636038d091b_6dca2ad41afdaef829498@godard.mail> Holger Levsen pushed new tag 2.11.12 at Debian Edu / debian-edu -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/tree/2.11.12 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/20200307/41bd33f9/attachment.html> From gitlab at salsa.debian.org Sat Mar 7 08:54:31 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 07 Mar 2020 08:54:31 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config] Pushed new tag 2.11.16 Message-ID: <5e636148cf759_6dca2ad41bf418602956fe@godard.mail> Holger Levsen pushed new tag 2.11.16 at Debian Edu / debian-edu-config -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/tree/2.11.16 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/20200307/b9caa0cd/attachment.html> From gitlab at salsa.debian.org Sat Mar 7 08:54:33 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 07 Mar 2020 08:54:33 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] release as 2.11.16 Message-ID: <5e63614aaae94_6dca2ad41b2d9744295934@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: d2962639 by Holger Levsen at 2020-03-07T09:50:24+01:00 release as 2.11.16 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,6 @@ -debian-edu-config (2.11.16) UNRELEASED; urgency=medium +debian-edu-config (2.11.16) unstable; urgency=medium + [ Wolfgang Schweer ] * Rework welcome page and localization: - ldap-bootstrap/root.ldif: + Use https://www/ instead of http://www/. @@ -66,7 +67,7 @@ debian-edu-config (2.11.16) UNRELEASED; urgency=medium - Drop Stretch related conditional removal, add LTSP related new one. * Adjust debian/debian-edu-config.lintian-overrides. Thanks lintian. - -- Wolfgang Schweer <wschweer at arcor.de> Fri, 06 Mar 2020 10:37:20 +0100 + -- Holger Levsen <holger at debian.org> Sat, 07 Mar 2020 09:50:16 +0100 debian-edu-config (2.11.15) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/d2962639792654f0eb2cc910fb31d2c3ede77b4d -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/d2962639792654f0eb2cc910fb31d2c3ede77b4d 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/20200307/2f9f7155/attachment.html> From jenkins at jenkins.debian.net Sun Mar 8 05:31:52 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 8 Mar 2020 05:31:52 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-main-server/1671 Message-ID: <230106116.161.1583645512830.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-main-server/1671//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-main-server/1671/ for more information. From jenkins at jenkins.debian.net Sun Mar 8 05:40:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 8 Mar 2020 05:40:59 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-standalone/1670 Message-ID: <1289694168.163.1583646059831.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-standalone/1670//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-standalone/1670/ for more information. From gitlab at salsa.debian.org Sun Mar 8 12:56:39 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sun, 08 Mar 2020 12:56:39 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 9 commits: Translation: Debian Edu Documentation/Audacity manual Message-ID: <5e64eb872926d_6dca2ad41592a3d8414067@godard.mail> Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc Commits: f031d925 by Wellington Terumi Uemura at 2020-02-28T23:34:32+01:00 Translation: Debian Edu Documentation/Audacity manual Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (154 of 154 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/audacity/pt_BR/ - - - - - bb7f7e26 by Ma Yong at 2020-03-01T05:33:08+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.3% (805 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - a766e139 by Ma Yong at 2020-03-01T05:33:09+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 78.7% (1105 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - a2dc4fbc by Ma Yong at 2020-03-04T01:33:00+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.4% (807 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 8aceb1b3 by Ma Yong at 2020-03-04T01:33:01+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 78.8% (1107 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 15ec49a3 by Ma Yong at 2020-03-07T01:32:56+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.8% (811 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - c27cf5ca by Ma Yong at 2020-03-07T01:32:57+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.1% (1111 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - e34d5b78 by Ma Yong at 2020-03-08T13:56:07+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.9% (813 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - b6db1e3c by Ma Yong at 2020-03-08T13:56:08+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.2% (1113 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 3 changed files: - documentation/audacity/audacity-manual.pt_BR.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/audacity/audacity-manual.pt_BR.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-28 19:20+0000\n" +"PO-Revision-Date: 2020-02-28 22:01+0000\n" "Last-Translator: Wellington Terumi Uemura <wellingtonuemura at gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "debian-edu-documentation/audacity/pt_BR/>\n" @@ -494,7 +494,6 @@ msgid "Translation copyright and authors" msgstr "Direitos autorais de tradução e autores" #. type: Content of: <article><section><para> -#, fuzzy msgid "" "The Bokmål translation is copyrighted by Jon Nordby (2014), Petter " "Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is " @@ -521,8 +520,8 @@ msgid "" "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2018, " "2019, 2020) and is released under the GPL v2 or any later version." msgstr "" -"O direito autoral para a tradução Alemã é de Frans Spiesschaert (2014, 2018, " -"2019) e é lançada sob a GPL v2 ou qualquer outra versão posterior." +"O direito autoral da tradução para o Alemão é de Frans Spiesschaert (2014, " +"2018, 2019) e é lançada sob a GPL v2 ou qualquer outra versão posterior." #. type: Content of: <article><section><para> msgid "" @@ -535,13 +534,12 @@ msgstr "" "versão posterior." #. type: Content of: <article><section><para> -#, fuzzy msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " "Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " "later version." msgstr "" -"O direito autoral para a tradução para o chinês simplificado é de Zhang Miao " +"O direito autoral da tradução para o chinês simplificado é de Zhang Miao " "(2017), Ma Yong (2018) e zlffcn (2019) e é lançada sob a GPL v2 ou qualquer " "outra versão posterior." ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-02-28 11:49+0000\n" +"PO-Revision-Date: 2020-03-08 12:56+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5065,13 +5065,13 @@ msgstr "" msgid "" "For new systems added with GOsa², Kerberos host keytab files are generated " "automatically." -msgstr "" +msgstr "对于以 GOsa² 添加的新系统，自动生成 Kerberos 主机密钥表文件。" #. type: Content of: <article><section><section><para> msgid "" "To create one for a system already configured with GOsa², log in on the main " "server as root and run" -msgstr "" +msgstr "要为一个已用 GOsa² 配置过的系统创建这个，作为 root 登录主服务器并运行" #. type: CDATA #, no-wrap @@ -5248,6 +5248,7 @@ msgid "" "are pushed into the stable suite regularly when stable point releases are " "done, which roughly happens every two months." msgstr "" +"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。" #. type: Content of: <article><section><section><title> msgid "Using backports to install newer software" @@ -5382,6 +5383,8 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " +"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5450,6 +5453,9 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" +"wakeup</computeroutput> 支持的主板和 BIOS " +"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5469,6 +5475,12 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" +"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " +"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " +"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " +"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " +"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5706,6 +5718,10 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " +"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " +"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" +"应该在 /Students 之下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5717,6 +5733,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" +"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5732,6 +5750,10 @@ msgid "" "Samba tabs, maybe take screenshots to have information ready for the new " "template." msgstr "" +"从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " +"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " +"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5739,6 +5761,8 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" +"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-02-28 11:49+0000\n" +"PO-Revision-Date: 2020-03-08 12:56+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -5239,18 +5239,23 @@ msgid "" "server and workstation increases with the security level, <emphasis>krb5i</" "emphasis> might be a good choice." msgstr "" +"使用 Kerberos 对于 NFS 挂载主目录是一个安全特性。支持 " +"<emphasis>krb5</emphasis>，<emphasis>krb5i</emphasis> 和 " +"<emphasis>krb5p</emphasis> 级别（<emphasis>krb5</emphasis> 是指 Kerberos " +"验证，<emphasis>i</emphasis> 是完整检查的缩略而 <emphasis>p</emphasis> " +"是关于私人权利，即隐私）；服务器和工作站两者负载的增加与其安全级别一致，<emphasis>krb5i</emphasis> 可能是一个好选择。" #. type: Content of: <article><section><section><para> msgid "" "For new systems added with GOsa², Kerberos host keytab files are generated " "automatically." -msgstr "" +msgstr "对于以 GOsa² 添加的新系统，自动生成 Kerberos 主机密钥表文件。" #. type: Content of: <article><section><section><para> msgid "" "To create one for a system already configured with GOsa², log in on the main " "server as root and run" -msgstr "" +msgstr "要为一个已用 GOsa² 配置过的系统创建这个，作为 root 登录主服务器并运行" #. type: CDATA #, no-wrap @@ -5266,6 +5271,9 @@ msgid "" "<emphasis>sshfs</emphasis> to mount home directories, so there's nothing to " "do for diskless workstations." msgstr "" +"<emphasis role=\"strong\">请注意：</emphasis> 主机密钥表的创建适合于<emphasis>工作站</emphasis>" +"，<emphasis>服务器</emphasis>和<emphasis>终端</emphasis>类型的系统但不是那些<emphasis>网络设备</em" +"phasis>的类型。还有，LTSP 客户端使用 <emphasis>sshfs</emphasis> 挂载主目录，所以那对于无盘工作站没什么要做的。" #. type: Content of: <article><section><section><section><title> msgid "How to enable it" @@ -5312,6 +5320,8 @@ msgid "" "run <computeroutput>exportfs</computeroutput> to control if <emphasis>gss/" "krb5i</emphasis> is active for both entries." msgstr "" +"如果两项 <emphasis>gss/krb5i</emphasis> 条目是有效的就运行 " +"<computeroutput>exportfs</computeroutput> 来管理。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "login as root." @@ -5408,6 +5418,7 @@ msgid "" "are pushed into the stable suite regularly when stable point releases are " "done, which roughly happens every two months." msgstr "" +"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。" #. type: Content of: <article><section><section><title> msgid "Using backports to install newer software" @@ -5542,6 +5553,8 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " +"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5610,6 +5623,9 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" +"wakeup</computeroutput> 支持的主板和 BIOS " +"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5629,6 +5645,12 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" +"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " +"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " +"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " +"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " +"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5845,6 +5867,10 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " +"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " +"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" +"应该在 /Students 之下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5856,6 +5882,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" +"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5871,6 +5899,10 @@ msgid "" "Samba tabs, maybe take screenshots to have information ready for the new " "template." msgstr "" +"从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " +"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " +"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5878,6 +5910,8 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" +"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/8c76447cc303319c2d28fc92131d742829952863...b6db1e3cfa18d30c1a30058b05ce9cd934df405d -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/8c76447cc303319c2d28fc92131d742829952863...b6db1e3cfa18d30c1a30058b05ce9cd934df405d 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/20200308/ad27b01f/attachment-0001.html> From gitlab at salsa.debian.org Sun Mar 8 13:07:53 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sun, 08 Mar 2020 13:07:53 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 3 commits: translation update by Wellington Terumi Uemura Message-ID: <5e64ee2a2a23d_6dca2ad41736377c4146d2@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: ed091933 by Frans Spiesschaert at 2020-03-08T14:04:23+01:00 translation update by Wellington Terumi Uemura Translation: Debian Edu Documentation/Audacity manual Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (154 of 154 strings) - - - - - 9467aeb4 by Frans Spiesschaert at 2020-03-08T14:05:49+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 67.3% (805 of 1196 strings) - - - - - f7cf4a75 by Frans Spiesschaert at 2020-03-08T14:07:36+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 78.7% (1105 of 1404 strings) - - - - - 3 changed files: - documentation/audacity/audacity-manual.pt_BR.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/audacity/audacity-manual.pt_BR.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-28 19:20+0000\n" +"PO-Revision-Date: 2020-02-28 22:01+0000\n" "Last-Translator: Wellington Terumi Uemura <wellingtonuemura at gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "debian-edu-documentation/audacity/pt_BR/>\n" @@ -494,7 +494,6 @@ msgid "Translation copyright and authors" msgstr "Direitos autorais de tradução e autores" #. type: Content of: <article><section><para> -#, fuzzy msgid "" "The Bokmål translation is copyrighted by Jon Nordby (2014), Petter " "Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is " @@ -521,8 +520,8 @@ msgid "" "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2018, " "2019, 2020) and is released under the GPL v2 or any later version." msgstr "" -"O direito autoral para a tradução Alemã é de Frans Spiesschaert (2014, 2018, " -"2019) e é lançada sob a GPL v2 ou qualquer outra versão posterior." +"O direito autoral da tradução para o Alemão é de Frans Spiesschaert (2014, " +"2018, 2019) e é lançada sob a GPL v2 ou qualquer outra versão posterior." #. type: Content of: <article><section><para> msgid "" @@ -535,13 +534,12 @@ msgstr "" "versão posterior." #. type: Content of: <article><section><para> -#, fuzzy msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " "Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " "later version." msgstr "" -"O direito autoral para a tradução para o chinês simplificado é de Zhang Miao " +"O direito autoral da tradução para o chinês simplificado é de Zhang Miao " "(2017), Ma Yong (2018) e zlffcn (2019) e é lançada sob a GPL v2 ou qualquer " "outra versão posterior." ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-02-28 11:49+0000\n" +"PO-Revision-Date: 2020-03-08 12:56+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5065,13 +5065,13 @@ msgstr "" msgid "" "For new systems added with GOsa², Kerberos host keytab files are generated " "automatically." -msgstr "" +msgstr "对于以 GOsa² 添加的新系统，自动生成 Kerberos 主机密钥表文件。" #. type: Content of: <article><section><section><para> msgid "" "To create one for a system already configured with GOsa², log in on the main " "server as root and run" -msgstr "" +msgstr "要为一个已用 GOsa² 配置过的系统创建这个，作为 root 登录主服务器并运行" #. type: CDATA #, no-wrap @@ -5248,6 +5248,7 @@ msgid "" "are pushed into the stable suite regularly when stable point releases are " "done, which roughly happens every two months." msgstr "" +"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。" #. type: Content of: <article><section><section><title> msgid "Using backports to install newer software" @@ -5382,6 +5383,8 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " +"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5450,6 +5453,9 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" +"wakeup</computeroutput> 支持的主板和 BIOS " +"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5469,6 +5475,12 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" +"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " +"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " +"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " +"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " +"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5706,6 +5718,10 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " +"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " +"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" +"应该在 /Students 之下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5717,6 +5733,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" +"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5732,6 +5750,10 @@ msgid "" "Samba tabs, maybe take screenshots to have information ready for the new " "template." msgstr "" +"从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " +"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " +"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5739,6 +5761,8 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" +"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-02-28 11:49+0000\n" +"PO-Revision-Date: 2020-03-08 12:56+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -5239,18 +5239,23 @@ msgid "" "server and workstation increases with the security level, <emphasis>krb5i</" "emphasis> might be a good choice." msgstr "" +"使用 Kerberos 对于 NFS 挂载主目录是一个安全特性。支持 " +"<emphasis>krb5</emphasis>，<emphasis>krb5i</emphasis> 和 " +"<emphasis>krb5p</emphasis> 级别（<emphasis>krb5</emphasis> 是指 Kerberos " +"验证，<emphasis>i</emphasis> 是完整检查的缩略而 <emphasis>p</emphasis> " +"是关于私人权利，即隐私）；服务器和工作站两者负载的增加与其安全级别一致，<emphasis>krb5i</emphasis> 可能是一个好选择。" #. type: Content of: <article><section><section><para> msgid "" "For new systems added with GOsa², Kerberos host keytab files are generated " "automatically." -msgstr "" +msgstr "对于以 GOsa² 添加的新系统，自动生成 Kerberos 主机密钥表文件。" #. type: Content of: <article><section><section><para> msgid "" "To create one for a system already configured with GOsa², log in on the main " "server as root and run" -msgstr "" +msgstr "要为一个已用 GOsa² 配置过的系统创建这个，作为 root 登录主服务器并运行" #. type: CDATA #, no-wrap @@ -5266,6 +5271,9 @@ msgid "" "<emphasis>sshfs</emphasis> to mount home directories, so there's nothing to " "do for diskless workstations." msgstr "" +"<emphasis role=\"strong\">请注意：</emphasis> 主机密钥表的创建适合于<emphasis>工作站</emphasis>" +"，<emphasis>服务器</emphasis>和<emphasis>终端</emphasis>类型的系统但不是那些<emphasis>网络设备</em" +"phasis>的类型。还有，LTSP 客户端使用 <emphasis>sshfs</emphasis> 挂载主目录，所以那对于无盘工作站没什么要做的。" #. type: Content of: <article><section><section><section><title> msgid "How to enable it" @@ -5312,6 +5320,8 @@ msgid "" "run <computeroutput>exportfs</computeroutput> to control if <emphasis>gss/" "krb5i</emphasis> is active for both entries." msgstr "" +"如果两项 <emphasis>gss/krb5i</emphasis> 条目是有效的就运行 " +"<computeroutput>exportfs</computeroutput> 来管理。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "login as root." @@ -5408,6 +5418,7 @@ msgid "" "are pushed into the stable suite regularly when stable point releases are " "done, which roughly happens every two months." msgstr "" +"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。" #. type: Content of: <article><section><section><title> msgid "Using backports to install newer software" @@ -5542,6 +5553,8 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " +"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5610,6 +5623,9 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" +"wakeup</computeroutput> 支持的主板和 BIOS " +"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5629,6 +5645,12 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" +"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " +"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " +"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " +"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " +"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5845,6 +5867,10 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " +"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " +"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" +"应该在 /Students 之下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5856,6 +5882,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" +"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5871,6 +5899,10 @@ msgid "" "Samba tabs, maybe take screenshots to have information ready for the new " "template." msgstr "" +"从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " +"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " +"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5878,6 +5910,8 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" +"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/488dfef4592dbb33205b014dcb15d123add6618b...f7cf4a752e7c2663accac10879b300e31be606d9 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/488dfef4592dbb33205b014dcb15d123add6618b...f7cf4a752e7c2663accac10879b300e31be606d9 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/20200308/3235f1f4/attachment-0001.html> From jenkins at jenkins.debian.net Mon Mar 9 04:40:07 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:40:07 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-music/1667 Message-ID: <417314149.210.1583728808057.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-music/1667//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-music/1667/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:40:34 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:40:34 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-workstation/1677 Message-ID: <248110718.212.1583728834651.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-workstation/1677//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-workstation/1677/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:43:46 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:43:46 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-language/239 Message-ID: <1996208811.214.1583729026111.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-language/239//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-language/239/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:45:38 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:45:38 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-gnome/1670 Message-ID: <314939762.216.1583729138308.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-gnome/1670//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-gnome/1670/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:47:54 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:47:54 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-development/1670 Message-ID: <1562448387.218.1583729274957.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-development/1670//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-development/1670/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 04:50:43 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 04:50:43 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-geography/1668 Message-ID: <1024952055.220.1583729443947.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-geography/1668//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-geography/1668/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:04:22 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:04:22 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-astronomy/1673 Message-ID: <1355166719.222.1583730262577.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-astronomy/1673//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-astronomy/1673/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:05:52 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:05:52 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-chemistry/1676 Message-ID: <185050287.224.1583730352514.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-chemistry/1676//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-chemistry/1676/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:17:15 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:17:15 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-lxde/1674 Message-ID: <167472925.226.1583731035130.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxde/1674//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxde/1674/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:17:17 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:17:17 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-kde/1678 Message-ID: <109127165.228.1583731037522.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-kde/1678//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-kde/1678/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:19:29 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:19:29 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-lxqt/699 Message-ID: <17474306.230.1583731169575.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxqt/699//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxqt/699/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:21:19 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:21:19 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-electronics/1669 Message-ID: <503094579.232.1583731280019.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-electronics/1669//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-electronics/1669/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:23:22 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:23:22 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-mate/1671 Message-ID: <1577815436.234.1583731402605.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-mate/1671//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-mate/1671/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:24:25 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:24:25 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-graphics/1668 Message-ID: <189830658.236.1583731465211.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-graphics/1668//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-graphics/1668/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:27:13 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:27:13 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-logic-games/1667 Message-ID: <1549697419.238.1583731634061.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-logic-games/1667//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-logic-games/1667/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:29:30 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:29:30 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-desktop-xfce/1677 Message-ID: <2139388427.240.1583731770918.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-xfce/1677//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-xfce/1677/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:31:02 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:31:02 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-ltsp-server/920 Message-ID: <827096147.243.1583731862474.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-ltsp-server/920//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-ltsp-server/920/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:32:03 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:32:03 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-mathematics/1672 Message-ID: <1211604278.245.1583731923748.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-mathematics/1672//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-mathematics/1672/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:32:36 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:32:36 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-main-server/1672 In-Reply-To: <230106116.161.1583645512830.JavaMail.jenkins@jenkins> References: <230106116.161.1583645512830.JavaMail.jenkins@jenkins> Message-ID: <2125724898.247.1583731956810.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-main-server/1672//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-main-server/1672/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:34:13 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:34:13 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-misc/1668 Message-ID: <1245874980.249.1583732053784.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-misc/1668//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-misc/1668/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:35:42 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:35:42 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-physics/1669 Message-ID: <1486933768.251.1583732142057.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-physics/1669//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-physics/1669/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:37:38 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:37:38 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_sid_install_education-primaryschool/691 Message-ID: <1355902552.253.1583732258264.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-primaryschool/691//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-primaryschool/691/ for more information. From jenkins at jenkins.debian.net Mon Mar 9 05:43:07 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 9 Mar 2020 05:43:07 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-standalone/1671 In-Reply-To: <1289694168.163.1583646059831.JavaMail.jenkins@jenkins> References: <1289694168.163.1583646059831.JavaMail.jenkins@jenkins> Message-ID: <538478204.255.1583732587182.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-standalone/1671//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-standalone/1671/ for more information. From gitlab at salsa.debian.org Tue Mar 10 08:45:36 2020 From: gitlab at salsa.debian.org (hoxp18) Date: Tue, 10 Mar 2020 08:45:36 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] (ja) Debian Edu Buster manual translation update. Message-ID: <5e6753b033a59_6dca2ad41d365ee0638223@godard.mail> hoxp18 pushed to branch master at Debian Edu / debian-edu-doc Commits: 8a596450 by hoxp18 at 2020-03-10T17:44:12+09:00 (ja) Debian Edu Buster manual translation update. - - - - - 1 changed file: - documentation/debian-edu-buster/debian-edu-buster-manual.ja.po Changes: ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.ja.po ===================================== @@ -9753,19 +9753,14 @@ msgstr "" "以降で提供されています。" #. type: Content of: <article><section><para> -#, fuzzy -#| msgid "" -#| "The Polish translation is copyrighted by Stanisław Krukowski (2016, " -#| "2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is " -#| "released under the GPL v2 or any later version." msgid "" "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), " "Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) " "and is released under the GPL v2 or any later version." msgstr "" "ポーランド語の翻訳版は、Stanisław Krukowski (2016, 2017)、Wiktor " -"Wandachowicz (2019) そして Adrian Bystrek (2019) に著作権があり、GPL v2 とそ" -"れ以降のライセンスで提供されています。" +"Wandachowicz (2019)、Adrian Bystrek (2019)、そして Michal Biesiada (2020) に" +"著作権があり、GPL v2 とそれ以降のライセンスで提供されています。" #. type: Content of: <article><section><para> msgid "" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/8a596450fd791041c4a91f86ba138bfdcc96d645 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/8a596450fd791041c4a91f86ba138bfdcc96d645 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/20200310/58955d23/attachment.html> From gitlab at salsa.debian.org Tue Mar 10 11:28:44 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Tue, 10 Mar 2020 11:28:44 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Add changelog entry for Japanese Debian Edu Buster manual translation update Message-ID: <5e6779ec4af00_6dca2ad41d380628651163@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: 41647912 by Frans Spiesschaert at 2020-03-10T12:28:19+01:00 Add changelog entry for Japanese Debian Edu Buster manual translation update - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -21,6 +21,7 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium * Buster manual: - Chinese (Simplified): Ma Yong - Dutch: Frans Spiesschaert + - Japanese: hoxp18 -- Holger Levsen <holger at debian.org> Fri, 28 Feb 2020 16:24:40 +0100 View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/41647912b1e91fa0242555f78f9d096977b3468d -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/41647912b1e91fa0242555f78f9d096977b3468d 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/20200310/5d1cb54a/attachment-0001.html> From jenkins at jenkins.debian.net Tue Mar 10 12:47:04 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Tue, 10 Mar 2020 12:47:04 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-main-server_upgrade_to_sid/81 Message-ID: <1198683697.23.1583844426612.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-main-server_upgrade_to_sid/81//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-main-server_upgrade_to_sid/81/ for more information. From jenkins at jenkins.debian.net Tue Mar 10 14:11:00 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Tue, 10 Mar 2020 14:11:00 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-standalone_upgrade_to_sid/81 Message-ID: <16341551.26.1583849460397.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-standalone_upgrade_to_sid/81//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-standalone_upgrade_to_sid/81/ for more information. From gitlab at salsa.debian.org Tue Mar 10 16:33:38 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Tue, 10 Mar 2020 16:33:38 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] Adjust tftpd-hpa preseeding. Message-ID: <5e67c163a779_6dca2ad41d343ac068831@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install Commits: f79781af by Wolfgang Schweer at 2020-03-10T17:29:55+01:00 Adjust tftpd-hpa preseeding. Tests have shown that the --secure option still needs to be dropped to be able to both serve LTSP clients and provide the PXE installation menue on the main network. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2 changed files: - debian/changelog - preseed-values/defaults.main-server Changes: ===================================== debian/changelog ===================================== @@ -4,8 +4,8 @@ debian-edu-install (2.11.5) UNRELEASED; urgency=medium * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. [ Wolfgang Schweer ] - * preseed-values/defaults.main-server: Drop no longer needed preseeding for - tftpd-hpa, the defaults are just fine for working with the re-written LTSP. + * preseed-values/defaults.main-server: Drop no longer needed preseed value + for tftpd-hpa; the default directory will now be used for LTSP and PXE. * preseed-values/defaults.networked: Fix default-x-display-manager preseeding. -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 12:40:42 +0000 ===================================== preseed-values/defaults.main-server ===================================== @@ -45,6 +45,9 @@ sitesummary-client sitesummary-client/hostclass string main-server #Configure bind9 options debian-edu. bind9 bind9/default-start-options string -4 -u bind +# Unset '--secure' option so that both LTSP and PXE can be served. +tftpd-hpa tftpd-hpa/options string + # Ask for info on initial user before it is created in LDAP user-setup-udeb passwd/make-user boolean true View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/f79781afa1b73a0b3ff4fa4d047e6295b9f243e9 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/f79781afa1b73a0b3ff4fa4d047e6295b9f243e9 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/20200310/66b50b6b/attachment-0001.html> From gitlab at salsa.debian.org Tue Mar 10 20:12:20 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Tue, 10 Mar 2020 20:12:20 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] release as 2.11.5 Message-ID: <5e67f4a4e7117_6dca2ad41d3b32e471719f@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: a77aed7b by Holger Levsen at 2020-03-10T21:03:18+01:00 release as 2.11.5 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,14 +1,14 @@ -debian-edu-install (2.11.5) UNRELEASED; urgency=medium - - [ Holger Levsen ] - * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. +debian-edu-install (2.11.5) unstable; urgency=medium [ Wolfgang Schweer ] * preseed-values/defaults.main-server: Drop no longer needed preseed value for tftpd-hpa; the default directory will now be used for LTSP and PXE. * preseed-values/defaults.networked: Fix default-x-display-manager preseeding. - -- Holger Levsen <holger at debian.org> Thu, 05 Mar 2020 12:40:42 +0000 + [ Holger Levsen ] + * Wrap long lines in changelog entries: 0.658, 0.654, thanks lintian-brush. + + -- Holger Levsen <holger at debian.org> Tue, 10 Mar 2020 21:03:08 +0100 debian-edu-install (2.11.4) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/a77aed7b1aaa689a2df4c00f406705aed9f7b176 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/a77aed7b1aaa689a2df4c00f406705aed9f7b176 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/20200310/cce2a4f0/attachment.html> From gitlab at salsa.debian.org Tue Mar 10 20:12:23 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Tue, 10 Mar 2020 20:12:23 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install] Pushed new tag 2.11.5 Message-ID: <5e67f4a77f241_6dca2ad41d343ac0717439@godard.mail> Holger Levsen pushed new tag 2.11.5 at Debian Edu / debian-edu-install -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/tree/2.11.5 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/20200310/60e389d3/attachment-0001.html> From jenkins at jenkins.debian.net Fri Mar 13 12:39:46 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:39:46 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-language_upgrade_to_sid/82 Message-ID: <724136514.5.1584103186586.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-language_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-language_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 12:43:17 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:43:17 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/82 Message-ID: <1378308242.7.1584103397915.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 12:47:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:47:57 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/82 Message-ID: <796115413.10.1584103677537.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 12:54:24 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:54:24 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/82 Message-ID: <1173407977.12.1584104064191.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 12:56:02 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 12:56:02 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/82 Message-ID: <1915468939.14.1584104162573.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:08:40 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:08:40 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/82 Message-ID: <2107031567.16.1584104920257.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:10:04 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:10:04 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/82 Message-ID: <1081495587.18.1584105004305.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:15:06 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:15:06 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-physics_upgrade_to_sid/82 Message-ID: <454037415.20.1584105306795.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-physics_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-physics_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:21:32 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:21:32 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/82 Message-ID: <1430196716.22.1584105692216.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:27:50 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:27:50 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-music_upgrade_to_sid/82 Message-ID: <1220535651.24.1584106070176.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-music_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-music_upgrade_to_sid/82/ for more information. From gitlab at salsa.debian.org Fri Mar 13 13:39:18 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Fri, 13 Mar 2020 13:39:18 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] d/rules: add workaround to fix (unreported) issue in blends-dev. Closes: #953359. Message-ID: <5e6b8d0679ffe_6dca2ad418fa92b01017948@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 7b316679 by Holger Levsen at 2020-03-13T14:39:02+01:00 d/rules: add workaround to fix (unreported) issue in blends-dev. Closes: #953359. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +debian-edu (2.11.13) UNRELEASED; urgency=medium + + * d/rules: add workaround to fix (unreported) issue in blends-dev. + Closes: #953359. + + -- Holger Levsen <holger at debian.org> Fri, 13 Mar 2020 14:37:26 +0100 + debian-edu (2.11.12) unstable; urgency=medium * debian/control: ===================================== debian/rules ===================================== @@ -1,3 +1,8 @@ #!/usr/bin/make -f include /usr/share/blends-dev/rules + +# workaround to fix #953359 +override_dh_install: + $(BLEND_INSTALL_HELPER) + dh_install -a $(BLENDNAME)-tasks.desc usr/share/tasksel/descs View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/7b316679288f178c7fb946008450973e3359e888 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/7b316679288f178c7fb946008450973e3359e888 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/20200313/eebc7e13/attachment-0001.html> From jenkins at jenkins.debian.net Fri Mar 13 13:44:56 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:44:56 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/82 Message-ID: <1849593642.27.1584107096636.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:51:39 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:51:39 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/82 Message-ID: <561273013.29.1584107499420.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 13:53:50 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 13:53:50 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/82 Message-ID: <187464411.31.1584107630329.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:19:35 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:19:35 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/82 Message-ID: <835162647.35.1584109175427.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:19:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:19:59 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/82 Message-ID: <1853598282.37.1584109199529.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:20:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:20:57 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/82 Message-ID: <203427940.39.1584109257866.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:22:21 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:22:21 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/82 Message-ID: <1407837126.41.1584109341365.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:23:53 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:23:53 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-geography_upgrade_to_sid/82 Message-ID: <445351437.43.1584109433543.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-geography_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-geography_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:27:25 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:27:25 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-misc_upgrade_to_sid/82 Message-ID: <1932067021.45.1584109645473.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-misc_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-misc_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:29:28 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:29:28 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-development_upgrade_to_sid/82 Message-ID: <52546687.47.1584109769006.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-development_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-development_upgrade_to_sid/82/ for more information. From jenkins at jenkins.debian.net Fri Mar 13 14:30:15 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Fri, 13 Mar 2020 14:30:15 +0000 (UTC) Subject: [debian-edu-commits] Still Failing: chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/82 Message-ID: <250011305.49.1584109815450.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/82//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/82/ for more information. From gitlab at salsa.debian.org Sat Mar 14 18:09:46 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 14 Mar 2020 18:09:46 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] release as 2.11.13 Message-ID: <5e6d1deaef0aa_6dca3fa29b39c9d4118313c@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: c43e182c by Holger Levsen at 2020-03-14T19:08:55+01:00 release as 2.11.13 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,9 @@ -debian-edu (2.11.13) UNRELEASED; urgency=medium +debian-edu (2.11.13) unstable; urgency=medium * d/rules: add workaround to fix (unreported) issue in blends-dev. Closes: #953359. - -- Holger Levsen <holger at debian.org> Fri, 13 Mar 2020 14:37:26 +0100 + -- Holger Levsen <holger at debian.org> Sat, 14 Mar 2020 19:08:21 +0100 debian-edu (2.11.12) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/c43e182c240b9a47fb13e994585036c3762cc8ef -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/c43e182c240b9a47fb13e994585036c3762cc8ef 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/20200314/fe9f42cf/attachment.html> From gitlab at salsa.debian.org Sat Mar 14 18:09:49 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 14 Mar 2020 18:09:49 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu] Pushed new tag 2.11.13 Message-ID: <5e6d1ded22a99_6dca2ad419bd1cb8118348f@godard.mail> Holger Levsen pushed new tag 2.11.13 at Debian Edu / debian-edu -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/tree/2.11.13 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/20200314/f6570841/attachment.html> From gitlab at salsa.debian.org Sat Mar 14 18:14:19 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 14 Mar 2020 18:14:19 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] nitpick on package description: less questions. Message-ID: <5e6d1efbdb719_6dca2ad419bd1cb81183763@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: bfb520df by Holger Levsen at 2020-03-14T19:13:07+01:00 nitpick on package description: less questions. Change package description: Set d-i values to install Debian Edu *with* *less* questions (not without). Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - debian/control Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +debian-edu-install (2.11.6) UNRELEASED; urgency=medium + + * Change package description: Set d-i values to install Debian Edu *with* + *less* questions (not without). + + -- Holger Levsen <holger at debian.org> Sat, 14 Mar 2020 19:12:12 +0100 + debian-edu-install (2.11.5) unstable; urgency=medium [ Wolfgang Schweer ] ===================================== debian/control ===================================== @@ -22,7 +22,7 @@ Depends: ${misc:Depends}, etckeeper, libgtk3-perl, lsb-base, -Description: Set d-i values to install Debian Edu without questions +Description: Set d-i values to install Debian Edu with less questions This package provides default answers for packages using debconf, and configures services to work out of the box after an installation. . View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/bfb520df43913321c91f49bcfa951bcd7ef5b6c6 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/bfb520df43913321c91f49bcfa951bcd7ef5b6c6 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/20200314/eb6fa348/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 14 21:14:20 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sat, 14 Mar 2020 21:14:20 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 8 commits: Translation: Debian Edu Documentation/Bullseye manual Message-ID: <5e6d492c9bd81_6dca2ad41c0c9624120278b@godard.mail> Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc Commits: 551f93e1 by Ma Yong at 2020-03-10T14:33:05+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.2% (816 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - f48245eb by EldersJavas at 2020-03-10T14:33:05+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.2% (816 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 0f2b563e by EldersJavas at 2020-03-10T14:33:06+01:00 Translation: Debian Edu Documentation/Audacity manual Translated using Weblate (Chinese (Simplified)) Currently translated at 44.8% (69 of 154 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/audacity/zh_Hans/ - - - - - fda9883f by EldersJavas at 2020-03-10T14:33:06+01:00 Translation: Debian Edu Documentation/Rosegarden manual Translated using Weblate (Chinese (Simplified)) Currently translated at 2.1% (15 of 692 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/rosegarden/zh_Hans/ - - - - - 77482a9b by Ma Yong at 2020-03-10T14:33:07+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.4% (1116 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 029198b4 by EldersJavas at 2020-03-10T14:33:08+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.4% (1116 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 7003c74f by Ma Yong at 2020-03-13T11:23:49+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.3% (818 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - b2b7df6a by Ma Yong at 2020-03-13T11:23:49+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.9% (1122 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 4 changed files: - documentation/audacity/audacity-manual.zh.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po - documentation/rosegarden/rosegarden-manual.zh.po Changes: ===================================== documentation/audacity/audacity-manual.zh.po ===================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-24 01:33+0000\n" -"Last-Translator: Ma Yong <debuser at yeah.net>\n" +"PO-Revision-Date: 2020-03-10 13:33+0000\n" +"Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/audacity/zh_Hans/>\n" "Language: zh\n" @@ -183,7 +183,6 @@ msgid "" msgstr "当你录音时最好记住不要将音量设置的过大，往往设置低一点比较合适。" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/recording.png'/></imageobject>" msgstr "" @@ -203,7 +202,6 @@ msgstr "" "音量而不会有部分声音过载的危险。" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/normalize.png'/></imageobject>" msgstr "" @@ -218,7 +216,6 @@ msgid "And after you have normalized the recorded segment, it looks like this:" msgstr "而后你有一小段合格的录音，看着像这样：" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/normalized.png'/></imageobject>" msgstr "" @@ -247,7 +244,6 @@ msgid "1. First zoom out so you more clearly can see the recording." msgstr "" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "<imageobject><imagedata fileref='./images/zoom.png'/></imageobject>" msgstr "" "<imageobject><imagedata fileref=\"./images/toolbox.png\"/></imageobject>" @@ -1076,7 +1072,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #~ msgid "HowTo translate this document" #~ msgstr "如何翻译本文档" ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-08 12:56+0000\n" +"PO-Revision-Date: 2020-03-13 10:23+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5795,6 +5795,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " +"“assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5830,7 +5832,7 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "" +msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5855,7 +5857,7 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "" +msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -5880,6 +5882,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " +"导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -8309,7 +8313,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #. type: Content of: <article><section><title> msgid "Appendix B - no Debian Edu Live CD/DVDs for Bullseye yet" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-08 12:56+0000\n" +"PO-Revision-Date: 2020-03-13 10:23+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -5944,6 +5944,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " +"“assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5979,7 +5981,7 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "" +msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5988,6 +5990,8 @@ msgid "" "automatically mounted and it is possible to access it browsing to the /media/" "$user folder. This is quite difficult for many non experienced users." msgstr "" +"当用户插入 USB 驱动器或者 DVD / CD-ROM 到瘦客户机时只显示一个通知窗口几秒钟。该媒体被自动挂载并且能够浏览 /media/$user " +"文件夹来访问它。这对于很多没有经验的用户不很困难。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5998,6 +6002,10 @@ msgid "" "enable</computeroutput> on the terminal server. (When using GNOME, device " "icons will be placed on the desktop allowing easy access)." msgstr "" +"如果 KDE “Plasma”（或者，并行安装到 KDE “Plasma” 的 LDXE）是作为桌面环境使用则能有默认的 KDE “Plasma” " +"文件管理器 Dolphin 出现。要配置这个，在终端服务器上简单地执行 <computeroutput>/usr/share/" +"debian-edu-config/ltspfs-mounter-kde enable</computeroutput>。（当使用 GNOME " +"时，设备图标会放在桌面上使之易于访问）。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -6006,6 +6014,8 @@ msgid "" "ROM / DVD or whatever media is connected to the thin client. This might come " "in handy if users want to edit files directly on their plugged in media." msgstr "" +"另外为了易于访问连到瘦客户机的 USB 驱动器，CD-ROM / DVD 或其他类似媒体将使用下面的脚本对所有用户在他们的主文件夹中创建 “media” " +"的符号链接。这可以对方便用户需要直接在插入的媒体中编辑文件起作用。" #. type: CDATA #, no-wrap @@ -6042,7 +6052,7 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "" +msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -6061,6 +6071,8 @@ msgid "" "Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this " "manual." msgstr "" +"作为使用 GOsa² 添加 <computeroutput>server</computeroutput> 类型新系统的要点在本手册的<link " +"linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">起步</link>一章中。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6068,6 +6080,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " +"导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -9283,7 +9297,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #. type: Content of: <article><section><title> msgid "Appendix B - no Debian Edu Live CD/DVDs for Buster yet" ===================================== documentation/rosegarden/rosegarden-manual.zh.po ===================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-24 01:33+0000\n" -"Last-Translator: Ma Yong <debuser at yeah.net>\n" +"PO-Revision-Date: 2020-03-10 13:33+0000\n" +"Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/rosegarden/zh_Hans/>\n" "Language: zh\n" @@ -3478,7 +3478,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #~ msgid "HowTo translate this document" #~ msgstr "如何翻译本文档" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/b6db1e3cfa18d30c1a30058b05ce9cd934df405d...b2b7df6a7122869ceecea39e9122ef9dd293ce1a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/b6db1e3cfa18d30c1a30058b05ce9cd934df405d...b2b7df6a7122869ceecea39e9122ef9dd293ce1a 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/20200314/d767e9bc/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 14 21:36:31 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sat, 14 Mar 2020 21:36:31 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 4 commits: translation update by Ma Yong and EldersJavas Message-ID: <5e6d4e6014969_6dca3fa29e004968120670@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: c950dd19 by Frans Spiesschaert at 2020-03-14T22:30:15+01:00 translation update by Ma Yong and EldersJavas Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.2% (816 of 1196 strings) - - - - - 62b56246 by Frans Spiesschaert at 2020-03-14T22:32:21+01:00 translation update by Ma Yong and EldersJavas Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.4% (1116 of 1404 strings) - - - - - 1eaf58f2 by Frans Spiesschaert at 2020-03-14T22:34:09+01:00 translation update by EldersJavas Translation: Debian Edu Documentation/Audacity manual Translated using Weblate (Chinese (Simplified)) Currently translated at 44.8% (69 of 154 strings) - - - - - 0a833d3b by Frans Spiesschaert at 2020-03-14T22:36:07+01:00 translation update by EldersJavas Translation: Debian Edu Documentation/Rosegarden manual Translated using Weblate (Chinese (Simplified)) Currently translated at 2.1% (15 of 692 strings) - - - - - 4 changed files: - documentation/audacity/audacity-manual.zh.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po - documentation/rosegarden/rosegarden-manual.zh.po Changes: ===================================== documentation/audacity/audacity-manual.zh.po ===================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-24 01:33+0000\n" -"Last-Translator: Ma Yong <debuser at yeah.net>\n" +"PO-Revision-Date: 2020-03-10 13:33+0000\n" +"Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/audacity/zh_Hans/>\n" "Language: zh\n" @@ -183,7 +183,6 @@ msgid "" msgstr "当你录音时最好记住不要将音量设置的过大，往往设置低一点比较合适。" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/recording.png'/></imageobject>" msgstr "" @@ -203,7 +202,6 @@ msgstr "" "音量而不会有部分声音过载的危险。" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/normalize.png'/></imageobject>" msgstr "" @@ -218,7 +216,6 @@ msgid "And after you have normalized the recorded segment, it looks like this:" msgstr "而后你有一小段合格的录音，看着像这样：" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "" "<imageobject><imagedata fileref='./images/normalized.png'/></imageobject>" msgstr "" @@ -247,7 +244,6 @@ msgid "1. First zoom out so you more clearly can see the recording." msgstr "" #. type: Content of: <article><section><para><inlinemediaobject> -#, fuzzy msgid "<imageobject><imagedata fileref='./images/zoom.png'/></imageobject>" msgstr "" "<imageobject><imagedata fileref=\"./images/toolbox.png\"/></imageobject>" @@ -1076,7 +1072,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #~ msgid "HowTo translate this document" #~ msgstr "如何翻译本文档" ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-08 12:56+0000\n" +"PO-Revision-Date: 2020-03-13 10:23+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5795,6 +5795,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " +"“assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5830,7 +5832,7 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "" +msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5855,7 +5857,7 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "" +msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -5880,6 +5882,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " +"导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -8309,7 +8313,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #. type: Content of: <article><section><title> msgid "Appendix B - no Debian Edu Live CD/DVDs for Bullseye yet" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-08 12:56+0000\n" +"PO-Revision-Date: 2020-03-13 10:23+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -5944,6 +5944,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " +"“assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5979,7 +5981,7 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "" +msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5988,6 +5990,8 @@ msgid "" "automatically mounted and it is possible to access it browsing to the /media/" "$user folder. This is quite difficult for many non experienced users." msgstr "" +"当用户插入 USB 驱动器或者 DVD / CD-ROM 到瘦客户机时只显示一个通知窗口几秒钟。该媒体被自动挂载并且能够浏览 /media/$user " +"文件夹来访问它。这对于很多没有经验的用户不很困难。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5998,6 +6002,10 @@ msgid "" "enable</computeroutput> on the terminal server. (When using GNOME, device " "icons will be placed on the desktop allowing easy access)." msgstr "" +"如果 KDE “Plasma”（或者，并行安装到 KDE “Plasma” 的 LDXE）是作为桌面环境使用则能有默认的 KDE “Plasma” " +"文件管理器 Dolphin 出现。要配置这个，在终端服务器上简单地执行 <computeroutput>/usr/share/" +"debian-edu-config/ltspfs-mounter-kde enable</computeroutput>。（当使用 GNOME " +"时，设备图标会放在桌面上使之易于访问）。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -6006,6 +6014,8 @@ msgid "" "ROM / DVD or whatever media is connected to the thin client. This might come " "in handy if users want to edit files directly on their plugged in media." msgstr "" +"另外为了易于访问连到瘦客户机的 USB 驱动器，CD-ROM / DVD 或其他类似媒体将使用下面的脚本对所有用户在他们的主文件夹中创建 “media” " +"的符号链接。这可以对方便用户需要直接在插入的媒体中编辑文件起作用。" #. type: CDATA #, no-wrap @@ -6042,7 +6052,7 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "" +msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -6061,6 +6071,8 @@ msgid "" "Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this " "manual." msgstr "" +"作为使用 GOsa² 添加 <computeroutput>server</computeroutput> 类型新系统的要点在本手册的<link " +"linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">起步</link>一章中。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6068,6 +6080,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " +"导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -9283,7 +9297,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #. type: Content of: <article><section><title> msgid "Appendix B - no Debian Edu Live CD/DVDs for Buster yet" ===================================== documentation/rosegarden/rosegarden-manual.zh.po ===================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-02-28 15:27+0000\n" -"PO-Revision-Date: 2020-02-24 01:33+0000\n" -"Last-Translator: Ma Yong <debuser at yeah.net>\n" +"PO-Revision-Date: 2020-03-10 13:33+0000\n" +"Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/rosegarden/zh_Hans/>\n" "Language: zh\n" @@ -3478,7 +3478,7 @@ msgstr "" #. type: Content of: <article><section><section><para> msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>" -msgstr "" +msgstr "<emphasis role=\"strong\">条款结束</emphasis>" #~ msgid "HowTo translate this document" #~ msgstr "如何翻译本文档" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/41647912b1e91fa0242555f78f9d096977b3468d...0a833d3b4b566b41883adaa3708a7e118b7eb94a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/41647912b1e91fa0242555f78f9d096977b3468d...0a833d3b4b566b41883adaa3708a7e118b7eb94a 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/20200314/9a5680b0/attachment-0001.html> From gitlab at salsa.debian.org Sat Mar 14 21:40:41 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Sat, 14 Mar 2020 21:40:41 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] add changelog entries for this weeks weblate translation updates Message-ID: <5e6d4f59b9af8_6dca2ad41c0c96241207087@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: f19838c6 by Frans Spiesschaert at 2020-03-14T22:40:31+01:00 add changelog entries for this weeks weblate translation updates - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -8,18 +8,18 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium [ Translation updates ] * Audacity manual: - Norwegian Bokmål: Allan Nordhøy - - Chinese (Simplified): Ma Yong + - Chinese (Simplified): Ma Yong and EldersJavas - Portuguese (Brazil): Wellington Terumi Uemura * Rosegarden manual: - - Chinese (Simplified): Ma Yong + - Chinese (Simplified): Ma Yong and EldersJavas * ITIL manual: - Chinese (Simplified): Ma Yong * Bullseye manual: - - Chinese (Simplified): Ma Yong + - Chinese (Simplified): Ma Yong and EldersJavas - Norwegian Bokmål: Allan Nordhøy - Dutch: Frans Spiesschaert * Buster manual: - - Chinese (Simplified): Ma Yong + - Chinese (Simplified): Ma Yong and EldersJavas - Dutch: Frans Spiesschaert - Japanese: hoxp18 View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/f19838c6dda5e715513657d4e56128305d5f19c4 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/f19838c6dda5e715513657d4e56128305d5f19c4 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/20200314/582e2d5e/attachment-0001.html> From jenkins at jenkins.debian.net Sun Mar 15 04:44:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 04:44:59 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-music/1673 Message-ID: <1323185218.111.1584247499717.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-music/1673//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-music/1673/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 04:51:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 04:51:59 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-gnome/1676 Message-ID: <1385832748.114.1584247919271.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-gnome/1676//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-gnome/1676/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 04:52:04 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 04:52:04 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-lxqt/705 Message-ID: <513049189.116.1584247924759.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxqt/705//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxqt/705/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:00:20 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:00:20 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-kde/1684 Message-ID: <930445129.118.1584248420240.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-kde/1684//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-kde/1684/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:10:35 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:10:35 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-astronomy/1679 Message-ID: <1597476970.121.1584249035786.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-astronomy/1679//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-astronomy/1679/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:11:34 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:11:34 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-chemistry/1682 Message-ID: <1381938903.123.1584249094445.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-chemistry/1682//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-chemistry/1682/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:27:40 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:27:40 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-development/1676 Message-ID: <2039616730.126.1584250060559.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-development/1676//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-development/1676/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:29:13 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:29:13 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-lxde/1680 Message-ID: <967595340.128.1584250153571.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxde/1680//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-lxde/1680/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:29:35 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:29:35 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-electronics/1675 Message-ID: <297572563.130.1584250176000.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-electronics/1675//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-electronics/1675/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:30:49 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:30:49 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-mate/1677 Message-ID: <2070652768.134.1584250249311.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-mate/1677//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-mate/1677/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:31:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:31:57 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-desktop-xfce/1683 Message-ID: <1532141560.136.1584250317320.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-xfce/1683//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-desktop-xfce/1683/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:32:50 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:32:50 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-geography/1674 Message-ID: <468890030.138.1584250370175.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-geography/1674//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-geography/1674/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:33:34 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:33:34 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-graphics/1674 Message-ID: <2031636430.140.1584250414067.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-graphics/1674//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-graphics/1674/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:34:49 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:34:49 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-language/245 Message-ID: <460264215.142.1584250489715.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-language/245//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-language/245/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:36:18 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:36:18 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-logic-games/1673 Message-ID: <568741127.144.1584250578734.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-logic-games/1673//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-logic-games/1673/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:41:32 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:41:32 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-misc/1674 Message-ID: <843773437.146.1584250892233.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-misc/1674//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-misc/1674/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:41:50 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:41:50 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-mathematics/1678 Message-ID: <1462290891.148.1584250910673.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-mathematics/1678//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-mathematics/1678/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:42:41 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:42:41 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-ltsp-server/926 Message-ID: <117600017.150.1584250961251.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-ltsp-server/926//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-ltsp-server/926/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:46:49 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:46:49 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-physics/1675 Message-ID: <470148334.152.1584251210116.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-physics/1675//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-physics/1675/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:48:12 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:48:12 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-primaryschool/697 Message-ID: <2140829404.154.1584251292899.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-primaryschool/697//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-primaryschool/697/ for more information. From jenkins at jenkins.debian.net Sun Mar 15 05:59:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Sun, 15 Mar 2020 05:59:59 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_sid_install_education-workstation/1683 Message-ID: <1362799885.156.1584252000077.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_sid_install_education-workstation/1683//console or just https://jenkins.debian.net/job/chroot-installation_sid_install_education-workstation/1683/ for more information. From gitlab at salsa.debian.org Sun Mar 15 22:40:31 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Sun, 15 Mar 2020 22:40:31 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Rework PXE installation setup to be compliant with re-written LTSP. Message-ID: <5e6eaedf849d3_6dca2ad41f85dea0130414b@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: 168da215 by Wolfgang Schweer at 2020-03-15T23:34:08+01:00 Rework PXE installation setup to be compliant with re-written LTSP. These changes have the additional benefit to provide network booting for both BIOS and UEFI based systems due to the change to iPXE. - ldap-bootstrap/gosa-server.ldif: + Add DHCP options to provide an iPXE related config space. + Add system architecture related DHCP option. + Add DHCP statement to be able to conditionally hand out the correct boot file. This also makes sure that both PXE and iPXE capable systems are supported via chainloading iPXE. - sbin/debian-edu-pxeinstall: + Switch to iPXE to provide the installation menu. + Modify the existing iPXE menu in case of a combined server, i.e. main server and LTSP server. + Generate an iPXE menue in case of a plain main server. + Cleanup from outdated and obsolete comments and code. + Whitespace fixes. - etc/debian-edu/pxeinstall.conf: + Use the graphical installer by default. + Adjust entries and comments to reflect the changes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 4 changed files: - debian/changelog - etc/debian-edu/pxeinstall.conf - ldap-bootstrap/gosa-server.ldif - sbin/debian-edu-pxeinstall Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,27 @@ +debian-edu-config (2.11.17) UNRELEASED; urgency=medium + + * Rework PXE installation setup to be compliant with re-written LTSP. These + changes have the additional benefit to provide network booting for both + BIOS and UEFI based systems due to the change to iPXE. + - ldap-bootstrap/gosa-server.ldif: + + Add DHCP options to provide an iPXE related config space. + + Add system architecture related DHCP option. + + Add DHCP statement to be able to conditionally hand out the correct boot + file. This also makes sure that both PXE and iPXE capable systems are + supported via chainloading iPXE. + - sbin/debian-edu-pxeinstall: + + Switch to iPXE to provide the installation menu. + + Modify the existing iPXE menu in case of a combined server, i.e. main + server and LTSP server. + + Generate an iPXE menue in case of a plain main server. + + Cleanup from outdated and obsolete comments and code. + + Whitespace fixes. + - etc/debian-edu/pxeinstall.conf: + + Use the graphical installer by default. + + Adjust entries and comments to reflect the changes. + + -- Wolfgang Schweer <wschweer at arcor.de> Sat, 14 Mar 2020 23:08:36 +0100 + debian-edu-config (2.11.16) unstable; urgency=medium [ Wolfgang Schweer ] ===================================== etc/debian-edu/pxeinstall.conf ===================================== @@ -1,26 +1,15 @@ -# Examples for local settings. Run 'debian-edu-pxeinstall' to regenerate -# the PXE menu for any changes to take effect. - -# Default LTSP chroot arch is like the server arch. -# If set differently, an appropriate LTSP chroot and changes in LDAP are -# needed; see the manual for details. -#ltsparch=i386 - -# Set if NFS instead of default NBD is to be used for LTSP (10.0.0.0/8 network); -# see the manual for details. -#rootdev=nfs +# Examples for local settings. Run 'debian-edu-pxeinstall' to re-generate the netboot +# environment and the iPXE menu each time any changes have been made.. # Set a different desktop environment for new installations instead of the default xfce one. #mydesktop=mate -# Set if the Debian Installer should be run in graphical instead of text mode. -#graphicdi=true +# Comment the next entry if the Debian Installer should be run in text mode. +graphicdi=true # If e.g. 'apt-cacher-ng' is running on the gateway and should be used for installation. #http_proxy=http://10.0.0.1:3142 #ftp_proxy=http://10.0.0.1:3142 # Set this during development to test if daily d-i netboot.tar.gz is working. -# Run 'rm -rf /var/lib/tftpboot/debian-installer' followed by 'debian-edu-pxeinstall' after -# setting it, and remember to run both commands also once this is commented again. #dailydi=true ===================================== ldap-bootstrap/gosa-server.ldif ===================================== @@ -20,12 +20,17 @@ ipHostNumber: 10.0.2.2 gotoMode: locked dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no -dhcpOption: smtp-server code 69 = array of ip-address -dhcpOption: wpad-url code 252 = text dhcpStatements: authoritative dhcpStatements: ddns-update-style none dhcpStatements: max-lease-time 3600 dhcpStatements: default-lease-time 1800 +dhcpOption: smtp-server code 69 = array of ip-address +dhcpOption: wpad-url code 252 = text +dhcpOption: space ipxe +dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe +dhcpOption: ipxe.menu code 39 = unsigned integer 8 +dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8 +dhcpOption: arch code 93 = unsigned integer 16 cn: dhcp objectClass: top objectClass: dhcpService @@ -228,11 +233,11 @@ dhcpOption: domain-name-servers 10.0.2.2 dhcpStatements: default-lease-time 1800 dhcpStatements: max-lease-time 3600 dhcpStatements: next-server tjener -dhcpStatements: filename "/var/lib/tftpboot/pxelinux.0" dhcpStatements: authoritative dhcpStatements: allow unknown-clients dhcpStatements: allow bootp dhcpStatements: allow booting +dhcpStatements: if exists ipxe.menu { filename "ltsp/ltsp.ipxe"; } elsif option arch = 00:00 { filename "ltsp/undionly.kpxe"; } elsif option arch = 00:07 { filename "ltsp/snponly.efi"; } elsif option arch = 00:09 { filename "ltsp/snponly.efi"; } else { filename "ltsp/unmatched-client"; } cn: intern objectClass: top objectClass: dhcpSharedNetwork ===================================== sbin/debian-edu-pxeinstall ===================================== @@ -4,9 +4,6 @@ # # A better idea might be to use di-netboot-assistant, # <URL:http://www.klabs.be/~fpiat/linux/debian/di-netboot-assistant/>. -# See also the original bin/debian-edu-pxelinux.cfg -# (bin/debian-edu-pxelinux.cfg has been removed from the -# debian-edu-config source after 1.443~svn66662) set -e @@ -18,23 +15,23 @@ export LC_ALL ## Try to find the DNS from the leases file, if that fails use ## default DNS: if [ ! -s /etc/resolv.conf ] ; then - DNS="10.0.2.2" - LEASEDIR=/var/lib/dhcp/ - if [ -d $LEASEDIR ] ; then - LEASEFILE=$LEASEDIR`ls -tr -1 $LEASEDIR | tail -n 1` - if [ -r $LEASEFILE ] ; then - if DNSLEASE=`cat $LEASEFILE | grep domain-name-servers | \ - tail -n 1 | \ - grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+"` ; then - DNS=$DNSLEASE - echo "info: Found leases file and domain-name-server: $DNS." - else - echo "info: Could not extract DNS from leases file." - fi + DNS="10.0.2.2" + LEASEDIR=/var/lib/dhcp/ + if [ -d $LEASEDIR ] ; then + LEASEFILE=$LEASEDIR`ls -tr -1 $LEASEDIR | tail -n 1` + if [ -r $LEASEFILE ] ; then + if DNSLEASE=`cat $LEASEFILE | grep domain-name-servers | \ + tail -n 1 | \ + grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+"` ; then + DNS=$DNSLEASE + echo "info: Found leases file and domain-name-server: $DNS." + else + echo "info: Could not extract DNS from leases file." + fi + fi fi - fi - echo "info: Create temporary /etc/resolv.conf with DNS: $DNS." - cat >> /etc/resolv.conf <<EOF + echo "info: Create temporary /etc/resolv.conf with DNS: $DNS." + cat >> /etc/resolv.conf <<EOF ## This is a temporary resolv.conf created by $0. ## If you find it after installation, something went wrong. Try to replace it ## by a symlink: /etc/resolv.conf -> /etc/resolvconf/run/resolv.conf, i.e.: @@ -42,7 +39,7 @@ if [ ! -s /etc/resolv.conf ] ; then nameserver $DNS search intern EOF -fi + fi # Make sure the created directories and files are readable by tfptd # run as user nobody. @@ -50,31 +47,29 @@ umask 022 # Fetch ftp_proxy and http_proxy if set globally if [ -f /etc/environment ] ; then - . /etc/environment + . /etc/environment fi [ "$dist" ] || dist=$(lsb_release -sc) [ "$archs" ] || archs="amd64 i386" -[ "$ltsparch" ] || ltsparch=$(dpkg --print-architecture) [ "$mirrorurl" ] || mirrorurl=http://deb.debian.org/debian [ "$hostname" ] || hostname=pxeinstall [ "$domain" ] || domain=intern [ "$mydesktop" ] || mydesktop=xfce [ "$graphicdi" ] || graphicdi=false [ "$dailydi" ] || dailydi=false -[ "$rootdev" ] || rootdev=nbd0 # Not hardcoded to allow PXE installation of a main-server without a # proxy set #[ "$http_proxy" ] || http_proxy=http://webcache:3128 #[ "$ftp_proxy" ] || ftp_proxy=http://webcache:3128 if [ -f /etc/debian-edu/config ] ; then - . /etc/debian-edu/config + . /etc/debian-edu/config fi # Allow site specific overrides to the variables if [ -f /etc/debian-edu/pxeinstall.conf ] ; then - . /etc/debian-edu/pxeinstall.conf + . /etc/debian-edu/pxeinstall.conf fi # This part does not work from within debian-installer, as it is @@ -84,30 +79,30 @@ fi # debian-edu-install, copying the files a bit earlier. installconfig="" for template in debian-installer/locale \ - keyboard-configuration/xkb-keymap \ - tasksel/desktop; do - value="$(debconf-get-selections --installer | grep $template | awk '{print $4}')" - if [ -z "$value" ] ; then - # If there is no value in the installer debconf database, set the default one. - # Useful if modular main server installation has been used (no desktop). - value="$mydesktop" - fi - - # Using desktop= as kernel argument work, while tasksel/desktop= - # do not. No idea why, but lets use the one that work. - if [ "tasksel/desktop" = $template ] ; then template=desktop ; desktop=$value; fi - - # Map the long name to the short alias, to keep the argument list - # shorter. - if [ "debian-installer/locale" = $template ] ; then template=locale; fi - if [ "keyboard-configuration/xkb-keymap" = $template ] ; then template=keymap; fi - - if [ "$value" ] ; then + keyboard-configuration/xkb-keymap \ + tasksel/desktop; do + value="$(debconf-get-selections --installer | grep $template | awk '{print $4}')" + if [ -z "$value" ] ; then + # If there is no value in the installer debconf database, set the default one. + # Useful if modular main server installation has been used (no desktop). + value="$mydesktop" + fi + + # Using desktop= as kernel argument work, while tasksel/desktop= + # do not. No idea why, but lets use the one that work. + if [ "tasksel/desktop" = $template ] ; then template=desktop ; desktop=$value; fi + + # Map the long name to the short alias, to keep the argument list + # shorter. + if [ "debian-installer/locale" = $template ] ; then template=locale; fi + if [ "keyboard-configuration/xkb-keymap" = $template ] ; then template=keymap; fi + + if [ "$value" ] ; then installconfig="$installconfig $template=$value" - fi + fi done -tftpdir=/var/lib/tftpboot +tftpdir=/srv/tftp # Where to find the preseed file on the web preseedurl=http://www/debian-edu-install.dat @@ -115,76 +110,88 @@ preseedurl=http://www/debian-edu-install.dat # Where the preseed file is on the disk. preseedfile=/etc/debian-edu/www/debian-edu-install.dat -# Start from a clean state if run after LTSP chroot arch changes. -if [ -d $tftpdir/debian-edu ] ; then - rm -rf $tftpdir/debian-edu +# Start from a clean state after any configuration changes have been made. +if [ -d $tftpdir/ltsp ] ; then + rm -rf $tftpdir/debian-edu + rm -rf $tftpdir/debian-installer + rm -f $tftpdir/ltsp/ltsp.ipxe + # re-generate clean ipxe menu file in case of LTSP client support. + if [ -d /srv/ltsp/images ] ; then + ltsp ipxe + # adjust ipxe menue for Debian Edu use. + sed -i 's#ltsp/ltsp.img#ltsp/${img}/ltsp.img#' /srv/tftp/ltsp/ltsp.ipxe + fi fi [ -d $tftpdir ] || mkdir $tftpdir [ -d $tftpdir/debian-edu ] || mkdir $tftpdir/debian-edu for arch in $archs ; do - ( - if [ true = "$dailydi" ] ; then - diurl=https://d-i.debian.org/daily-images/$arch/daily/netboot - else - diurl=$mirrorurl/dists/$dist/main/installer-$arch/current/images/netboot - fi - [ -d $tftpdir/debian-installer ] || \ - mkdir $tftpdir/debian-installer - cd $tftpdir/debian-installer - di_ver=10 - tarball="" - if [ -d /usr/lib/debian-installer/images/$di_ver/$arch ]; then - di_img_dir="/usr/lib/debian-installer/images/$di_ver/$arch" - # Use the debian/installer netboot debs - tarball="" - if [ true = "$graphicdi" ]; then - ln -sf $di_img_dir/gtk/debian-installer/$arch $arch - else - ln -sf $di_img_dir/text/debian-installer/$arch $arch - fi - elif [ ! -f netboot-$arch.tar.gz ] ; then - if [ true = "$graphicdi" ]; then - # Use this URL for graphical installer, and fix - # gtkvideo setting below - url=$diurl/gtk/netboot.tar.gz - else - url=$diurl/netboot.tar.gz - fi - echo "Fetching $url" - if wget -q -O netboot-$arch.tar.gz.new $url ; then - mv netboot-$arch.tar.gz.new netboot-$arch.tar.gz - tarball=netboot-$arch.tar.gz - else - echo "error: Unable to download $url" - exit 1 - fi - fi - if [ "$tarball" ] ; then - tar --strip-components=2 -zxvf $tarball - fi - if [ true = "$graphicdi" ]; then - # Replace Debian installer logo with Debian Edu one. - TMP=$(mktemp -d) - mkdir $TMP/$arch - cd $TMP/$arch - mkdir new - cd new - unmkinitramfs /var/lib/tftpboot/debian-installer/$arch/initrd.gz . - cp /usr/share/pixmaps/debian-edu-$dist-installer-logo.png usr/share/graphics/logo_debian.png - find . | cpio -H newc -o > ../initrd - cd .. - gzip initrd - cp initrd.gz /var/lib/tftpboot/debian-installer/$arch - rm -rf $TMP/$arch - fi - ) + ( + if [ true = "$dailydi" ] ; then + diurl=https://d-i.debian.org/daily-images/$arch/daily/netboot + else + diurl=$mirrorurl/dists/$dist/main/installer-$arch/current/images/netboot + fi + [ -d $tftpdir/debian-installer ] || \ + mkdir $tftpdir/debian-installer + cd $tftpdir/debian-installer + di_ver=11 + tarball="" + if [ -d /usr/lib/debian-installer/images/$di_ver/$arch ]; then + di_img_dir="/usr/lib/debian-installer/images/$di_ver/$arch" + # Use the debian/installer netboot debs + tarball="" + if [ true = "$graphicdi" ]; then + ln -sf $di_img_dir/gtk/debian-installer/$arch $arch + else + ln -sf $di_img_dir/text/debian-installer/$arch $arch + fi + elif [ ! -f netboot-$arch.tar.gz ] ; then + if [ true = "$graphicdi" ]; then + # Use this URL for graphical installer, and fix + # gtkvideo setting below + url=$diurl/gtk/netboot.tar.gz + else + url=$diurl/netboot.tar.gz + fi + echo "Fetching $url" + if wget -q -O netboot-$arch.tar.gz.new $url ; then + mv netboot-$arch.tar.gz.new netboot-$arch.tar.gz + tarball=netboot-$arch.tar.gz + else + echo "error: Unable to download $url" + exit 1 + fi + fi + if [ "$tarball" ] ; then + tar --strip-components=2 -zxvf $tarball + fi + if [ true = "$graphicdi" ]; then + # Replace Debian installer logo with Debian Edu one. + TMP=$(mktemp -d) + mkdir $TMP/$arch + cd $TMP/$arch + mkdir new + cd new + unmkinitramfs $tftpdir/debian-installer/$arch/initrd.gz . + if grep -q sid /etc/debian_version ; then + cp /usr/share/pixmaps/debian-edu-buster-installer-logo.png usr/share/graphics/logo_debian.png + else + cp /usr/share/pixmaps/debian-edu-$dist-installer-logo.png usr/share/graphics/logo_debian.png + fi + find . | cpio -H newc -o > ../initrd + cd .. + gzip initrd + cp initrd.gz $tftpdir/debian-installer/$arch + rm -rf $TMP + fi + ) done echo "Generating $preseedfile" ( - cat <<EOF + cat <<EOF # Enable the Debian Edu installer overrides d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Debian-Edu debian-installer profile @@ -199,7 +206,7 @@ d-i mirror/http/proxy string $http_proxy d-i mirror/ftp/proxy string $ftp_proxy # list extra packages to install here -#d-i pkgsel/include string acroread +#d-i pkgsel/include string <pkg_name> # if you want popcon enabled by default #d-i debian-edu-install/participate-popcon boolean true @@ -213,10 +220,6 @@ d-i mirror/ftp/proxy string $ftp_proxy # If you want to avoid the password question #d-i passwd/root-password-crypted password passwordhash -# Tell LTSP to not use the CDROM, but a HTTP mirror -d-i ltsp-client-builder/use_cdrom boolean false -d-i ltsp-client-builder/build-client-opts string --mirror $mirrorurl --dist $dist - # Tell PXE clients to fetch the correct time from the central NTP server # d-i is unable to discover the ntp-server DHCP option. Hardcode # setting here instead. FIXME: Remove when #714288 in netcfg is fixed. @@ -224,12 +227,12 @@ d-i netcfg/dhcp_ntp_servers string ntp # Pass on the time zone used on the main-server EOF - debconf-get-selections --installer | grep -w 'time/zone' + debconf-get-selections --installer | grep -w 'time/zone' - # No use copying the installation mirror setting if a DVD or USB - # stick was used. - if grep -qi 'dvd|bd' /etc/apt/sources.list ; then -cat <<EOF + # No use copying the installation mirror setting if a DVD or USB + # stick was used. + if grep -qi 'dvd|bd' /etc/apt/sources.list ; then + cat <<EOF # Avoid questions about mirrors, using manual setup choose-mirror-bin mirror/country string manual @@ -238,143 +241,124 @@ choose-mirror-bin mirror/http/mirror select choose-mirror-bin mirror/http/hostname string deb.debian.org choose-mirror-bin mirror/http/directory string /debian EOF - else + else debconf-get-selections --installer | egrep -w 'mirror/http/mirror|mirror/country|mirror/protocol|mirror/http/hostname|mirror/http/directory|mirror/ftp/hostname|mirror/ftp/directory' | sort - fi + fi - # Make it easier to have local overrides and still be able to - # rerun debian-edu-pxeinstall. - if [ -f $preseedfile.local ] ; then - cat $preseedfile.local - fi + # Make it easier to have local overrides and still be able to + # rerun debian-edu-pxeinstall. + if [ -f $preseedfile.local ] ; then + cat $preseedfile.local + fi ) > $preseedfile -if [ "$passwdmd5hash" ]; then - cat <<EOF > $tftpdir/debian-edu/menupasswd.cfg - MENU PASSWD $passwdmd5hash -EOF -fi - menufile=$tftpdir/debian-edu/install.cfg echo "Generating $menufile" ( - if [ true = "$graphicdi" ]; then - gtkvideo="vga=788" - fi - for arch in $archs ; do - cat <<EOF - # Based on the values used in Debian, and added the preseed URL -LABEL neteduboot-$arch - MENU LABEL Install Edu/^$arch ($desktop) - kernel debian-installer/$arch/linux - append $gtkvideo initrd=debian-installer/$arch/initrd.gz auto url=$preseedurl hostname=$hostname domain=$domain $installconfig --- quiet - ipappend 2 -include menupassword.cfg - + if [ true = "$graphicdi" ]; then + gtkvideo="vga=788" + fi + for arch in $archs ; do + cat <<EOF + +# Based upon locale, keymap and desktop values used during main-server installation; auto URL added. +:$arch +set params auto url=http://www/debian-edu-install.dat hostname=$hostname domain=$domain $installconfig $gtkvideo --- quiet ipappend 2 +kernel /debian-installer/$arch/linux initrd=initrd.gz \${params} +initrd /debian-installer/$arch/initrd.gz +boot || goto failed EOF - done + done ) > $menufile -memtest= -if [ -f /boot/memtest86.bin ] ; then - memtest=/boot/memtest86.bin -fi -if [ -f /boot/memtest86+.bin ] ; then - memtest=/boot/memtest86+.bin -fi -if [ "$memtest" ] ; then - cp $memtest $tftpdir/debian-edu/memtest86 - cat <<EOF > $tftpdir/debian-edu/memtest.cfg -LABEL memtest86 - MENU LABEL Test ^memory - kernel debian-edu/memtest86 - -EOF +if grep -q sid /etc/debian_version ; then + cp /usr/share/pixmaps/debian-edu-buster-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png +else + cp /usr/share/pixmaps/debian-edu-$dist-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png fi -if [ -d /var/lib/tftpboot/ltsp/$ltsparch ] ; then - ltsproot=/opt/ltsp/$ltsparch - - cat <<EOF > $tftpdir/debian-edu/ltsp-thin.cfg - -LABEL ltsp-thin - MENU LABEL LTSP ^thin client - KERNEL ltsp/$ltsparch/vmlinuz - APPEND initrd=ltsp/$ltsparch/initrd.img init=/sbin/init-ltsp root=/dev/$rootdev ro LTSP_FATCLIENT=False quiet - IPAPPEND 2 -EOF - cat > $tftpdir/debian-edu/default-thin.cfg <<EOF -DEFAULT ltsp/$ltsparch/vmlinuz initrd=ltsp/$ltsparch/initrd.img init=/sbin/init-ltsp root=/dev/$rootdev ro LTSP_FATCLIENT=False quiet ipappend 2 - -EOF - -# See if LTSP also have diskless workstation support - if [ -e $ltsproot/lib/x86_64-linux-gnu/security/pam_krb5.so -a "amd64" = $ltsparch ] || \ - [ -e $ltsproot/lib/x86_64-linux-gnu/security/pam_ldap.so -a "amd64" = $ltsparch ] || \ - [ -e $ltsproot/lib/x86_64-linux-gnu/security/pam_sss.so -a "amd64" = $ltsparch ] || \ - [ -e $ltsproot/lib/i386-linux-gnu/security/pam_krb5.so -a "i386" = $ltsparch ] || \ - [ -e $ltsproot/lib/i386-linux-gnu/security/pam_ldap.so -a "i386" = $ltsparch ] || \ - [ -e $ltsproot/lib/i386-linux-gnu/security/pam_sss.so -a "i386" = $ltsparch ] ; then - cat <<EOF > $tftpdir/debian-edu/ltsp-diskless.cfg - -LABEL ltsp-diskless - MENU LABEL LTSP ^diskless workstation - KERNEL ltsp/$ltsparch/vmlinuz - APPEND initrd=ltsp/$ltsparch/initrd.img init=/sbin/init-ltsp root=/dev/$rootdev ro quiet - IPAPPEND 2 - -EOF - cat > $tftpdir/debian-edu/default-diskless.cfg <<EOF -DEFAULT ltsp/$ltsparch/vmlinuz initrd=ltsp/$ltsparch/initrd.img init=/sbin/init-ltsp root=/dev/$rootdev ro quiet ipappend 2 +# Generate/modify the iPXE menu file +if [ -f $tftpdir/ltsp/ltsp.ipxe ] ; then + # ltsp is installed already, modify existing ipxe menu + if ! grep -q main-server $tftpdir/ltsp/ltsp.ipxe ; then + echo "Modifying $tftpdir/ltsp/ltsp.ipxe" + sed -i '/^menu.*/ a item\ +item --gap Installation:\ +item --key a amd64 Install Debian Edu/amd64 (64-Bit)\ +item --key i i386 Install Debian Edu/i386 (32-Bit)\ +item\ +' /srv/tftp/ltsp/ltsp.ipxe + cat $menufile >> $tftpdir/ltsp/ltsp.ipxe + fi +else + # generate ipxe menu on a plain main server for PXE installations + mkdir -p $tftpdir/ltsp/ + cp /usr/lib/ipxe/undionly.kpxe $tftpdir/ltsp/ + cp /usr/lib/ipxe/snponly.efi $tftpdir/ltsp/ + cp /boot/memtest86+.bin $tftpdir/ltsp/ + echo "Generating $tftpdir/ltsp/ltsp.ipxe" + cat <<EOF > /srv/tftp/ltsp/ltsp.ipxe +#!ipxe +# +# Configure iPXE for network installations + +# Set the default image (img) based on arch, or to root-path if it's not empty +cpuid --ext 29 && set img amd64 || set img i386 + +goto start + +:start +# To completely hide the menu, set menu-timeout to -1 +isset \${menu-timeout} || set menu-timeout 5000 +iseq "\${menu-timeout}" "-1" && goto \${img} || +menu Debian Edu iPXE boot menu || goto \${img} +item +item --gap Debian Edu installation: +item --key a amd64 Install Debian Edu/amd64 (64-Bit) +item --key i i386 Install Debian Edu/i386 (32-Bit) +item +item --gap Other options: +item --key m memtest Memory test +item --key c config Enter iPXE configuration +item --key s shell Drop to iPXE shell +item --key d disk Boot from the first local disk +item +item --key x exit Exit iPXE and continue BIOS boot +choose --timeout \${menu-timeout} --default \${img} img || goto cancel +goto \${img} + +:memtest +iseq \${platform} pcbios && kernel memtest86+.bin || kernel memtest.efi +# Boot "fails" on normal memtest exit with Esc, so show the menu again +boot || +goto start + +:config +config +goto start + +:shell +echo Type 'exit' to get the back to the menu +shell +goto start + +:disk +# Boot the first local HDD +sanboot --no-describe --drive 0x80 || goto failed + +:exit +exit 1 + +:cancel +echo You cancelled the menu, dropping to a shell +goto shell + +:failed +echo Booting failed, dropping to a shell +goto shell EOF - fi + if ! grep -q main-server $tftpdir/ltsp/ltsp.ipxe ; then + cat $menufile >> $tftpdir/ltsp/ltsp.ipxe + fi fi -cat <<EOF > $tftpdir/debian-edu/localboot.cfg -LABEL localboot - MENU LABEL Boot from ^local harddrive - MENU DEFAULT - localboot 0 - -EOF - -ln -sf /usr/lib/PXELINUX/pxelinux.0 $tftpdir/pxelinux.0 -ln -sf /usr/lib/syslinux/modules/bios $tftpdir/syslinux -ln -sf /usr/share/pixmaps/debian-edu-$dist-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png - -defaultfile=$tftpdir/debian-edu/default-menu.cfg -echo "Generating $defaultfile" -( - cat <<EOF -include debian-edu/localboot.cfg -MENU SEPARATOR -include debian-edu/ltsp-diskless.cfg -include debian-edu/ltsp-thin.cfg -MENU SEPARATOR -include debian-edu/install.cfg -MENU SEPARATOR -include debian-edu/memtest.cfg - -menu color title * #FFFFFFFF * -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * -menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none - -menu vshift 4 -menu rows 10 -menu hshift 13 -menu width 49 -menu background debian-edu/debian-edu-pxe.png -menu tabmsg Press ENTER to boot or TAB to edit a menu entry -default vesamenu.c32 -prompt 0 -timeout 0 -EOF -) > $defaultfile - -# Use the complete menu by default -pxecfgdir=$tftpdir/pxelinux.cfg -[ -d $pxecfgdir ] || mkdir $pxecfgdir -ln -sf ../debian-edu/default-menu.cfg $pxecfgdir/default View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/168da2151903d78ef80cb0703c4633d7fe034158 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/168da2151903d78ef80cb0703c4633d7fe034158 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/20200315/27928a41/attachment-0001.html> From gitlab at salsa.debian.org Sun Mar 15 22:40:41 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Sun, 15 Mar 2020 22:40:41 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] preseed-values/defaults.main-server: Drop tftpd-hpa preseeding Message-ID: <5e6eaee9d1ca8_6dca2ad41714fbd4130448@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install Commits: 92735a4e by Wolfgang Schweer at 2020-03-15T23:35:54+01:00 preseed-values/defaults.main-server: Drop tftpd-hpa preseeding now that iPXE is used for PXE installations. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2 changed files: - debian/changelog - preseed-values/defaults.main-server Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,13 @@ debian-edu-install (2.11.6) UNRELEASED; urgency=medium + [ Holger Levsen ] * Change package description: Set d-i values to install Debian Edu *with* *less* questions (not without). + [ Wolfgang Schweer ] + * preseed-values/defaults.main-server: Drop tftpd-hpa preseeding now that + iPXE is used for PXE installations. + -- Holger Levsen <holger at debian.org> Sat, 14 Mar 2020 19:12:12 +0100 debian-edu-install (2.11.5) unstable; urgency=medium ===================================== preseed-values/defaults.main-server ===================================== @@ -45,9 +45,6 @@ sitesummary-client sitesummary-client/hostclass string main-server #Configure bind9 options debian-edu. bind9 bind9/default-start-options string -4 -u bind -# Unset '--secure' option so that both LTSP and PXE can be served. -tftpd-hpa tftpd-hpa/options string - # Ask for info on initial user before it is created in LDAP user-setup-udeb passwd/make-user boolean true View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/92735a4e907b02c17e4c2ecbe419b074be95145f -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/92735a4e907b02c17e4c2ecbe419b074be95145f 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/20200315/117c2bf9/attachment.html> From gitlab at salsa.debian.org Sun Mar 15 22:40:59 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Sun, 15 Mar 2020 22:40:59 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] tasks/main-server: Recommend ipxe (required for the PXE installation environment) Message-ID: <5e6eaefba9679_6dca2ad41714fbd413047a3@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu Commits: 39f3d64d by Wolfgang Schweer at 2020-03-15T23:38:51+01:00 tasks/main-server: Recommend ipxe (required for the PXE installation environment) Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2 changed files: - debian/changelog - tasks/main-server Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +debian-edu (2.11.14) UNRELEASED; urgency=medium + + * tasks/main-server: + Recommend ipxe (required for the PXE installation environment). + + -- Wolfgang Schweer <wschweer at arcor.de> Sun, 15 Mar 2020 19:44:15 +0100 + debian-edu (2.11.13) unstable; urgency=medium * d/rules: add workaround to fix (unreported) issue in blends-dev. ===================================== tasks/main-server ===================================== @@ -36,6 +36,7 @@ Recommends: debian-installer-11-netboot-i386, debian-installer-11-netboot-amd64, tftpd-hpa, + ipxe, NeedConfig: yes - set local IP range, DNS name and default routing Recommends: View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/39f3d64df510691ba3735f3c079266d8b2c03776 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/39f3d64df510691ba3735f3c079266d8b2c03776 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/20200315/b747dce0/attachment-0001.html> From gitlab at salsa.debian.org Mon Mar 16 10:03:14 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Mon, 16 Mar 2020 10:03:14 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] No longer recommend pxelinux and syslinux-common. Message-ID: <5e6f4ee236f8e_6dca2ad41714fbd41336489@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu Commits: b0604883 by Wolfgang Schweer at 2020-03-16T11:00:55+01:00 No longer recommend pxelinux and syslinux-common. debian/control: Update after running 'make dist'. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 3 changed files: - debian/changelog - debian/control - tasks/main-server Changes: ===================================== debian/changelog ===================================== @@ -1,7 +1,9 @@ debian-edu (2.11.14) UNRELEASED; urgency=medium * tasks/main-server: - Recommend ipxe (required for the PXE installation environment). + Recommend ipxe (required for the PXE installation environment), no longer + recommend pxelinux and syslinux-common. + * debian/control: Update after running 'make dist'. -- Wolfgang Schweer <wschweer at arcor.de> Sun, 15 Mar 2020 19:44:15 +0100 ===================================== debian/control ===================================== @@ -542,12 +542,12 @@ Recommends: dia, education-menus, gimp, inkscape, + librecad, pencil2d, scribus, xpaint Suggests: blender, hugin, - librecad, pinta, tgif, xaos, @@ -705,6 +705,7 @@ Recommends: apache2, icinga2, icingaweb2, iptables, + ipxe, isc-dhcp-server-ldap, krb5-admin-server, krb5-kdc, @@ -722,7 +723,6 @@ Recommends: apache2, nagios-nrpe-plugin, nfs-kernel-server, ntp, - pxelinux, samba, samba-common-bin, sitesummary, @@ -731,7 +731,6 @@ Recommends: apache2, slbackup-php, smbclient, squid, - syslinux-common, task-print-service, tdb-tools, tftpd-hpa @@ -822,6 +821,7 @@ Depends: ${misc:Depends}, education-tasks (= ${binary:Version}) Recommends: audacious, audacity, + denemo, education-menus, fluidsynth, freebirth, @@ -838,8 +838,7 @@ Recommends: audacious, terminatorx, timgm6mb-soundfont, tuxguitar -Suggests: denemo, - festival, +Suggests: festival, hydrogen, lilypond, musescore ===================================== tasks/main-server ===================================== @@ -31,8 +31,6 @@ NeedConfig: yes - touch the corresponding bind zone file Recommends: isc-dhcp-server-ldap, - pxelinux, - syslinux-common, debian-installer-11-netboot-i386, debian-installer-11-netboot-amd64, tftpd-hpa, View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/b060488349d593ce60637d5c59add7d09f6e2772 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/b060488349d593ce60637d5c59add7d09f6e2772 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/20200316/26a12e8b/attachment-0001.html> From jenkins at jenkins.debian.net Mon Mar 16 12:16:54 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:16:54 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-music_upgrade_to_sid/83 In-Reply-To: <1220535651.24.1584106070176.JavaMail.jenkins@jenkins> References: <1220535651.24.1584106070176.JavaMail.jenkins@jenkins> Message-ID: <1295503830.211.1584361014870.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-music_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-music_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:25:13 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:25:13 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/83 In-Reply-To: <250011305.49.1584109815450.JavaMail.jenkins@jenkins> References: <250011305.49.1584109815450.JavaMail.jenkins@jenkins> Message-ID: <156498793.213.1584361513794.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-primaryschool_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:37:12 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:37:12 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/83 In-Reply-To: <1081495587.18.1584105004305.JavaMail.jenkins@jenkins> References: <1081495587.18.1584105004305.JavaMail.jenkins@jenkins> Message-ID: <688480812.215.1584362232603.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-astronomy_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:37:24 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:37:24 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/83 In-Reply-To: <835162647.35.1584109175427.JavaMail.jenkins@jenkins> References: <835162647.35.1584109175427.JavaMail.jenkins@jenkins> Message-ID: <7508171.217.1584362244459.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxqt_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:42:51 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:42:51 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/83 In-Reply-To: <1915468939.14.1584104162573.JavaMail.jenkins@jenkins> References: <1915468939.14.1584104162573.JavaMail.jenkins@jenkins> Message-ID: <1629018733.219.1584362572042.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-chemistry_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 12:52:59 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 12:52:59 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/83 In-Reply-To: <1853598282.37.1584109199529.JavaMail.jenkins@jenkins> References: <1853598282.37.1584109199529.JavaMail.jenkins@jenkins> Message-ID: <1478947170.221.1584363179758.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-kde_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:03:25 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:03:25 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/83 In-Reply-To: <2107031567.16.1584104920257.JavaMail.jenkins@jenkins> References: <2107031567.16.1584104920257.JavaMail.jenkins@jenkins> Message-ID: <1561580237.223.1584363805930.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-gnome_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:05:41 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:05:41 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/83 In-Reply-To: <561273013.29.1584107499420.JavaMail.jenkins@jenkins> References: <561273013.29.1584107499420.JavaMail.jenkins@jenkins> Message-ID: <1049124101.226.1584363941581.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-lxde_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:06:17 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:06:17 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/83 In-Reply-To: <203427940.39.1584109257866.JavaMail.jenkins@jenkins> References: <203427940.39.1584109257866.JavaMail.jenkins@jenkins> Message-ID: <356169829.228.1584363977748.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-mate_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:08:31 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:08:31 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/83 In-Reply-To: <1173407977.12.1584104064191.JavaMail.jenkins@jenkins> References: <1173407977.12.1584104064191.JavaMail.jenkins@jenkins> Message-ID: <800317568.230.1584364111986.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-electronics_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:10:31 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:10:31 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-geography_upgrade_to_sid/83 In-Reply-To: <445351437.43.1584109433543.JavaMail.jenkins@jenkins> References: <445351437.43.1584109433543.JavaMail.jenkins@jenkins> Message-ID: <1803396659.232.1584364231863.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-geography_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-geography_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:13:22 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:13:22 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/83 In-Reply-To: <1849593642.27.1584107096636.JavaMail.jenkins@jenkins> References: <1849593642.27.1584107096636.JavaMail.jenkins@jenkins> Message-ID: <1054403999.234.1584364403041.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-graphics_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:14:05 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:14:05 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-development_upgrade_to_sid/83 In-Reply-To: <52546687.47.1584109769006.JavaMail.jenkins@jenkins> References: <52546687.47.1584109769006.JavaMail.jenkins@jenkins> Message-ID: <1523133382.236.1584364445789.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-development_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-development_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:15:33 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:15:33 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-language_upgrade_to_sid/83 In-Reply-To: <724136514.5.1584103186586.JavaMail.jenkins@jenkins> References: <724136514.5.1584103186586.JavaMail.jenkins@jenkins> Message-ID: <434573526.238.1584364533760.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-language_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-language_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:18:44 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:18:44 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/83 In-Reply-To: <796115413.10.1584103677537.JavaMail.jenkins@jenkins> References: <796115413.10.1584103677537.JavaMail.jenkins@jenkins> Message-ID: <2124314945.240.1584364724740.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-logic-games_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:24:05 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:24:05 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/83 In-Reply-To: <1407837126.41.1584109341365.JavaMail.jenkins@jenkins> References: <1407837126.41.1584109341365.JavaMail.jenkins@jenkins> Message-ID: <1361919680.243.1584365045337.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-desktop-xfce_upgrade_to_sid/83/ for more information. From gitlab at salsa.debian.org Mon Mar 16 13:25:07 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:25:07 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config] Pushed new tag 2.11.17 Message-ID: <5e6f7e334cfb1_6dca2ad41f861ce41367015@godard.mail> Holger Levsen pushed new tag 2.11.17 at Debian Edu / debian-edu-config -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/tree/2.11.17 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/20200316/ccf3765b/attachment-0001.html> From gitlab at salsa.debian.org Mon Mar 16 13:25:05 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:25:05 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] release as 2.11.17 Message-ID: <5e6f7e31f33cb_6dca2ad41afdd48c13667c3@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: 74fd78fb by Holger Levsen at 2020-03-16T14:22:48+01:00 release as 2.11.17 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,6 @@ -debian-edu-config (2.11.17) UNRELEASED; urgency=medium +debian-edu-config (2.11.17) unstable; urgency=medium + [ Wolfgang Schweer ] * Rework PXE installation setup to be compliant with re-written LTSP. These changes have the additional benefit to provide network booting for both BIOS and UEFI based systems due to the change to iPXE. @@ -20,7 +21,7 @@ debian-edu-config (2.11.17) UNRELEASED; urgency=medium + Use the graphical installer by default. + Adjust entries and comments to reflect the changes. - -- Wolfgang Schweer <wschweer at arcor.de> Sat, 14 Mar 2020 23:08:36 +0100 + -- Holger Levsen <holger at debian.org> Mon, 16 Mar 2020 14:22:30 +0100 debian-edu-config (2.11.16) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/74fd78fba38087b454764378ba27c7cfb5c23371 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/74fd78fba38087b454764378ba27c7cfb5c23371 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/20200316/119831b0/attachment-0001.html> From jenkins at jenkins.debian.net Mon Mar 16 13:27:25 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:27:25 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/83 In-Reply-To: <187464411.31.1584107630329.JavaMail.jenkins@jenkins> References: <187464411.31.1584107630329.JavaMail.jenkins@jenkins> Message-ID: <1953326886.245.1584365245661.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-mathematics_upgrade_to_sid/83/ for more information. From gitlab at salsa.debian.org Mon Mar 16 13:28:03 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:28:03 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] release as 2.11.6 Message-ID: <5e6f7ee33b981_6dca2ad41714fbd4136923c@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: b6c37c4c by Holger Levsen at 2020-03-16T14:27:21+01:00 release as 2.11.6 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,4 +1,4 @@ -debian-edu-install (2.11.6) UNRELEASED; urgency=medium +debian-edu-install (2.11.6) unstable; urgency=medium [ Holger Levsen ] * Change package description: Set d-i values to install Debian Edu *with* @@ -8,7 +8,7 @@ debian-edu-install (2.11.6) UNRELEASED; urgency=medium * preseed-values/defaults.main-server: Drop tftpd-hpa preseeding now that iPXE is used for PXE installations. - -- Holger Levsen <holger at debian.org> Sat, 14 Mar 2020 19:12:12 +0100 + -- Holger Levsen <holger at debian.org> Mon, 16 Mar 2020 14:27:11 +0100 debian-edu-install (2.11.5) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/b6c37c4c9ddfec94f19ceb923a0f8052cf1c3ddf -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/b6c37c4c9ddfec94f19ceb923a0f8052cf1c3ddf 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/20200316/a081a7d6/attachment.html> From gitlab at salsa.debian.org Mon Mar 16 13:28:04 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:28:04 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install] Pushed new tag 2.11.6 Message-ID: <5e6f7ee4c9ab1_6dca2ad41714fbd413695d7@godard.mail> Holger Levsen pushed new tag 2.11.6 at Debian Edu / debian-edu-install -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/tree/2.11.6 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/20200316/f2ea25ae/attachment.html> From jenkins at jenkins.debian.net Mon Mar 16 13:28:35 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:28:35 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/83 In-Reply-To: <1378308242.7.1584103397915.JavaMail.jenkins@jenkins> References: <1378308242.7.1584103397915.JavaMail.jenkins@jenkins> Message-ID: <1786364549.247.1584365316043.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-ltsp-server_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:30:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:30:57 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-misc_upgrade_to_sid/83 In-Reply-To: <1932067021.45.1584109645473.JavaMail.jenkins@jenkins> References: <1932067021.45.1584109645473.JavaMail.jenkins@jenkins> Message-ID: <1106922250.249.1584365457911.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-misc_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-misc_upgrade_to_sid/83/ for more information. From jenkins at jenkins.debian.net Mon Mar 16 13:34:01 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:34:01 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-physics_upgrade_to_sid/83 In-Reply-To: <454037415.20.1584105306795.JavaMail.jenkins@jenkins> References: <454037415.20.1584105306795.JavaMail.jenkins@jenkins> Message-ID: <1562261663.251.1584365641669.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-physics_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-physics_upgrade_to_sid/83/ for more information. From gitlab at salsa.debian.org Mon Mar 16 13:44:58 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:44:58 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] Fix workaround from 2.11.13. Message-ID: <5e6f82da440f2_6dca2ad41afdd48c137252e@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 36a908f0 by Holger Levsen at 2020-03-16T14:44:32+01:00 Fix workaround from 2.11.13. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,14 @@ debian-edu (2.11.14) UNRELEASED; urgency=medium + [ Wolfgang Schweer ] * tasks/main-server: Recommend ipxe (required for the PXE installation environment), no longer recommend pxelinux and syslinux-common. * debian/control: Update after running 'make dist'. + [ Holger Levsen ] + * Fix workaround from 2.11.13. + -- Wolfgang Schweer <wschweer at arcor.de> Sun, 15 Mar 2020 19:44:15 +0100 debian-edu (2.11.13) unstable; urgency=medium ===================================== debian/rules ===================================== @@ -6,3 +6,4 @@ include /usr/share/blends-dev/rules override_dh_install: $(BLEND_INSTALL_HELPER) dh_install -a $(BLENDNAME)-tasks.desc usr/share/tasksel/descs + dh_install View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/36a908f0e8e83f18dc597a514aefa965fd4bac16 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/36a908f0e8e83f18dc597a514aefa965fd4bac16 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/20200316/52070309/attachment.html> From jenkins at jenkins.debian.net Mon Mar 16 13:46:57 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 16 Mar 2020 13:46:57 +0000 (UTC) Subject: [debian-edu-commits] Fixed: chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/83 In-Reply-To: <1430196716.22.1584105692216.JavaMail.jenkins@jenkins> References: <1430196716.22.1584105692216.JavaMail.jenkins@jenkins> Message-ID: <733649839.253.1584366417697.JavaMail.jenkins@jenkins> See https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/83//console or just https://jenkins.debian.net/job/chroot-installation_bullseye_install_education-workstation_upgrade_to_sid/83/ for more information. From gitlab at salsa.debian.org Mon Mar 16 13:48:11 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:48:11 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] release as 2.11.14 Message-ID: <5e6f839b4d133_6dca2ad41afdd48c13732ec@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 1a555dd0 by Holger Levsen at 2020-03-16T14:46:36+01:00 release as 2.11.14 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,4 +1,4 @@ -debian-edu (2.11.14) UNRELEASED; urgency=medium +debian-edu (2.11.14) unstable; urgency=medium [ Wolfgang Schweer ] * tasks/main-server: @@ -9,7 +9,7 @@ debian-edu (2.11.14) UNRELEASED; urgency=medium [ Holger Levsen ] * Fix workaround from 2.11.13. - -- Wolfgang Schweer <wschweer at arcor.de> Sun, 15 Mar 2020 19:44:15 +0100 + -- Holger Levsen <holger at debian.org> Mon, 16 Mar 2020 14:46:29 +0100 debian-edu (2.11.13) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/1a555dd0970daf0fa408bb22e43c1b8fdf6f53a9 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/1a555dd0970daf0fa408bb22e43c1b8fdf6f53a9 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/20200316/d566b685/attachment.html> From gitlab at salsa.debian.org Mon Mar 16 13:48:13 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Mon, 16 Mar 2020 13:48:13 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu] Pushed new tag 2.11.14 Message-ID: <5e6f839da9262_6dca2ad41f84cb78137357b@godard.mail> Holger Levsen pushed new tag 2.11.14 at Debian Edu / debian-edu -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/tree/2.11.14 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/20200316/5ff4f002/attachment.html> From gitlab at salsa.debian.org Mon Mar 23 09:59:01 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Mon, 23 Mar 2020 09:59:01 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 6 commits: Translation: Debian Edu Documentation/Bullseye manual Message-ID: <5e7888652bf9f_6dca2ad418f49d10234384e@godard.mail> Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc Commits: 03fff967 by Ma Yong at 2020-03-16T02:36:24+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.4% (819 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 5aaf56ef by Ma Yong at 2020-03-16T02:36:25+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 79.9% (1123 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 9bcdbb64 by Ma Yong at 2020-03-17T11:36:34+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.0% (1124 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - a5c69831 by Ma Yong at 2020-03-19T12:36:37+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.2% (1127 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 464958e2 by Ma Yong at 2020-03-21T00:36:30+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.5% (820 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 00012325 by Ma Yong at 2020-03-21T00:36:31+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.4% (1129 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 2 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-13 10:23+0000\n" +"PO-Revision-Date: 2020-03-20 23:36+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5952,6 +5952,7 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6118,6 +6119,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " +"<emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-13 10:23+0000\n" +"PO-Revision-Date: 2020-03-20 23:36+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -6150,6 +6150,7 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6164,25 +6165,28 @@ msgstr "" msgid "" "Enable access in case diskless workstations are used. This is a special " "case, because sshfs is used instead of NFS and automount:" -msgstr "" +msgstr "在使用无盘工作站的情况下启用访问。这是特殊情况，因为使用 sshfs 取代 NFS 和 automount：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Create the mount point directories in the LTSP diskless client's root " "(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well." msgstr "" +"而且在 LTSP 无盘客户端的根（默认 <computeroutput>/opt/ltsp/i386/</computeroutput>）创建挂载点目录。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/" "opt/ltsp/i386/etc/lts.conf</computeroutput> (example)." msgstr "" +"添加内容为 ‘LOCAL_APPS_EXTRAMOUNTS=/storage’ 的一行到 <computeroutput>/opt/ltsp/i386/" +"etc/lts.conf</computeroutput>（示例）。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Create a link in each user's home dir like 'ln -s /storage Storage' to help " "users find the resources." -msgstr "" +msgstr "在每个用户的主目录创建类似 ‘ln -s /storage Storage’ 的链接来帮助用户找到该资源。" #. type: Content of: <article><section><section><para> msgid "" @@ -6191,6 +6195,8 @@ msgid "" "application on any workstation, LTSP thin client or LTSP server, and " "visiting ~/Storage in case an LTSP diskless client is used." msgstr "" +"现在用户应该能够在任何工作站，LTSP 瘦客户机或 LTSP 服务器上使用任何应用程序只通过浏览 ‘/tjener/nas-server/storage/" +"’ 目录直接访问 ‘nas-server.intern’ 上的文件，而在使用 LTSP 无盘客户机的情况下浏览 ~/Storage。" #. type: Content of: <article><section><section><title> msgid "Restrict ssh login access" @@ -6341,6 +6347,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " +"<emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/b2b7df6a7122869ceecea39e9122ef9dd293ce1a...0001232517f52094807a342978e89cf593ff6225 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/b2b7df6a7122869ceecea39e9122ef9dd293ce1a...0001232517f52094807a342978e89cf593ff6225 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/20200323/2c7fffb3/attachment-0001.html> From gitlab at salsa.debian.org Mon Mar 23 10:20:04 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Mon, 23 Mar 2020 10:20:04 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: translation update by Ma Yong Message-ID: <5e788d543751e_6dca2ad418f49d102345024@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: d8b5e10c by Frans Spiesschaert at 2020-03-23T11:17:08+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.4% (1129 of 1404 strings) - - - - - 4f53d7d4 by Frans Spiesschaert at 2020-03-23T11:19:47+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.5% (820 of 1196 strings) - - - - - 2 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-13 10:23+0000\n" +"PO-Revision-Date: 2020-03-20 23:36+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -5952,6 +5952,7 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6118,6 +6119,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " +"<emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-13 10:23+0000\n" +"PO-Revision-Date: 2020-03-20 23:36+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -6150,6 +6150,7 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6164,25 +6165,28 @@ msgstr "" msgid "" "Enable access in case diskless workstations are used. This is a special " "case, because sshfs is used instead of NFS and automount:" -msgstr "" +msgstr "在使用无盘工作站的情况下启用访问。这是特殊情况，因为使用 sshfs 取代 NFS 和 automount：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Create the mount point directories in the LTSP diskless client's root " "(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well." msgstr "" +"而且在 LTSP 无盘客户端的根（默认 <computeroutput>/opt/ltsp/i386/</computeroutput>）创建挂载点目录。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/" "opt/ltsp/i386/etc/lts.conf</computeroutput> (example)." msgstr "" +"添加内容为 ‘LOCAL_APPS_EXTRAMOUNTS=/storage’ 的一行到 <computeroutput>/opt/ltsp/i386/" +"etc/lts.conf</computeroutput>（示例）。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "Create a link in each user's home dir like 'ln -s /storage Storage' to help " "users find the resources." -msgstr "" +msgstr "在每个用户的主目录创建类似 ‘ln -s /storage Storage’ 的链接来帮助用户找到该资源。" #. type: Content of: <article><section><section><para> msgid "" @@ -6191,6 +6195,8 @@ msgid "" "application on any workstation, LTSP thin client or LTSP server, and " "visiting ~/Storage in case an LTSP diskless client is used." msgstr "" +"现在用户应该能够在任何工作站，LTSP 瘦客户机或 LTSP 服务器上使用任何应用程序只通过浏览 ‘/tjener/nas-server/storage/" +"’ 目录直接访问 ‘nas-server.intern’ 上的文件，而在使用 LTSP 无盘客户机的情况下浏览 ~/Storage。" #. type: Content of: <article><section><section><title> msgid "Restrict ssh login access" @@ -6341,6 +6347,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " +"<emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/f19838c6dda5e715513657d4e56128305d5f19c4...4f53d7d47d7a99c3656692e0377aa72e118c5a1e -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/f19838c6dda5e715513657d4e56128305d5f19c4...4f53d7d47d7a99c3656692e0377aa72e118c5a1e 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/20200323/7c896ece/attachment-0001.html> From jenkins at jenkins.debian.net Mon Mar 23 11:06:53 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Mon, 23 Mar 2020 11:06:53 +0000 (UTC) Subject: [debian-edu-commits] Build failed in Jenkins: edu-packages_sid_debian-edu-doc #1319 Message-ID: <1886809448.149.1584961613869.JavaMail.jenkins@jenkins> See <https://jenkins.debian.net/job/edu-packages_sid_debian-edu-doc/1319/display/redirect?page=changes> Changes: [Frans.Spiesschaert] translation update by Ma Yong [Frans.Spiesschaert] translation update by Ma Yong ------------------------------------------ Started by an SCM change Running as SYSTEM [EnvInject] - Loading node environment variables. Building on master in workspace <https://jenkins.debian.net/job/edu-packages_sid_debian-edu-doc/ws/> No credentials specified Wiping out workspace first. Cloning the remote Git repository Cloning repository https://salsa.debian.org/debian-edu/debian-edu-doc > git init <https://jenkins.debian.net/job/edu-packages_sid_debian-edu-doc/ws/> # timeout=10 Fetching upstream changes from https://salsa.debian.org/debian-edu/debian-edu-doc > git --version # timeout=10 > git fetch --tags --force --progress -- https://salsa.debian.org/debian-edu/debian-edu-doc +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url https://salsa.debian.org/debian-edu/debian-edu-doc # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url https://salsa.debian.org/debian-edu/debian-edu-doc # timeout=10 Fetching upstream changes from https://salsa.debian.org/debian-edu/debian-edu-doc > git fetch --tags --force --progress -- https://salsa.debian.org/debian-edu/debian-edu-doc +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse origin/master^{commit} # timeout=10 Checking out Revision 4f53d7d47d7a99c3656692e0377aa72e118c5a1e (origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 4f53d7d47d7a99c3656692e0377aa72e118c5a1e # timeout=10 Commit message: "translation update by Ma Yong Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.5% (820 of 1196 strings)" > git rev-list --no-walk f19838c6dda5e715513657d4e56128305d5f19c4 # timeout=10 [workspace] $ /bin/sh -xe /tmp/jenkins17790818032714523577.sh + /srv/jenkins/bin/chroot-run.sh sid debuild -b -uc -us ==================================================================================== Mon 23 Mar 10:20:31 UTC 2020 - running /srv/jenkins/bin/chroot-run.sh (for job edu-packages_sid_debian-edu-doc) on jenkins, called using "sid debuild -b -uc -us" as arguments. Mon 23 Mar 10:20:31 UTC 2020 - actually running "chroot-run.sh" (md5sum 10c3539c8461754ab1134a66d2bb5d1b) as "/tmp/jenkins-script-FETdYaGa" Please send feedback to qa-jenkins-dev at lists.alioth.debian.org or even better, provide https://salsa.debian.org/qa/jenkins.debian.net/merge_requests ! To dig deeper: git clone https://salsa.debian.org/qa/jenkins.debian.net.git && less README INSTALL CONTRIBUTING TODO ==================================================================================== Mon Mar 23 10:20:31 UTC 2020 - bootstraping sid into /chroots/chroot-run-sid.T9XYJrT2r now. I: automatically chosen mode: root I: chroot architecture amd64 is equal to the host's architecture I: Reading sources.list from standard input... I: running apt-get update... I: downloading packages with apt... I: extracting archives... I: installing packages... I: downloading apt... I: installing apt... I: installing remaining packages inside the chroot... I: cleaning package lists and apt cache... Preseeding man-db/auto-update to false Configuring dpkg to not fsync() Get:1 http://cdn-fastly.deb.debian.org/debian sid InRelease [146 kB] Get:2 http://cdn-fastly.deb.debian.org/debian sid/main Sources [8563 kB] Get:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages [8213 kB] Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Ign:4 http://cdn-fastly.deb.debian.org/debian sid/main Translation-en Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Ign:4 http://cdn-fastly.deb.debian.org/debian sid/main Translation-en Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Ign:4 http://cdn-fastly.deb.debian.org/debian sid/main Translation-en Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Err:4 http://cdn-fastly.deb.debian.org/debian sid/main Translation-en Connection failed [IP: 78.137.99.97 3128] Ign:3 http://cdn-fastly.deb.debian.org/debian sid/main amd64 Packages Fetched 8709 kB in 17min 24s (8340 B/s) Reading package lists... W: Failed to fetch http://cdn-fastly.deb.debian.org/debian/dists/sid/main/i18n/Translation-en Connection failed [IP: 78.137.99.97 3128] W: Some index files failed to download. They have been ignored, or old ones used instead. Reading package lists... Building dependency tree... Reading state information... E: Unable to locate package build-essential E: Unable to locate package devscripts E: Unable to locate package git Mon 23 Mar 11:06:53 UTC 2020 - chroot-run.sh stopped running as /tmp/jenkins-script-FETdYaGa, which will now be removed. Build step 'Execute shell' marked build as failure From gitlab at salsa.debian.org Wed Mar 25 22:45:20 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 22:45:20 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 7 commits: Add new script share/debian-edu-config/tools/edu-icinga-setup. Message-ID: <5e7bdf008cd84_6dca3fa2985b52b427240bf@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: e160abf7 by Wolfgang Schweer at 2020-03-25T23:27:53+01:00 Add new script share/debian-edu-config/tools/edu-icinga-setup. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1f651bba by Wolfgang Schweer at 2020-03-25T23:29:10+01:00 Add cf3/cf.icinga file for setting up Icinga via cfengine. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 7a36c790 by Wolfgang Schweer at 2020-03-25T23:30:35+01:00 Rework all files in the www/ directory to reflect the changes. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2e15ca12 by Wolfgang Schweer at 2020-03-25T23:32:19+01:00 Adjust Makefile and cf3/promises.cf to reflect the changes Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 5e9d36d6 by Wolfgang Schweer at 2020-03-25T23:33:46+01:00 Add entry to debian/debian-edu-config.lintian-overrides This is required as the new tool uses debconf to fetch the first user uid value. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 59a668a4 by Wolfgang Schweer at 2020-03-25T23:36:05+01:00 Improve the share/debian-edu-config/tools/edu-ltsp-install script. Also mask the mariadb service now that Icinga is using it. Drop no longer needed workaround for the tftpd-hpa package. Add workaround for resolv.conf if the tool is run on a combined server. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - f7f8d823 by Wolfgang Schweer at 2020-03-25T23:37:11+01:00 Add changelog entries for last commits. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 30 changed files: - Makefile - + cf3/cf.icinga - cf3/promises.cf - debian/changelog - debian/debian-edu-config.lintian-overrides - + share/debian-edu-config/tools/edu-icinga-setup - share/debian-edu-config/tools/edu-ltsp-install - www/ca.po - www/da.po - www/de.po - www/es-es.po - www/fr.po - www/id.po - www/index.html.ca - www/index.html.da - www/index.html.de - www/index.html.en - www/index.html.es-es - www/index.html.fr - www/index.html.id - www/index.html.it - www/index.html.ja - www/index.html.nb-no - www/index.html.nl - www/index.html.pt - www/index.html.pt-br - www/index.html.ro - www/index.html.ru - www/index.html.zh-tw - www/index.pot The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/74fd78fba38087b454764378ba27c7cfb5c23371...f7f8d82390e9d79a703d337bd69acbb06c10dc1d -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/74fd78fba38087b454764378ba27c7cfb5c23371...f7f8d82390e9d79a703d337bd69acbb06c10dc1d 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/20200325/8c081eae/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 22:45:37 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 22:45:37 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: tasks/main-server: Recommend mariadb-server, needed for icinga2 setup. Message-ID: <5e7bdf11c4f93_6dca3fa296292520272435a@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu Commits: 6a26da10 by Wolfgang Schweer at 2020-03-25T23:40:47+01:00 tasks/main-server: Recommend mariadb-server, needed for icinga2 setup. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 65f64182 by Wolfgang Schweer at 2020-03-25T23:41:42+01:00 debian/control: Update after running 'make dist'. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 3 changed files: - debian/changelog - debian/control - tasks/main-server Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +debian-edu (2.11.15) UNRELEASED; urgency=medium + + * tasks/main-server: Recommend mariadb-server, needed for icinga2 setup. + * debian/control: Update after running 'make dist'. + + -- Wolfgang Schweer <wschweer at arcor.de> Mon, 23 Mar 2020 20:38:58 +0100 + debian-edu (2.11.14) unstable; urgency=medium [ Wolfgang Schweer ] ===================================== debian/control ===================================== @@ -716,6 +716,7 @@ Recommends: apache2, libsasl2-modules-gssapi-mit, links, makepasswd, + mariadb-server, memtest86+, monitoring-plugins-standard, munin, ===================================== tasks/main-server ===================================== @@ -114,9 +114,10 @@ NeedConfig: yes - done automatically by preseeding sitesummary Recommends: icinga2, icingaweb2, + mariadb-server, monitoring-plugins-standard, nagios-nrpe-plugin, -NeedConfig: yes - done via preseeding: icingaadmin password, enable cgi. +NeedConfig: yes - done via preseeding: enable icinga-ido-mysql connection. Recommends: sitesummary, View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/1a555dd0970daf0fa408bb22e43c1b8fdf6f53a9...65f641825aa731185af7e8ba64b4e376d8f3b65c -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/1a555dd0970daf0fa408bb22e43c1b8fdf6f53a9...65f641825aa731185af7e8ba64b4e376d8f3b65c 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/20200325/3a8d58b8/attachment-0001.html> From gitlab at salsa.debian.org Wed Mar 25 22:45:48 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 22:45:48 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] preseed-values/defaults.main-server: Drop preseeding for Icinga 2. Message-ID: <5e7bdf1c2a03d_6dca2ad41c66089427246a@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install Commits: b20fef30 by Wolfgang Schweer at 2020-03-25T23:43:02+01:00 preseed-values/defaults.main-server: Drop preseeding for Icinga 2. The reworked icinga2 and icingaweb2 setup now cares for the login configuration; the first user will be able to log into the Icinga web UI. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 2 changed files: - debian/changelog - preseed-values/defaults.main-server Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +debian-edu-install (2.11.7) UNRELEASED; urgency=medium + + * preseed-values/defaults.main-server: Drop preseeding for Icinga 2. + The reworked icinga2 and icingaweb2 setup now cares for the login + configuration; the first user will be able to log into the web UI. + + -- Wolfgang Schweer <wschweer at arcor.de> Mon, 23 Mar 2020 20:25:35 +0100 + debian-edu-install (2.11.6) unstable; urgency=medium [ Holger Levsen ] ===================================== preseed-values/defaults.main-server ===================================== @@ -29,10 +29,6 @@ debian-edu-config debian-edu-config/update-hostname boolean false # Kerberos KDC and admin server krb5-admin-server krb5-admin-server/kadmind boolean true -# Provide a default icingaadmin password. -icinga2-classicui icinga2-classicui/adminpassword password skolelinux -icinga2-classicui icinga2-classicui/adminpassword-repeat password skolelinux - # Do not enable the WINS feature of samba-common, because this profile # does not get a address via DHCP samba-common samba-common/dhcp boolean false View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/b20fef30fa2e9a055e4686635222a50cd2786133 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/b20fef30fa2e9a055e4686635222a50cd2786133 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/20200325/053e3270/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:12:23 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 23:12:23 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Add closes statement for bug #793677 Message-ID: <5e7be557d31a0_6dca3fa2985b52b427259f3@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: e7e9a1d6 by Wolfgang Schweer at 2020-03-26T00:11:36+01:00 Add closes statement for bug #793677 Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -4,6 +4,7 @@ debian-edu-config (2.11.18) UNRELEASED; urgency=medium icinga2-classicui package has been dropped. The setup follows a more complex approach involving databases and authentication against LDAP. The first user is enabled to log into the web interface as Icinga Administrator. + (Closes: #793677). - Add new script share/debian-edu-config/tools/edu-icinga-setup. - Add cf3/cf.icinga file for setting up Icinga via cfengine. - Rework all files in the www/ directory to reflect the changes. View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e7e9a1d643b9c2d1736b892d61a00ab7ec7c0fae -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e7e9a1d643b9c2d1736b892d61a00ab7ec7c0fae 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/20200325/0ff17c85/attachment-0001.html> From gitlab at salsa.debian.org Wed Mar 25 23:17:16 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:17:16 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install][master] release as 2.11.7 Message-ID: <5e7be67c21df8_6dca2ad41a78467827262bd@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-install Commits: a3cd62ed by Holger Levsen at 2020-03-26T00:16:24+01:00 release as 2.11.7 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,11 @@ -debian-edu-install (2.11.7) UNRELEASED; urgency=medium +debian-edu-install (2.11.7) unstable; urgency=medium + [ Wolfgang Schweer ] * preseed-values/defaults.main-server: Drop preseeding for Icinga 2. The reworked icinga2 and icingaweb2 setup now cares for the login configuration; the first user will be able to log into the web UI. - -- Wolfgang Schweer <wschweer at arcor.de> Mon, 23 Mar 2020 20:25:35 +0100 + -- Holger Levsen <holger at debian.org> Thu, 26 Mar 2020 00:16:06 +0100 debian-edu-install (2.11.6) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/a3cd62ed91125bb22de48c889e28f2946e5d875a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/commit/a3cd62ed91125bb22de48c889e28f2946e5d875a 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/20200325/f03cba10/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:17:17 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:17:17 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-install] Pushed new tag 2.11.7 Message-ID: <5e7be67ded59b_6dca3fa2962925202726565@godard.mail> Holger Levsen pushed new tag 2.11.7 at Debian Edu / debian-edu-install -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/tree/2.11.7 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/20200325/28eb582a/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:18:16 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:18:16 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu][master] release as 2.11.15 Message-ID: <5e7be6b8cf180_6dca2ad41d36faf8272729b@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu Commits: 558cde36 by Holger Levsen at 2020-03-26T00:17:33+01:00 release as 2.11.15 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,10 @@ -debian-edu (2.11.15) UNRELEASED; urgency=medium +debian-edu (2.11.15) unstable; urgency=medium + [ Wolfgang Schweer ] * tasks/main-server: Recommend mariadb-server, needed for icinga2 setup. * debian/control: Update after running 'make dist'. - -- Wolfgang Schweer <wschweer at arcor.de> Mon, 23 Mar 2020 20:38:58 +0100 + -- Holger Levsen <holger at debian.org> Thu, 26 Mar 2020 00:17:26 +0100 debian-edu (2.11.14) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/558cde3663225b679cd8db906f7a09fbd4bfa675 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/commit/558cde3663225b679cd8db906f7a09fbd4bfa675 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/20200325/0c30213b/attachment-0001.html> From gitlab at salsa.debian.org Wed Mar 25 23:18:18 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:18:18 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu] Pushed new tag 2.11.15 Message-ID: <5e7be6bae2118_6dca3fa2985b52b4272753d@godard.mail> Holger Levsen pushed new tag 2.11.15 at Debian Edu / debian-edu -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/tree/2.11.15 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/20200325/3ed80cf7/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:21:30 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:21:30 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] drop whitespaces Message-ID: <5e7be77a74178_6dca3fa2985b52b427280ec@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: e92ea770 by Holger Levsen at 2020-03-26T00:21:20+01:00 drop whitespaces Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 2 changed files: - debian/changelog - share/debian-edu-config/tools/edu-icinga-setup Changes: ===================================== debian/changelog ===================================== @@ -9,7 +9,7 @@ debian-edu-config (2.11.18) UNRELEASED; urgency=medium - Add cf3/cf.icinga file for setting up Icinga via cfengine. - Rework all files in the www/ directory to reflect the changes. - Adjust Makefile and cf3/promises.cf accordingly. - - Add a related line to debian/debian-edu-config.lintian-overrides because + - Add a related line to debian/debian-edu-config.lintian-overrides because the new tool uses debconf to fetch the first user uid value. * share/debian-edu-config/tools/edu-ltsp-install: - Also mask the mariadb service now that Icinga is using it. ===================================== share/debian-edu-config/tools/edu-icinga-setup ===================================== @@ -7,7 +7,7 @@ # Author/Copyright: Wolfgang Schweer <wschweer at arcor.de> # Licence: GPL2+ # first edited: 2020-03-23 -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e92ea7701e07d7603c3d24d1dcaf6fbf9f779a39 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e92ea7701e07d7603c3d24d1dcaf6fbf9f779a39 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/20200325/d3a41c8a/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:25:15 2020 From: gitlab at salsa.debian.org (WolfgangSchweer) Date: Wed, 25 Mar 2020 23:25:15 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Add hint for database removals share/debian-edu-config/tools/edu-icinga-setup, Message-ID: <5e7be85bae632_6dca3fa29629252027294ad@godard.mail> WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config Commits: a219e61b by Wolfgang Schweer at 2020-03-26T00:24:02+01:00 Add hint for database removals share/debian-edu-config/tools/edu-icinga-setup, thanks Holger. Signed-off-by: Wolfgang Schweer <wschweer at arcor.de> - - - - - 1 changed file: - share/debian-edu-config/tools/edu-icinga-setup Changes: ===================================== share/debian-edu-config/tools/edu-icinga-setup ===================================== @@ -25,7 +25,9 @@ set -ex db_get debian-edu-config/first-user-name FIRSTUSERNAME="$RET" -# Secure the MariaDB installation +# Secure the MariaDB installation, see the next mysql commands. +# Also, the automatically generated initial database incinga2 will be removed +# at the end of the script. # TODO: Set mysql root password after first reboot of a main server. # (Add instruction to the manual's 'Getting started' chapter, i.e. # run 'mysql_secure_installation'.) View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/a219e61b4c72c64157790bdfe693c20b840079ee -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/a219e61b4c72c64157790bdfe693c20b840079ee 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/20200325/4f2c2bdd/attachment-0001.html> From gitlab at salsa.debian.org Wed Mar 25 23:35:52 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:35:52 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config][master] release as 2.11.18 Message-ID: <5e7bead8571cd_6dca2ad41c66089427305f2@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-config Commits: 892593c9 by Holger Levsen at 2020-03-26T00:28:25+01:00 release as 2.11.18 Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,6 @@ -debian-edu-config (2.11.18) UNRELEASED; urgency=medium +debian-edu-config (2.11.18) unstable; urgency=medium + [ Wolfgang Schweer ] * Setup and configure the Icinga 2 monitoring system now that the icinga2-classicui package has been dropped. The setup follows a more complex approach involving databases and authentication against LDAP. The first user @@ -16,7 +17,7 @@ debian-edu-config (2.11.18) UNRELEASED; urgency=medium - Drop no longer needed workaround for the tftpd-hpa package. - Add workaround for resolv.conf if the tool is run on a combined server. - -- Wolfgang Schweer <wschweer at arcor.de> Wed, 25 Mar 2020 13:51:54 +0100 + -- Holger Levsen <holger at debian.org> Thu, 26 Mar 2020 00:28:17 +0100 debian-edu-config (2.11.17) unstable; urgency=medium View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/892593c9fd85a94e641d0f59183020c1af768cbf -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/892593c9fd85a94e641d0f59183020c1af768cbf 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/20200325/4fc31c0c/attachment.html> From gitlab at salsa.debian.org Wed Mar 25 23:35:53 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Wed, 25 Mar 2020 23:35:53 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-config] Pushed new tag 2.11.18 Message-ID: <5e7bead9c9e0b_6dca3fa29629252027308d6@godard.mail> Holger Levsen pushed new tag 2.11.18 at Debian Edu / debian-edu-config -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/tree/2.11.18 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/20200325/27645c2d/attachment-0001.html> From gitlab at salsa.debian.org Thu Mar 26 11:47:04 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Thu, 26 Mar 2020 11:47:04 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 4 commits: Translation: Debian Edu Documentation/Bullseye manual Message-ID: <5e7c9638637e8_6dca2ad41d36faf827858e6@godard.mail> Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc Commits: b82b369a by Ma Yong at 2020-03-24T23:46:55+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.6% (821 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - b85efbff by Ma Yong at 2020-03-24T23:46:57+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.4% (1130 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 993ea945 by Ma Yong at 2020-03-26T12:45:16+01:00 Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.7% (822 of 1196 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/ - - - - - 20893577 by Ma Yong at 2020-03-26T12:45:18+01:00 Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.5% (1131 of 1404 strings) Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/ - - - - - 2 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-20 23:36+0000\n" +"PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -6040,6 +6040,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " +"从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6057,6 +6059,8 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " +"客户端网络也会获得 ssh 访问 LTSP 服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-20 23:36+0000\n" +"PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -6268,6 +6268,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " +"从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6285,6 +6287,8 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " +"客户端网络也会获得 ssh 访问 LTSP 服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/0001232517f52094807a342978e89cf593ff6225...2089357726d82f2485dc0acd386aa5e92c392041 -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/0001232517f52094807a342978e89cf593ff6225...2089357726d82f2485dc0acd386aa5e92c392041 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/20200326/46564ec1/attachment-0001.html> From gitlab at salsa.debian.org Thu Mar 26 13:09:13 2020 From: gitlab at salsa.debian.org (Frans Spiesschaert) Date: Thu, 26 Mar 2020 13:09:13 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: translation update by Ma Yong Message-ID: <5e7ca9795048a_6dca2ad41a78467827924b7@godard.mail> Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc Commits: 426afd4d by Frans Spiesschaert at 2020-03-26T14:04:30+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Buster manual Translated using Weblate (Chinese (Simplified)) Currently translated at 80.5% (1131 of 1404 strings) - - - - - d42d9466 by Frans Spiesschaert at 2020-03-26T14:06:19+01:00 translation update by Ma Yong Translation: Debian Edu Documentation/Bullseye manual Translated using Weblate (Chinese (Simplified)) Currently translated at 68.7% (822 of 1196 strings) - - - - - 2 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-28 15:25+0000\n" -"PO-Revision-Date: 2020-03-20 23:36+0000\n" +"PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n" @@ -6040,6 +6040,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " +"从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6057,6 +6059,8 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " +"客户端网络也会获得 ssh 访问 LTSP 服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.zh.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "POT-Creation-Date: 2020-02-25 17:50+0000\n" -"PO-Revision-Date: 2020-03-20 23:36+0000\n" +"PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong <debuser at yeah.net>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n" @@ -6268,6 +6268,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " +"从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6285,6 +6287,8 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " +"客户端网络也会获得 ssh 访问 LTSP 服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/4f53d7d47d7a99c3656692e0377aa72e118c5a1e...d42d9466390be0f33a81985a2b27305a61c8778a -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/4f53d7d47d7a99c3656692e0377aa72e118c5a1e...d42d9466390be0f33a81985a2b27305a61c8778a 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/20200326/7e786508/attachment-0001.html> From wiki at debian.org Thu Mar 26 13:13:25 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:13:25 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Manuals/Audacity/CopyRight=22_by_FransSpie?= =?utf-8?q?sschaert?= Message-ID: <158522840529.31434.7154053408619226684@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Manuals/Audacity/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/CopyRight?action=diff&rev1=33&rev2=34 Comment: update copyright information for Simplified Chinese The Swedish translation is copyrighted by Erik Sundin (2016), Anders Jonsson (2018) and Mattias Münster (2019) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2017), Damian Nadolski (2019), Piotrek Pastuszak (2020) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. From wiki at debian.org Thu Mar 26 13:15:14 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:15:14 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Manuals/Rosegarden/CopyRight=22_by_FransSp?= =?utf-8?q?iesschaert?= Message-ID: <158522851467.31434.1307569681658874612@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Manuals/Rosegarden/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/CopyRight?action=diff&rev1=28&rev2=29 Comment: update copyright information for Simplified Chinese The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS (2018) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma Yong (2019, 2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong (2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Thu Mar 26 13:21:21 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:21:21 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Buster/CopyRight=22_by_FransSpiesschaert?= Message-ID: <158522888141.1784.7544241354104704258@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Buster/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/Buster/CopyRight?action=diff&rev1=13&rev2=14 Comment: update copyright information for Simplified Chinese, Japanese and Dutch The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, 2016, 2019) and is released under the GPL v2 or any later version. - The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, 2016, 2017, 2018, 2019) and is released under the GPL v2 or any later version. + The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and is released under the GPL v2 or any later version. - The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 (2019) and is released under the GPL v2 or any later version. + The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 (2019-2020) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, 2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Thu Mar 26 13:23:46 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:23:46 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Bullseye/CopyRight=22_by_FransSpiesschaert?= Message-ID: <158522902670.1787.13206774972084542171@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Bullseye/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/Bullseye/CopyRight?action=diff&rev1=4&rev2=5 Comment: update copyright information for Simplified Chinese The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Thu Mar 26 13:27:21 2020 From: wiki at debian.org (Debian Wiki) Date: Thu, 26 Mar 2020 13:27:21 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/ITIL/CopyRight=22_by_FransSpiesschaert?= Message-ID: <158522924142.1783.8917571705681541350@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/ITIL/CopyRight" page has been changed by FransSpiesschaert: https://wiki.debian.org/DebianEdu/Documentation/ITIL/CopyRight?action=diff&rev1=15&rev2=16 Comment: update copyright information for Simplified Chinese The Norwegian Bokmål translation is copyrighted by Ole-Erik Yrvin (2015), Ingrid Yrvin (2015) and Allan Nordhøy (2018, 2019) and is released under the GPL v3 or any later version. - The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma Yong (2018, 2019) and is released under the GPL v3 or any later version. + The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma Yong (2018-2020) and is released under the GPL v3 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2017-2020) and is released under the GPL v3 or any later version. From jenkins at jenkins.debian.net Thu Mar 26 13:31:28 2020 From: jenkins at jenkins.debian.net (jenkins at jenkins.debian.net) Date: Thu, 26 Mar 2020 13:31:28 +0000 (UTC) Subject: [debian-edu-commits] Jenkins build is back to normal : edu-packages_sid_debian-edu-doc #1320 In-Reply-To: <1886809448.149.1584961613869.JavaMail.jenkins@jenkins> References: <1886809448.149.1584961613869.JavaMail.jenkins@jenkins> Message-ID: <1101912892.79.1585229488209.JavaMail.jenkins@jenkins> See <https://jenkins.debian.net/job/edu-packages_sid_debian-edu-doc/1320/display/redirect?page=changes> From wiki at debian.org Sat Mar 28 10:29:18 2020 From: wiki at debian.org (Debian Wiki) Date: Sat, 28 Mar 2020 10:29:18 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Manuals/Audacity/CopyRight=22_by_HolgerLev?= =?utf-8?q?sen?= Message-ID: <158539135826.16958.1869749653311494980@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Manuals/Audacity/CopyRight" page has been changed by HolgerLevsen: https://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/CopyRight?action=diff&rev1=34&rev2=35 Comment: fix CamelCase The Swedish translation is copyrighted by Erik Sundin (2016), Anders Jonsson (2018) and Mattias Münster (2019) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and !EldersJavas (2020) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2017), Damian Nadolski (2019), Piotrek Pastuszak (2020) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. From wiki at debian.org Sat Mar 28 10:30:29 2020 From: wiki at debian.org (Debian Wiki) Date: Sat, 28 Mar 2020 10:30:29 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Bullseye/CopyRight=22_by_HolgerLevsen?= Message-ID: <158539142986.18352.16937838751162425196@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Bullseye/CopyRight" page has been changed by HolgerLevsen: https://wiki.debian.org/DebianEdu/Documentation/Bullseye/CopyRight?action=diff&rev1=5&rev2=6 Comment: fix CamelCase The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and !EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Sat Mar 28 10:31:01 2020 From: wiki at debian.org (Debian Wiki) Date: Sat, 28 Mar 2020 10:31:01 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Buster/CopyRight=22_by_HolgerLevsen?= Message-ID: <158539146135.18347.12518207469029761455@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Buster/CopyRight" page has been changed by HolgerLevsen: https://wiki.debian.org/DebianEdu/Documentation/Buster/CopyRight?action=diff&rev1=14&rev2=15 Comment: fix CamelCase The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and !EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From wiki at debian.org Sat Mar 28 10:31:38 2020 From: wiki at debian.org (Debian Wiki) Date: Sat, 28 Mar 2020 10:31:38 -0000 Subject: [debian-edu-commits] =?utf-8?q?=5BDebian_Wiki=5D_Update_of_=22Deb?= =?utf-8?q?ianEdu/Documentation/Manuals/Rosegarden/CopyRight=22_by_HolgerL?= =?utf-8?q?evsen?= Message-ID: <158539149863.18354.15338503602513978743@wilder.debian.org> Dear Wiki user, You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification. The "DebianEdu/Documentation/Manuals/Rosegarden/CopyRight" page has been changed by HolgerLevsen: https://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/CopyRight?action=diff&rev1=29&rev2=30 Comment: fix CamelCase The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS (2018) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. - The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong (2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any later version. + The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong (2019, 2020) and !EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. From gitlab at salsa.debian.org Sat Mar 28 10:36:28 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 28 Mar 2020 10:36:28 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: Update debian/copyright from the wikis. Message-ID: <5e7f28acc0d3a_78e93fe0a0a55da02328f6@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc Commits: 299bad3e by Holger Levsen at 2020-03-28T11:32:31+01:00 Update debian/copyright from the wikis. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - e4e44721 by Holger Levsen at 2020-03-28T11:36:14+01:00 Update Audacity manual from the wiki. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 16 changed files: - debian/copyright - documentation/audacity/audacity-manual.cs.po - documentation/audacity/audacity-manual.fr.po - documentation/audacity/audacity-manual.ja.po - documentation/audacity/audacity-manual.nb.po - documentation/audacity/audacity-manual.nl.po - documentation/audacity/audacity-manual.pl.po - documentation/audacity/audacity-manual.pot - documentation/audacity/audacity-manual.pt_BR.po - documentation/audacity/audacity-manual.pt_PT.po - documentation/audacity/audacity-manual.sv.po - documentation/audacity/audacity-manual.uk.po - documentation/audacity/audacity-manual.xml - documentation/audacity/audacity-manual.zh.po - documentation/audacity/audacity-manual.zh_Hant.po - documentation/audacity/source/AllInOne-audacity-manual.xml Changes: ===================================== debian/copyright ===================================== @@ -94,6 +94,7 @@ Files: documentation/audacity/audacity-manual.zh.po Copyright: 2017 Zhang Miao 2018, 2020 Ma Yong 2019 zlffcn + 2020 EldersJavas License: GPL-2+ Files: documentation/audacity/audacity-manual.pl.po @@ -235,6 +236,7 @@ Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po Copyright: 2016-2020 Ma Yong 2017 Boyuan Yang 2017 Roy Zhang + 2020 EldersJavas License: GPL-2+ Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh_Hant.po @@ -331,12 +333,12 @@ Copyright: 2012, 2013, 2014, 2015, 2016, 2019 Joe Hansen License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.nl.po -Copyright: 2014, 2015, 2016, 2017, 2018, 2019 Frans Spiesschaert +Copyright: 2014-2020 Frans Spiesschaert License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.ja.po Copyright: 2016, 2017 victory - 2019 hoxp18 + 2019-2020 hoxp18 License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.pl.po @@ -347,9 +349,10 @@ Copyright: 2016, 2017 Stanisław Krukowski License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.zh.po -Copyright: 2016, 2017, 2018, 2019, 2020 Ma Yong +Copyright: 2016-2020 Ma Yong 2017 Boyuan Yang 2017 Roy Zhang + 2020 EldersJavas License: GPL-2+ Files: documentation/debian-edu-buster/debian-edu-buster-manual.zh_Hant.po @@ -381,7 +384,7 @@ License: GPL-3+ Files: documentation/debian-edu-itil/debian-edu-itil-manual.zh.po Copyright: 2017 Liang Guo - 2018, 2019 Ma Yong + 2018-2020 Ma Yong License: GPL-3+ Files: documentation/debian-edu-itil/debian-edu-itil-manual.nl.po @@ -429,6 +432,7 @@ License: GPL-2+ Files: documentation/rosegarden/rosegarden-manual.zh.po Copyright: 2018 杨玉印 2019, 2020 Ma Yong + 2020 EldersJavas License: GPL-2+ Files: documentation/rosegarden/rosegarden-manual.zh_Hant.po ===================================== documentation/audacity/audacity-manual.cs.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2018-01-12 09:01+0000\n" "Last-Translator: Jiří Kučera <redwoodstudio at seznam.cz>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/debian-edu-" @@ -447,8 +447,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.fr.po ===================================== @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2012-02-25 17:05+0100\n" "Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n" "Language-Team: French <debian-l10n-french at lists.debian.org>\n" @@ -680,8 +680,8 @@ msgstr "" #| "Enjoy!" msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "Le document est écrit par Alf Tonny Bätz (2008, 2009), Holger Levsen (2009). " "Les droits de copie sont la propriété des auteurs. Ce document est distribué " ===================================== documentation/audacity/audacity-manual.ja.po ===================================== @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2019-06-10 23:29+0900\n" "Last-Translator: hoxp18 <hoxp18 at noramail.jp>\n" "Language-Team: Japanese <debian-japanese at lists.debian.org>\n" @@ -463,8 +463,8 @@ msgid "" "released under the GPL v2 or any later version." msgstr "" "ノルウェー語 (ブークモール) 翻訳版は、Jon Nordby (2014)、Petter Reinholdtsen " -"(2014, 2018)、Allan Nordhøy (2018, 2019, 2020) に著作権があり GPL v2 以降のライセン" -"スで提供されています。" +"(2014, 2018)、Allan Nordhøy (2018, 2019, 2020) に著作権があり GPL v2 以降のラ" +"イセンスで提供されています。" #. type: Content of: <article><section><para> msgid "" @@ -496,13 +496,18 @@ msgstr "" "Münster (2019) に著作権があり、GPL v2 以降のライセンスで提供されています。" #. type: Content of: <article><section><para> +#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), " +#| "Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 " +#| "or any later version." msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" -"中国語(簡易体)翻訳版は、Zhang Miao (2017)、Ma Yong (2018, 2020)、zlffcn (2019) に著" -"作権があり、GPL v2 以降のライセンスで提供されています。" +"中国語(簡易体)翻訳版は、Zhang Miao (2017)、Ma Yong (2018, 2020)、zlffcn " +"(2019) に著作権があり、GPL v2 以降のライセンスで提供されています。" #. type: Content of: <article><section><para> #, fuzzy ===================================== documentation/audacity/audacity-manual.nb.po ===================================== @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-02-25 15:32+0000\n" "Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n" "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-" @@ -497,8 +497,8 @@ msgid "" "released under the GPL v2 or any later version." msgstr "" "Rettighetene for oversettelsen til norsk bokmål tilhører Jon Nordby (2014), " -"Petter Reinholdtsen (2014, 2018) og Allan Nordhøy (2018, 2019, 2020), og er utgitt " -"under GPL v2 eller en senere versjon." +"Petter Reinholdtsen (2014, 2018) og Allan Nordhøy (2018, 2019, 2020), og er " +"utgitt under GPL v2 eller en senere versjon." #. type: Content of: <article><section><para> msgid "" @@ -534,14 +534,19 @@ msgstr "" "GPL v2 eller enhver senere versjon." #. type: Content of: <article><section><para> +#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), " +#| "Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 " +#| "or any later version." msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "Rettigheten til oversettelsen til forenklet kinesisk tilhører Zhang Miao " -"(2017), Ma Yong (2018, 2020) og zlffcn (2019), utgitt med lisensen GPL v2 eller " -"enhver senere versjon." +"(2017), Ma Yong (2018, 2020) og zlffcn (2019), utgitt med lisensen GPL v2 " +"eller enhver senere versjon." #. type: Content of: <article><section><para> #, fuzzy ===================================== documentation/audacity/audacity-manual.nl.po ===================================== @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: audacity-manual.nl\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-02-26 21:45+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n" @@ -505,8 +505,8 @@ msgid "" msgstr "" "De auteursrechten van de vertaling naar het Noorse Bokmål berusten bij Jon " "Nordby (2014), Petter Reinholdtsen (2014, 2018) en Allan Nordhøy (2018, " -"2019, 2020). Het document werd uitgegeven onder de licentie GPL v2 of een latere " -"versie." +"2019, 2020). Het document werd uitgegeven onder de licentie GPL v2 of een " +"latere versie." #. type: Content of: <article><section><para> msgid "" @@ -543,12 +543,13 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten " -"bij Zhang Miao (2017), Ma Yong (2018, 2020) en zlffcn (2019). De vertaling is " -"uitgebracht onder de GPL-licentie versie 2 of een latere versie." +"bij Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) en EldersJavas " +"(2020). De vertaling is uitgebracht onder de GPL-licentie versie 2 of een " +"latere versie." #. type: Content of: <article><section><para> msgid "" ===================================== documentation/audacity/audacity-manual.pl.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-02-21 15:33+0000\n" "Last-Translator: Michal Biesiada <blade-14 at o2.pl>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-" @@ -494,8 +494,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.pot ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+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" @@ -441,8 +441,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.pt_BR.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-02-28 22:01+0000\n" "Last-Translator: Wellington Terumi Uemura <wellingtonuemura at gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" @@ -536,12 +536,12 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "O direito autoral da tradução para o chinês simplificado é de Zhang Miao " -"(2017), Ma Yong (2018) e zlffcn (2019) e é lançada sob a GPL v2 ou qualquer " -"outra versão posterior." +"(2017), Ma Yong (2018), zlffcn (2019) e EldersJavas (2020) e é lançada sob a " +"GPL v2 ou qualquer outra versão posterior." #. type: Content of: <article><section><para> msgid "" ===================================== documentation/audacity/audacity-manual.pt_PT.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2019-10-28 14:38+0000\n" "Last-Translator: Manuela Silva <mmsrs at sky.com>\n" "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/" @@ -515,8 +515,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.sv.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2019-11-12 15:04+0000\n" "Last-Translator: Mattias Münster <mattiasmun at gmail.com>\n" "Language-Team: Swedish <https://hosted.weblate.org/projects/debian-edu-" @@ -542,8 +542,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.uk.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2018-09-30 16:07+0000\n" "Last-Translator: Володимир Бриняк <bardvv at gmail.com>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/debian-edu-" @@ -583,8 +583,8 @@ msgstr "" #, fuzzy msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "Китайський (спрощений китайський) переклад захищений авторським правом Чжан " "Мяо (2017) і випущений за версією GPL v2 або будь-якою пізнішою версією." ===================================== documentation/audacity/audacity-manual.xml ===================================== @@ -170,7 +170,7 @@ </para> <para>The Swedish translation is copyrighted by Erik Sundin (2016), Anders Jonsson (2018) and Mattias Münster (2019) and is released under the GPL v2 or any later version. </para> -<para>The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any later version. +<para>The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released under the GPL v2 or any later version. </para> <para>The Polish translation is copyrighted by Stanisław Krukowski (2017), Damian Nadolski (2019), Piotrek Pastuszak (2020) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. </para> ===================================== documentation/audacity/audacity-manual.zh.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2020-03-10 13:33+0000\n" "Last-Translator: EldersJavas <eldersjavas at gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" @@ -495,8 +495,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/audacity-manual.zh_Hant.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:35+0000\n" "PO-Revision-Date: 2019-01-26 19:04+0000\n" "Last-Translator: Louies <louies0623 at gmail.com>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" @@ -508,8 +508,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma " -"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any " -"later version." +"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/audacity/source/AllInOne-audacity-manual.xml ===================================== @@ -1 +1 @@ -<?xml version="1.0" encoding="utf-8"?><!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN' 'http://www.docbook.org/xml/4.4/docbookx.dtd'><article><articleinfo><title>DebianEdu/Documentation/Manuals/Audacity/AllInOne72012-02-24 02:26:20David PrévotAdd the intro62009-05-30 15:43:34HolgerLevsen52009-04-08 12:05:23HolgerLevsen42009-03-29 12:43:04Alf Tonny32009-03-16 03:33:07localhostconverted to 1.6 markup22008-12-06 16:36:20Alf Tonny12008-12-06 16:35:39Alf Tonny

Audacity manualThis is a manual for audacity, based on the 1.2.4b-2.1+b1 version from the Debian Edu Etch 3.0 release. The version at is a wiki and updated frequently. Translations are part of the debian-edu-doc package, which can be installed on a webserver, and is available online. CategoryPermalink

Before you startSetup Audacity is not hard, if you remember to setup that Audacity to use Jack, this is to make it possible to run other program that use sound at the same time. How to setup Jack to run smoothly. The guide is here: I used Audacity 1.3.3-Beta when i make this documentation. So to set Audacity to use jack you have to go in the menu --> Edit ---> Preferences. edittojack.png The next thing you have to be aware of that the project rate must be the same sample rate you have set in jack. samplerate.png

PluginsThere are some plugins you probably want: ** audio Plugins ** swh-plugins mcp-plugins terminatorx fixme: put on some audio plugin you have experience with Now you are ready to start recording.

Where do i find audacityWell you can simply just install it with aptitude, and you can also take a look at the projects page here CategoryPermalink

Doing some recordingFirst thing to remember when you do a recording, is that you are careful that the record volume settings, not set to loud. It's better to have to low setting rather to loud on this. recording.png And when you have recorded what you want, you can normalize the recording so the volume automatically set right volume on the record without any danger of have part of the sound overdriven. normalize.png And after you have normalized the recorded segment, it looks like this: normalized.png Now the volume on this recorded segment is corrected. This is a better way to be sure that the record you have done not are overdriven, so have to Low setting and afterwards let audacity fix the volume on it. Now we want to remove noise from the record, maybe some background hiss from your microphone. So first part is to make a "noise profile" of what you want to remove from your recorded segment. 1. First zoom out so you more clearly can see the recording. zoom.png 2. Then mark what you want to make a profile of. Buy left click on mouse and hold down on the segment, and drag. You mark the zone you need to get the profile of. marking.png 3. Then choose that you want to use Noise removal. noiseremoval.png 4. Then Create "noise profile". getnoiseprofile.png 5. Then you choose the whole record by clicking CTRL + A, and choose noise removal again from menu, but this time press OK. Then if you want to add some reverb, other nice effects to your liking, you just search the big menu that is available after you installed the plugins I recommended. You have several way to export your finished result. You can export it as WAV, AIFF MP3, OGG, FLAC, just choose export in the file menu. CategoryPermalink

Importing AudioWith audacity you can import audio of the regular variety: Audio, MIDI, Labels and Raw Data. You can directly import MP3 files into the project, and mixing different song together in audacity. Let me give you example. First my main song "smurfesangen", and then you can import for mixing, one another song, just choose in the menu > > file > > Import Audio, then the newly imported audio will come under your first audio, the possibility to mixing here is huge. mixingaudio.png

Tool sectiontoolbox.png

Selection toolTo split the audio so you can move part of it you have to first with the selection tool, choose where you want to cut it. And then with "ctrl + I" split it. And then with time shift tool you can move the segment.

Zooming toolWith the Zooming tool you can zoom into the audio segment and then manipulate the audio with the drawing tool. manipulating.png

Envelope ToolWith the envelope tool you can manipulate the volume by increasing or decreasing the volume wherever you are on the segment. manipulating1.png

Time Shifting Toolwith this you can move your audio segments around. CategoryPermalink

Copyright and authorsThis document is written and copyrighted by Alf Tonny Bätz (2008, 2009), Holger Levsen (2009) and is released under the GPL2 or any later version. Enjoy! If you add content to it, please only do so if you are the author of it and plan to release it under the same conditions! Then add your name here and release it under the "GPL v2 or any later version" licence.

Translation copyright and authorsThe Bokmål translation is copyrighted by Jon Nordby (2014), Petter Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is released under the GPL v2 or any later version. The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2018, 2019, 2020) and is released under the GPL v2 or any later version. The Swedish translation is copyrighted by Erik Sundin (2016), Anders Jonsson (2018) and Mattias Münster (2019) and is released under the GPL v2 or any later version. The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2017), Damian Nadolski (2019), Piotrek Pastuszak (2020) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. The Czech translation is copyrighted by Jiří Kučera (2017) and is released under the GPL v2 or any later version. The Ukrainian translation is copyrighted by Марс Ямбар (2018), Максим Якимчук (2018) and Володимир Бриняк (2018) and is released under the GPL v2 or any later version. The Brazilian Portuguese translation is copyrighted by Thiago Casotti (2018), Thi (2018) and Wellington Terumi Uemura (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. The Japanese translation is copyrighted by hoxp18 (2019) and is released under the GPL v2 or any later version. The Portuguese translation is copyrighted by Manuela Silva (2019) and is released under the GPL v2 or any later version. CategoryPermalink

Translations of this documentVersions of this document translated into Norwegian Bokmål, French and Dutch are available. Incomplete translations exist for Polish, Swedish and Simplified Chinese. There is an online overview of shipped translations.

Translate using PO filesAs in many free software projects, translations of this document are kept in PO files. More information about the process can be found in /usr/share/doc/debian-edu-doc/README.debian-edu-audacity-manual-translations. The Git repository (see below) contains this file too. Take a look there and at the language specific conventions if you want to help translating this document. To commit your translations you need to be a member of the Salsa project debian-edu. Then check out the debian-edu-doc source using ssh access: git clone git at salsa.debian.org:debian-edu/debian-edu-doc.git If you only want to translate, you need to check out only a few files from Git (which can be done anonymously). Please file a bug against the debian-edu-doc package and attach the PO file to the bugreport. See instructions on how to submit bugs for more information. You can check out the debian-edu-doc source anonymously with the following command (you need to have the git package installed for this to work): git clone https://salsa.debian.org/debian-edu/debian-edu-doc.git Then edit the file documentation/debian-edu-audacity/debian-edu-audacity-manual.$CC.po (replacing $CC with your language code). There are many tools for translating available; we suggest using lokalize. Then you either commit the file directly to Git (if you have the rights to do so) or send the file to the bugreport. To update your local copy of the repository use the following command inside the debian-edu-doc directory: git pull Read /usr/share/doc/debian-edu-doc/README.debian-edu-audacity-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations. Please keep in mind that this manual is still under development, so don't translate any string which contains "FIXME". status ignore Basic information about Salsa (the host where our Git repository is located) and Git is available at . If you are new to Git, look at the Pro Git book; it has a chapter on the recording changes to the repository. Also you might want to look at the gitk package that provides a GUI for Git.

Translate online using a web browserSome language teams have decided to translate via Weblate. See for more information. Please report any problems. CategoryPermalink

Appendix A - The GNU Public License

Audacity manualCopyright (C) 2008,2009 Alf Tonny Bätz < alfton at gmail.com > and others, see the Copyright chapter for the full list of copyright owners. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

GNU GENERAL PUBLIC LICENSEVersion 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS CategoryPermalink

CategoryPermalink

\ No newline at end of file +

DebianEdu/Documentation/Manuals/Audacity/AllInOne72012-02-24 02:26:20David PrévotAdd the intro62009-05-30 15:43:34HolgerLevsen52009-04-08 12:05:23HolgerLevsen42009-03-29 12:43:04Alf Tonny32009-03-16 03:33:07localhostconverted to 1.6 markup22008-12-06 16:36:20Alf Tonny12008-12-06 16:35:39Alf Tonny

PluginsThere are some plugins you probably want: ** audio Plugins ** swh-plugins mcp-plugins terminatorx fixme: put on some audio plugin you have experience with Now you are ready to start recording.

Where do i find audacityWell you can simply just install it with aptitude, and you can also take a look at the projects page here CategoryPermalink

Tool sectiontoolbox.png

Zooming toolWith the Zooming tool you can zoom into the audio segment and then manipulate the audio with the drawing tool. manipulating.png

Envelope ToolWith the envelope tool you can manipulate the volume by increasing or decreasing the volume wherever you are on the segment. manipulating1.png

Time Shifting Toolwith this you can move your audio segments around. CategoryPermalink

Translation copyright and authorsThe Bokmål translation is copyrighted by Jon Nordby (2014), Petter Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is released under the GPL v2 or any later version. The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2018, 2019, 2020) and is released under the GPL v2 or any later version. The Swedish translation is copyrighted by Erik Sundin (2016), Anders Jonsson (2018) and Mattias Münster (2019) and is released under the GPL v2 or any later version. The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2017), Damian Nadolski (2019), Piotrek Pastuszak (2020) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. The Czech translation is copyrighted by Jiří Kučera (2017) and is released under the GPL v2 or any later version. The Ukrainian translation is copyrighted by Марс Ямбар (2018), Максим Якимчук (2018) and Володимир Бриняк (2018) and is released under the GPL v2 or any later version. The Brazilian Portuguese translation is copyrighted by Thiago Casotti (2018), Thi (2018) and Wellington Terumi Uemura (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. The Japanese translation is copyrighted by hoxp18 (2019) and is released under the GPL v2 or any later version. The Portuguese translation is copyrighted by Manuela Silva (2019) and is released under the GPL v2 or any later version. CategoryPermalink

Translate online using a web browserSome language teams have decided to translate via Weblate. See for more information. Please report any problems. CategoryPermalink

Appendix A - The GNU Public License

CategoryPermalink

\ No newline at end of file View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d42d9466390be0f33a81985a2b27305a61c8778a...e4e44721d37b7ae32c0103587063cee84fdc41ae -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d42d9466390be0f33a81985a2b27305a61c8778a...e4e44721d37b7ae32c0103587063cee84fdc41ae You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at salsa.debian.org Sat Mar 28 10:41:41 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 28 Mar 2020 10:41:41 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Rosegarden manual from the wiki. Message-ID: <5e7f29e5d9b2c_78e93fe0a0addc14234083@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc Commits: 17e55dc9 by Holger Levsen at 2020-03-28T11:41:30+01:00 Update Rosegarden manual from the wiki. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 10 changed files: - documentation/rosegarden/rosegarden-manual.es.po - documentation/rosegarden/rosegarden-manual.fr.po - documentation/rosegarden/rosegarden-manual.nb.po - documentation/rosegarden/rosegarden-manual.nl.po - documentation/rosegarden/rosegarden-manual.pl.po - documentation/rosegarden/rosegarden-manual.pot - documentation/rosegarden/rosegarden-manual.xml - documentation/rosegarden/rosegarden-manual.zh.po - documentation/rosegarden/rosegarden-manual.zh_Hant.po - documentation/rosegarden/source/AllInOne-rosegarden-manual.xml Changes: ===================================== documentation/rosegarden/rosegarden-manual.es.po ===================================== @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosegarden Manual Debian Edu\n" "Report-Msgid-Bugs-To: tato at debian.org.sv\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:40+0000\n" "PO-Revision-Date: 2012-01-10 10:33-0600\n" "Last-Translator: Rafael Ernesto Rivas \n" "Language-Team: Spanish \n" @@ -3149,8 +3149,9 @@ msgstr "" #. type: Content of:

===================================== documentation/rosegarden/rosegarden-manual.fr.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.9.20071124\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:40+0000\n" "PO-Revision-Date: 2019-05-14 11:12+0200\n" "Last-Translator: Quentin Lejard \n" "Language-Team: French \n" @@ -3362,18 +3362,14 @@ msgstr "" "Rivas (2011), est distribuée sous GPL version 2 ou toute version ultérieure." #. type: Content of:

-#, fuzzy -#| msgid "" -#| "The Polish translation is copyrighted by Stanisław Krukowski (2017) and " -#| "WaldiS (2018) and is released under the GPL v2 or any later version." msgid "" "The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS " "(2018) and Michal Biesiada (2020) and is released under the GPL v2 or any " "later version." msgstr "" "La traduction polonaise, dont les droits d'auteur appartiennent à Stanisław " -"Krukowski (2017) et WaldiS (2018), est distribuée sous GPL version 2 ou " -"toute version ultérieure." +"Krukowski (2017), WaldiS (2018) et Michal Biesiada (2020), est distribuée " +"sous GPL version 2 ou toute version ultérieure." #. type: Content of:

#, fuzzy @@ -3381,8 +3377,9 @@ msgstr "" #| "The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma " #| "Yong (2019) and is released under the GPL v2 or any later version." msgid "" -"The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma " -"Yong (2019, 2020) and is released under the GPL v2 or any later version." +"The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong " +"(2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any " +"later version." msgstr "" "La traduction chinoise simplifié, dont les droits d'auteur appartiennent à 杨" "玉印 (2018), est distribuée sous GPL version 2 ou toute version ultérieure." ===================================== documentation/rosegarden/rosegarden-manual.nb.po ===================================== @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:40+0000\n" "PO-Revision-Date: 2019-12-11 16:44+0000\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål

-#, fuzzy -#| msgid "" -#| "The Polish translation is copyrighted by Stanisław Krukowski (2017) and " -#| "WaldiS (2018) and is released under the GPL v2 or any later version." msgid "" "The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS " "(2018) and Michal Biesiada (2020) and is released under the GPL v2 or any " "later version." msgstr "" "Rettighetene for den polske oversettelsen tilhører Stanisław Krukowski " -"(2017) og WaldiS (2018) og er utgitt med lisensen GPL v2 eller enhver senere " -"versjon." +"(2017), WaldiS (2018) og Michal Biesiada (2020) og er utgitt med lisensen " +"GPL v2 eller enhver senere versjon." #. type: Content of:

msgid "" -"The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma " -"Yong (2019, 2020) and is released under the GPL v2 or any later version." +"The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong " +"(2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any " +"later version." msgstr "" -"Oversettelsen til kinesisk (forenklet kinesisk) er gjort av 杨玉印 (2018) og " -"Ma Yong (2019, 2020). Den er utgitt under GPL v2 eller senere versjon av lisensen." +"Oversettelsen til kinesisk (forenklet kinesisk) er gjort av 杨玉印 (2018), " +"Ma Yong (2019, 2020) og EldersJavas (2020). Den er utgitt under GPL v2 eller " +"senere versjon av lisensen." #. type: Content of:

msgid "" ===================================== documentation/rosegarden/rosegarden-manual.nl.po ===================================== @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: rosegarden-manual.nl\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:40+0000\n" "PO-Revision-Date: 2020-02-26 21:53+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -3423,12 +3423,14 @@ msgstr "" #. type: Content of:

msgid "" -"The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma " -"Yong (2019, 2020) and is released under the GPL v2 or any later version." +"The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong " +"(2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any " +"later version." msgstr "" "De auteurs, bij wie ook de auteursrechten berusten, van de vertaling naar " -"het vereenvoudigd Chinees zij 杨玉印 (2018) en Ma Yong (2019, 2020). De vertaling " -"is uitgebracht onder de GPL-licentie versie 2 of een latere versie." +"het vereenvoudigd Chinees zij 杨玉印 (2018) en Ma Yong (2019, 2020) en " +"EldersJavas (2020). De vertaling is uitgebracht onder de GPL-licentie versie " +"2 of een latere versie." #. type: Content of:

msgid "" ===================================== documentation/rosegarden/rosegarden-manual.pl.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:40+0000\n" "PO-Revision-Date: 2020-02-21 15:33+0000\n" "Last-Translator: Michal Biesiada \n" "Language-Team: Polish

===================================== documentation/rosegarden/rosegarden-manual.pot ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2940,8 +2940,9 @@ msgstr "" #. type: Content of:

===================================== documentation/rosegarden/rosegarden-manual.xml ===================================== @@ -1397,7 +1397,7 @@ The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS (2018) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. -The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma Yong (2019, 2020) and is released under the GPL v2 or any later version. +The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong (2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. ===================================== documentation/rosegarden/rosegarden-manual.zh.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:40+0000\n" "PO-Revision-Date: 2020-03-10 13:33+0000\n" "Last-Translator: EldersJavas \n" "Language-Team: Chinese (Simplified)

===================================== documentation/rosegarden/rosegarden-manual.zh_Hant.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:27+0000\n" +"POT-Creation-Date: 2020-03-28 10:40+0000\n" "PO-Revision-Date: 2019-01-26 19:04+0000\n" "Last-Translator: Louies \n" "Language-Team: Chinese (Traditional)

===================================== documentation/rosegarden/source/AllInOne-rosegarden-manual.xml ===================================== @@ -16,4 +16,4 @@ Paste function in the context menu (right click). Your Samples have been assigned to the instrument name you made. (Hint: This works like a link; whenever you change sample properties, - this will also take effect in your instrument.)]]>swamiinstrument.png And just repeat the cyclus for each sound, and when you are finished, you just save it. And it's time to use it.

Sample Tuning for Advanced Usersswami1-sample-commented.png When creating a chromatic instrument from a set of samples that cover different pitch ranges (bass, mids, trebles), further actions need to be done to make sure you get a continues sound. You will need information about what note is played in each sample. This reference note can be set either in sample properties, or you can simply move the white marker to the corresponding key. You can hear the effect instantly, when you click on the keyboard: The original pitch is played when you hit the reference note. From here it is bent up or down, depending on the distance you move right or left. When you have set all reference notes for you samples, you should hear notes of the same pitch nonregarding what sample you select! For continuous sounds (like organ, flute, strings), your samples can never be as long as the longest note that might be played when using your soundfont. Therefor it is necessary to define a loop range that is repeated over and over when the musician will keep a key pressed. Again, you can move two markers to find a section of constant amplitude - try to find zero crossings in the sample to prevent disturbing clicks. CategoryPermalink CategorySound

Copyright and authorsThis document is written and copyrighted by Alf Tonny Bätz (2008, 2009), Holger Levsen (2008) and is released under the GPL2 or any later version. Enjoy! If you add content to it, please only do so if you are the author of it and plan to release it under the same conditions! Then add your name here and release it under the "GPL v2 or any later version" licence.

Translation copyright and authorsThe Bokmål translation is copyrighted by Alf Tonny Bätz (2008), Tore Skogly (2008), Petter Reinholdtsen (2014, 2018), Alexander Alemayhu (2014) and Allan Nordhøy (2018) and is released under the GPL v2 or any later version. The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas Vincent (2012), Quentin Lejard (2019) and the French l10n team (2012, 2019) and is released under the GPL v2 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2018-2020) and is released under the GPL v2 or any later version. The Spanish translation is copyrighted by Rafael Rivas (2011) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS (2018) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma Yong (2019, 2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. CategoryPermalink

Translations of this documentVersions of this document translated into Norwegian Bokmål, Dutch and French are available. Incomplete translations exist for Spanish and Polish. There is an online overview of shipped translations.

Translate using PO filesAs in many free software projects, translations of this document are kept in PO files. More information about the process can be found in /usr/share/doc/debian-edu-doc/README.debian-edu-rosegarden-manual-translations. The Git repository (see below) contains this file too. Take a look there and at the language specific conventions if you want to help translating this document. To commit your translations you need to be a member of the Salsa project debian-edu. Then check out the debian-edu-doc source using ssh access: git clone git at salsa.debian.org:debian-edu/debian-edu-doc.git If you only want to translate, you need to check out only a few files from Git (which can be done anonymously). Please file a bug against the debian-edu-doc package and attach the PO file to the bugreport. See instructions on how to submit bugs for more information. You can check out the debian-edu-doc source anonymously with the following command (you need to have the git package installed for this to work): git clone https://salsa.debian.org/debian-edu/debian-edu-doc.git Then edit the file documentation/debian-edu-rosegarden/debian-edu-rosegarden-manual.$CC.po (replacing $CC with your language code). There are many tools for translating available; we suggest using lokalize. Then you either commit the file directly to Git (if you have the rights to do so) or send the file to the bugreport. To update your local copy of the repository use the following command inside the debian-edu-doc directory: git pull Read /usr/share/doc/debian-edu-doc/README.debian-edu-rosegarden-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations. Please keep in mind that this manual is still under development, so don't translate any string which contains "FIXME". status ignore Basic information about Salsa (the host where our Git repository is located) and Git is available at . If you are new to Git, look at the Pro Git book; it has a chapter on the recording changes to the repository. Also you might want to look at the gitk package that provides a GUI for Git.

Translate online using a web browserSome language teams have decided to translate via Weblate. See for more information. Please report any problems. CategoryPermalink

Appendix A - The GNU Public License

Rosegarden manualCopyright (C) 2008, 2009 Alf Tonny Bätz < alfton at gmail.com > and others, see the Copyright chapter for the full list of copyright owners. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

CategoryPermalink

\ No newline at end of file + this will also take effect in your instrument.)]]>swamiinstrument.png And just repeat the cyclus for each sound, and when you are finished, you just save it. And it's time to use it.

Translation copyright and authorsThe Bokmål translation is copyrighted by Alf Tonny Bätz (2008), Tore Skogly (2008), Petter Reinholdtsen (2014, 2018), Alexander Alemayhu (2014) and Allan Nordhøy (2018) and is released under the GPL v2 or any later version. The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas Vincent (2012), Quentin Lejard (2019) and the French l10n team (2012, 2019) and is released under the GPL v2 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2018-2020) and is released under the GPL v2 or any later version. The Spanish translation is copyrighted by Rafael Rivas (2011) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2017), WaldiS (2018) and Michal Biesiada (2020) and is released under the GPL v2 or any later version. The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong (2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. CategoryPermalink

Translate using PO filesAs in many free software projects, translations of this document are kept in PO files. More information about the process can be found in /usr/share/doc/debian-edu-doc/README.debian-edu-rosegarden-manual-translations. The Git repository (see below) contains this file too. Take a look there and at the language specific conventions if you want to help translating this document. To commit your translations you need to be a member of the Salsa project debian-edu. Then check out the debian-edu-doc source using ssh access: git clone git at salsa.debian.org:debian-edu/debian-edu-doc.git If you only want to translate, you need to check out only a few files from Git (which can be done anonymously). Please file a bug against the debian-edu-doc package and attach the PO file to the bugreport. See instructions on how to submit bugs for more information. You can check out the debian-edu-doc source anonymously with the following command (you need to have the git package installed for this to work): git clone https://salsa.debian.org/debian-edu/debian-edu-doc.git Then edit the file documentation/debian-edu-rosegarden/debian-edu-rosegarden-manual.$CC.po (replacing $CC with your language code). There are many tools for translating available; we suggest using lokalize. Then you either commit the file directly to Git (if you have the rights to do so) or send the file to the bugreport. To update your local copy of the repository use the following command inside the debian-edu-doc directory: git pull Read /usr/share/doc/debian-edu-doc/README.debian-edu-rosegarden-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations. Please keep in mind that this manual is still under development, so don't translate any string which contains "FIXME". status ignore Basic information about Salsa (the host where our Git repository is located) and Git is available at . If you are new to Git, look at the Pro Git book; it has a chapter on the recording changes to the repository. Also you might want to look at the gitk package that provides a GUI for Git.

Translate online using a web browserSome language teams have decided to translate via Weblate. See for more information. Please report any problems. CategoryPermalink

Appendix A - The GNU Public License

CategoryPermalink

\ No newline at end of file View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/17e55dc91e63d91bea0558e151ca111866d137de -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/17e55dc91e63d91bea0558e151ca111866d137de You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at salsa.debian.org Sat Mar 28 10:44:58 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 28 Mar 2020 10:44:58 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Debian Edu Bullseye manual from the wiki. Message-ID: <5e7f2aab189fa_78e92b1ca68d8888234392@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc Commits: 73d08e9d by Holger Levsen at 2020-03-28T11:44:43+01:00 Update Debian Edu Bullseye manual from the wiki. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 15 changed files: - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.da.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.de.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.es.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.fr.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.it.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ja.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nb.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nl.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pl.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pot - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ro.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po - documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh_Hant.po - documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml Changes: ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.da.po ===================================== @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-bullseye-manual\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2019-07-07 20:30+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -8756,8 +8756,8 @@ msgstr "" #| "under the GPL v2 or any later version." msgid "" "The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " -"Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any " -"later version." +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013, " "2014, 2015, 2016, 2019,2020) og er udgivet under GPL version 2 eller enhver " ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.de.po ===================================== @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-buster-manual.de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2020-02-21 21:50+0100\n" "Last-Translator: Wolfgang Schweer \n" "Language-Team: German \n" @@ -8356,12 +8356,12 @@ msgstr "" #. type: Content of:

msgid "" "The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " -"Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any " -"later version." +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "Die chinesische Übersetzung (vereinfachte Schriftzeichen) wurde verfasst von " -"Ma Yong (2016-2020), Boyuan Yang (2017) und Roy Zhang (2017); sie ist unter " -"der GPL v2 oder einer späteren Version lizenziert." +"Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) und EldersJavas " +"(2020); sie ist unter der GPL v2 oder einer späteren Version lizenziert." #. type: Content of:

msgid "" ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.es.po ===================================== @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2015-03-30 22:30+0000\n" "Last-Translator: Rafael Ernesto Rivas \n" "Language-Team: Debian Spanish \n" @@ -8085,8 +8085,8 @@ msgstr "" #. type: Content of:

===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.fr.po ===================================== @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2019-11-10 12:03+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" @@ -9056,8 +9056,8 @@ msgstr "" #| "under the GPL v2 or any later version." msgid "" "The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " -"Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any " -"later version." +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "La traduction en chinois simplifié, dont les droits d'auteur appartiennent à " "Ma Yong (2016, 2017, 2018, 2019, 2020), Boyuan Yang (2017) et Roy Zhang " ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.it.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-wheezy-manual\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2019-11-24 18:52+0100\n" "Last-Translator: Claudio Carboncini \n" "Language-Team: Italian \n" @@ -8877,8 +8877,8 @@ msgstr "" #| "under the GPL v2 or any later version." msgid "" "The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " -"Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any " -"later version." +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "La traduzione in cinese semplificato è protetta da copyright di Ma Yong " "(2016, 2017, 2018, 2019, 2020), Boyuan Yang (2017) e Roy Zhang (2017), " ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ja.po ===================================== @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-stretch\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2019-06-08 10:11+0000\n" "Last-Translator: hoxp18 \n" "Language-Team: Japanese \n" "Language-Team: Norwegian Bokmål \n" "Language-Team: Debian Dutch l10n Team \n" @@ -34,7 +34,6 @@ msgid "Manual for Debian Edu 11 Codename Bullseye" msgstr "Handleiding voor Debian Edu 11 codenaam Bullseye" #. type: Content of:

-#| msgid "./images/23-Tjener-Login.png" msgid "{{attachment:23-Tjener-Login.png}}" msgstr "{{attachment:23-Tjener-Login.png}}" @@ -1894,7 +1893,6 @@ msgstr "" "emphasis>" #. type: Content of:

-#| msgid "01-Installer_64bit_boot_menu.png" msgid "{{attachment:01-Installer_64bit_boot_menu.png}}" msgstr "{{attachment:01-Installer_64bit_boot_menu.png}}" @@ -1927,7 +1925,6 @@ msgstr "" "van het installatieprogramma. Zie de schermafdrukken hieronder." #. type: Content of:

-#| msgid "./images/01a-Installer_64bit_advanced_options.png" msgid "{{attachment:01a-Installer_64bit_advanced_options.png}}" msgstr "{{attachment:01a-Installer_64bit_advanced_options.png}}" @@ -1995,7 +1992,6 @@ msgid "Help screen" msgstr "Hulpscherm" #. type: Content of:

-#| msgid "./images/01c-Installer_help.png" msgid "{{attachment:01c-Installer_help.png}}" msgstr "{{attachment:01c-Installer_help.png}}" @@ -2026,7 +2022,6 @@ msgstr "" "\">Grafische installatie." #. type: Content of:

-#| msgid "./images/01b-Installer_64bit_command_line.png" msgid "{{attachment:01b-Installer_64bit_command_line.png}}" msgstr "{{attachment:01b-Installer_64bit_command_line.png}}" @@ -2384,9 +2379,6 @@ msgstr "" #. type: CDATA #, no-wrap -#| msgid "" -#| "deb http://deb.debian.org/debian/ bullseye main \n" -#| "deb http://security.debian.org/ bullseye/updates main" msgid "" "deb http://deb.debian.org/debian/ bullseye main \n" "deb http://security.debian.org/ bullseye-security/updates main" @@ -2436,8 +2428,6 @@ msgstr "" "situatie:" #. type: Content of:

-#| msgid "" -#| "sudo cp debian-edu-amd64-XXX.iso /dev/sdX" msgid "" "sudo cat debian-edu-amd64-XXX.iso > /dev/sdX" @@ -2504,7 +2494,6 @@ msgstr "" "uitsluitend het hoofdserverprofiel, ziet het menu van PXE er zo uit:" #. type: Content of:

-#| msgid "./images/30-Main-Server-GRUB_Boot_menu-PXE.png" msgid "{{attachment:30-Main-Server-GRUB_Boot_menu-PXE.png}}" msgstr "{{attachment:30-Main-Server-GRUB_Boot_menu-PXE.png}}" @@ -2519,7 +2508,6 @@ msgstr "" "als volgt uit:" #. type: Content of:

-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png" msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}" msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}" @@ -2716,92 +2704,74 @@ msgstr "" "respectievelijk het netwerk voor werkstations en dat voor LTSP-clients:" #. type: Content of:

-#| msgid "02-select_a_language.png" msgid "{{attachment:02-select_a_language.png}}" msgstr "{{attachment:02-select_a_language.png}}" #. type: Content of:

-#| msgid "03-select_your_location.png" msgid "{{attachment:03-select_your_location.png}}" msgstr "{{attachment:03-select_your_location.png}}" #. type: Content of:

-#| msgid "04-Configure_the_keyboard.png" msgid "{{attachment:04-Configure_the_keyboard.png}}" msgstr "{{attachment:04-Configure_the_keyboard.png}}" #. type: Content of:

-#| msgid "07-Detect_network_hardware.png" msgid "{{attachment:07-Detect_network_hardware.png}}" msgstr "{{attachment:07-Detect_network_hardware.png}}" #. type: Content of:

-#| msgid "08-Choose_Debian_Edu_profile.png" msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}" msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}" #. type: Content of:

-#| msgid "09-Really_use_the_automatic_partitioning_tool.png" msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}" msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}" #. type: Content of:

-#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png" msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}" msgstr "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}" #. type: Content of:

-#| msgid "11-Participate_in_the_package_usage_survey.png" msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}" msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}" #. type: Content of:

-#| msgid "12-Set_up_users_and_passwords.png" msgid "{{attachment:12-Set_up_users_and_passwords.png}}" msgstr "{{attachment:12-Set_up_users_and_passwords.png}}" #. type: Content of:

-#| msgid "12a-Set_up_users_and_passwords.png" msgid "{{attachment:12a-Set_up_users_and_passwords.png}}" msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}" #. type: Content of:

-#| msgid "12b-Set_up_users_and_passwords.png" msgid "{{attachment:12b-Set_up_users_and_passwords.png}}" msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}" #. type: Content of:

-#| msgid "12c-Set_up_users_and_passwords.png" msgid "{{attachment:12c-Set_up_users_and_passwords.png}}" msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}" #. type: Content of:

-#| msgid "12d-Setting-up-the-partitioner.png" msgid "{{attachment:12d-Setting-up-the-partitioner.png}}" msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}" #. type: Content of:

-#| msgid "13-Install the base system.png" msgid "{{attachment:13-Install the base system.png}}" msgstr "{{attachment:13-Install the base system.png}}" #. type: Content of:

-#| msgid "14-Select_and_install_software.png" msgid "{{attachment:14-Select_and_install_software.png}}" msgstr "{{attachment:14-Select_and_install_software.png}}" #. type: Content of:

-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png" msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}" msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}" #. type: Content of:

-#| msgid "20-Finish_the_Installation.png" msgid "{{attachment:20-Finish_the_Installation.png}}" msgstr "{{attachment:20-Finish_the_Installation.png}}" #. type: Content of:

-#| msgid "21-Finish_the_Installation-Installation_complete.png" msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}" msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}" @@ -4945,10 +4915,6 @@ msgstr "Na het heropstarten heeft u nog wat extra opruimwerk:" #. type: CDATA #, no-wrap -#| msgid "" -#| "apt purge linux-image-4.9.0-*\n" -#| "apt purge linux-headers-4.9.0-*\n" -#| "apt --purge autoremove" msgid "" "apt purge linux-image-4.19.0-*\n" "apt purge linux-headers-4.19.0-*\n" @@ -5491,10 +5457,6 @@ msgid "run exportfs -r" msgstr "het commando exportfs -r uitvoeren" #. type: Content of:

-#| msgid "" -#| "This is how the PXE menu looks with the Main " -#| "Server and LTSP Server " -#| "profiles:" msgid "" "Workstation, esp. any separate or " "additional LTSP server" @@ -5648,9 +5610,6 @@ msgstr "Backports gebruiken is zeer eenvoudig:" #. type: CDATA #, no-wrap -#| msgid "" -#| "echo \"deb http://deb.debian.org/debian/ bullseye-backports main\" >> /etc/apt/sources.list\n" -#| "apt-get update" msgid "" "echo \"deb http://deb.debian.org/debian/ buster-backports main\" >> /etc/apt/sources.list\n" "apt-get update" @@ -5669,7 +5628,6 @@ msgstr "" #. type: CDATA #, no-wrap -#| msgid "apt-get install -t bullseye-backports tuxtype" msgid "apt install -t buster-backports tuxtype" msgstr "apt install -t buster-backports tuxtype" @@ -6032,33 +5990,24 @@ msgstr "" "om de howto's te verplaatsen en ze onder de GPL-licentie te plaatsen.)" #. type: Content of:

-#| msgid "" -#| "" msgid "" msgstr "" "" #. type: Content of:

-#| msgid "" msgid "" msgstr "" #. type: Content of:

-#| msgid "" -#| "" msgid "" msgstr "" "" #. type: Content of:

-#| msgid "" msgid "" msgstr "" #. type: Content of:

-#| msgid "" -#| "" msgid "" "" @@ -8133,7 +8082,6 @@ msgid "in English" msgstr "in het Engels" #. type: Content of:

-#| msgid "" msgid "" msgstr "" @@ -8559,12 +8507,13 @@ msgstr "" #. type: Content of:

msgid "" "The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " -"Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any " -"later version." +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" "De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten " -"bij Ma Yong (2016-2020), Boyuan Yang (2017) en Roy Zhang (2017). De " -"vertaling is vrijgegeven onder de licentie GPL v2 of een latere versie." +"bij Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) en EldersJavas " +"(2020). De vertaling is vrijgegeven onder de licentie GPL v2 of een latere " +"versie." #. type: Content of:

msgid "" @@ -8728,8 +8677,8 @@ msgstr "" "bestand voor uw taal als er zo nog geen bestaat. U vindt er ook informatie " "over hoe u vertalingen moet bijwerken." -#. -#. status ignore +#. +#. status ignore #. type: Content of:

msgid "" "Please keep in mind that this manual is still under development, so don't " ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pl.po ===================================== @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Polish (Debian Edu Documentation)\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2019-11-07 14:04+0000\n" "Last-Translator: Adrian Bystrek \n" "Language-Team: Polish

===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pot ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6066,8 +6066,8 @@ msgstr "" #. type: Content of:

===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ro.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2019-12-11 17:02+0000\n" "Last-Translator: Catalin ENE \n" "Language-Team: Romanian

===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml ===================================== @@ -2957,7 +2957,7 @@ FIXME check/update version numbers for next entries The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is released under the GPL v2 or any later version. -The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any later version. +The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2020-03-26 11:45+0000\n" "Last-Translator: Ma Yong \n" "Language-Team: Chinese (Simplified)

msgid "Using backports to install newer software" @@ -5383,8 +5384,9 @@ msgid "" "users who are not currently logged into the machine. It's run by cron job " "once an hour." msgstr "" -"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl " -"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。" +"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl 脚本。后台" +"作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作" +"业。" #. type: Content of: <article><section><section><title> msgid "Automatic installation of security upgrades" @@ -5453,9 +5455,10 @@ msgid "" "computeroutput>; the other requires clients to have support for wake-on-lan, " "and the server to know about all the clients that need to be woken up." msgstr "" -"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-" -"wakeup</computeroutput> 支持的主板和 BIOS " -"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。" +"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，" +"而且是由 <computeroutput>nvram-wakeup</computeroutput> 支持的主板和 BIOS 版" +"本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客" +"户端。" #. type: Content of: <article><section><section><section><title> msgid "How to set up shutdown-at-night" @@ -5475,12 +5478,14 @@ msgid "" "fail to pass on packets to clients that are missing in the ARP table on the " "switch, and this blocks the WOL packets." msgstr "" -"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-" -"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname " -"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 " -"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS " -"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 " -"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。" +"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-" +"at-night</computeroutput> 相关，或添加主机名（那，是从客户端 " +"‘<computeroutput>uname -n</computeroutput>’ 输出的）到网络组 “shutdown-at-" +"night-hosts”。可以使用 <computeroutput>GOsa²</computeroutput> web 工具完成向 " +"LDAP 中的网络组添加主机。客户端可能需要 BIOS 中有网络唤醒的配置。还重要的是即" +"使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户" +"端传送 WOL 包。一些交换机向交换机上 ARP 表中缺失的客户端传递包失败，而这阻塞 " +"WOL 包。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5718,10 +5723,11 @@ msgid "" "Students'). Save it clicking 'Ok'. Now the new department (2014) should show " "up below /Students. Click it." msgstr "" -"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 " -"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students " -"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）" -"应该在 /Students 之下显示。点击它。" +"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/" +"Students’。从下拉框 ‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）" +"和 Description 字段（students graduating in 2014）的值，忽略 Base 字段像是" +"（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）应该在 /Students 之" +"下显示。点击它。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Group" @@ -5733,8 +5739,8 @@ msgid "" "(leave 'Base' as is, should be /Students/2014) and click the check box left " "of 'Samba group'. 'Ok' to save it." msgstr "" -"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）" -"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" +"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，" +"应该是 /Students/2014）并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Template" @@ -5751,9 +5757,10 @@ msgid "" "template." msgstr "" "从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 " -"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ " -"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba " -"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。" +"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ 模" +"板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自" +"己的结构），留意显示在 Generic，POSIX 和 Samba 选项卡内所有条目，可能需要准备" +"有关新模板信息的屏幕快照。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5761,8 +5768,9 @@ msgid "" "start to fill in your desired values, first the Generic tab (add your new " "2014 group under Group Membership, too), then add POSIX and Samba account." msgstr "" -"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（" -"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。" +"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的" +"值，首先 Generic 选项卡（还要在 Group Membership 下面添加新的 2014 组），然后" +"添加 POSIX 和 Samba 帐户。" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> msgid "Import users" @@ -5795,8 +5803,8 @@ msgid "" "can hand in an assignment by saving the file to the folder \"assignments\" " "where teachers are given write access to be able to make comments." msgstr "" -"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 " -"“assignments” 文件夹保存该文件来提交一个指定任务。" +"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向" +"给予教师写权限而能作注释的 “assignments” 文件夹保存该文件来提交一个指定任务。" #. type: CDATA #, no-wrap @@ -5832,7 +5840,9 @@ msgid "" "When users insert a USB drive or a DVD / CD-ROM into a (diskless) " "workstation, a popup window appears asking what to do with it, just like in " "any other normal installation." -msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。" +msgstr "" +"当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何" +"使用它，就像在任何其他标准安装上的一样。" #. type: Content of: <article><section><section><section><para> msgid "" @@ -5857,7 +5867,9 @@ msgstr "" msgid "" "If remote users acknowledge the popup or use pmount from the console, they " "can even mount the removable devices and access the files." -msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。" +msgstr "" +"如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问" +"其文件。" #. type: Content of: <article><section><section><title> msgid "Use a dedicated storage server" @@ -5882,8 +5894,8 @@ msgid "" "intern' is configured, check if the NFS export points on the new storage " "server are exported to the relevant subnets or machines:" msgstr "" -"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS " -"导出点是否被导出到相关子网或机器：" +"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之" +"后，检查新存储服务器上的 NFS 导出点是否被导出到相关子网或机器：" #. type: CDATA #, no-wrap @@ -5952,7 +5964,8 @@ msgid "" "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern " "does not use automount to avoid mounting loops:" msgstr "" -"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环：" +"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 " +"automount 来避免挂载循环：" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" @@ -6040,8 +6053,8 @@ msgid "" "alice, jane, bob and john from everywhere and for all other users only from " "the internal networks by adding these lines:" msgstr "" -"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john " -"从各处以及所有用户从内网连接：" +"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob " +"和 john 从各处以及所有用户从内网连接：" #. type: CDATA #, no-wrap @@ -6059,8 +6072,9 @@ msgid "" "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP " "server(s) as well." msgstr "" -"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP " -"客户端网络也会获得 ssh 访问 LTSP 服务器。" +"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访" +"问。注意：有人连接着他的分隔区域到专用 LTSP 客户端网络也会获得 ssh 访问 LTSP " +"服务器。" #. type: Content of: <article><section><section><section><title> msgid "A note for more complex setups" @@ -6123,8 +6137,8 @@ msgid "" "LTSP chroot as well. LDM supports all desktop environments. First use " "<emphasis>Preferences</emphasis> to choose the language, then login." msgstr "" -"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 " -"<emphasis>Preferences</emphasis> 选择语言，然后登录。" +"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所" +"有桌面环境。首先使用 <emphasis>Preferences</emphasis> 选择语言，然后登录。" #. type: Content of: <article><section><section><title> msgid "Playing DVDs" @@ -7710,8 +7724,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " -"Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any " -"later version." +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh_Hant.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-28 15:25+0000\n" +"POT-Creation-Date: 2020-03-28 10:44+0000\n" "PO-Revision-Date: 2019-01-28 08:11+0000\n" "Last-Translator: Louies <louies0623 at gmail.com>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" @@ -6173,8 +6173,8 @@ msgstr "" #. type: Content of: <article><section><para> msgid "" "The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " -"Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any " -"later version." +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " +"under the GPL v2 or any later version." msgstr "" #. type: Content of: <article><section><para> ===================================== documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml ===================================== @@ -153,5 +153,5 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s sudo service xrdp restart]]></screen></section><section><title>X2GoX2Go enables you to access a graphical desktop on the LTSP server over both low bandwidth and high bandwidth connections from a PC running Linux, Windows or macOS. Additional software is needed on the client side, see the X2Go wiki for more information. Please note that the killer package should best be removed on the LTSP server if X2Go is used, see 890517.

Available Remote Desktop clientsfreerdp-x11 is installed by default and is capable of RDP and VNC. RDP - the easiest way to access Windows terminal server. An alternative client package is rdesktop. VNC client (Virtual Network Computer) gives access to Skolelinux remotely. An alternative client package is xvncviewer. x2goclient is a graphical client for the X2Go system (not installed by default). You can use it to connect to running sessions and start new ones. Citrix ICA client HowTo to access Windows terminal server from Skolelinux. CategoryPermalink

Samba in Debian Edu/!\ Please read the information provided on the Samba wiki about supported Windows versions, needed registry patches and other procedures before proceeding. Samba has been fully prepared for use as an NT4-style domain controller. After a machine has joined the domain, this machine can be fully managed with GOsa².

Getting StartedThis documentation presumes that you have installed the Debian Edu main server and also a Debian Edu workstation. We presume that you have already created some users that can login and use the Debian Edu workstation. We also presume that you have a Windows workstation at hand, so you can test access to the Debian Edu main server from a Windows machine. After installation of the Debian Edu main server the Samba host \\TJENER should be visible in your Windows Network Neighbourhood. Debian Edu's Windows domain is SKOLELINUX. Use a Windows machine (or a Linux system with smbclient) to browse your Windows/Samba network environment. START -> Run command enter \\TJENER and press return -> a Windows Explorer window should open and show the netlogon share on \\TJENER, and maybe printers you already have configured for printing under Unix/Linux (CUPS queues).

Accessing files via SambaStudent and teacher user accounts that have been configured via GOsa² should be able to authenticate against \\TJENER\HOMES or \\TJENER\<username> and access their home directories even with Windows machines not joined to the Windows SKOLELINUX domain. START -> Run command enter \\TJENER\HOMES or \\TJENER\<username> and press return enter your login credentials (username, password) in the authentication dialog window that appears -> a Windows Explorer window should open and show files and folders in your Debian Edu home directory. By default only the [homes] and the [netlogon] shares are exported; further share examples for students and teachers can be found in /etc/samba/smb-debian-edu.conf on your Debian Edu main server.

Domain MembershipTo use Samba on TJENER as a domain controller, your network's Windows workstations have to join the SKOLELINUX domain provided by the Debian Edu main server. The first thing you have to do is to enable the SKOLELINUX\Administrator account. This account is not intended for day-to-day usage; its current main purpose is to add Windows machines to the SKOLELINUX domain. To enable this account log on to TJENER as the first user (created during main server installation) and run this command: $ sudo smbpasswd -e Administrator The password of SKOLELINUX\Administrator has been preconfigured during the main server's installation. Please use the system's root account when authenticating as SKOLELINUX\Administrator. Once you are done with your administrative work make sure to disable the SKOLELINUX\Administrator account again: $ sudo smbpasswd -d Administrator

Windows hostnameMake sure your Windows machine has the name that you want to use in the SKOLELINUX domain. If not, rename it first (and then reboot). The NetBIOS host name of the Windows machine will later on be used in GOsa² and cannot be changed there (without breaking the domain membership for this machine).

First Domain LogonDebian Edu ships some logon scripts that pre-configure the Windows user profile on first logon. When logging on to a Windows workstation that has joined the SKOLELINUX domain for the first time the following tasks are run: copy the user's Firefox profile to a separate location and register that with Mozilla Firefox on Windows set up Web-Proxy and start page in Firefox set up Web-Proxy and start page in IE add a MyHome icon to the Desktop that points to drive H: and opens Windows Explorer on double-click Other tasks are run on every logon. For further information on this, please refer to the /etc/samba/netlogon folder on your Debian Edu main server. CategoryPermalink

HowTos for teaching and learningAll Debian packages mentioned in this section can be installed by running apt install <package> (as root).

Teaching Programmingstable/education-development is a meta package depending on a lot of programming tools. Please note that almost 2 GiB of disk space is needed if this package is installed. For more details (maybe to install only a few packages), see the Debian Edu Development packages page.

Monitoring pupils/!\ Warning: make sure you know the status of the laws about monitoring and restricting computer users' activities in your jurisdiction. Some schools use control tools like Epoptes or Veyon to supervise their students. See also: Epoptes Homepage and Veyon Homepage. To get full Epoptes support, these steps are required.

Restricting pupils' network accessSome schools use Squidguard or Dansguardian to restrict Internet access. CategoryPermalink

HowTos for users

Changing passwordsEvery user should change her or his password by using GOsa². To do so, just use a browser and go to https://www/gosa/. Using GOsa² to change the password ensures that passwords for Kerberos (krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) are the same. Changing passwords using PAM is working also at the GDM login prompt, but this will only update the Kerberos password, and not the Samba and GOsa² (LDAP) password. So after you changed your password at the login prompt, you really should also change it using GOsa².

Running standalone Java applicationsStandalone Java applications are supported out of the box by the OpenJDK Java runtime.

Using emailAll users can send and receive mails within the internal network; certificates are provided to allow TLS secured connections. To allow mail outside the internal network, the administrator needs to configure the mailserver exim4 to suit the local situation, starting with dpkg-reconfigure exim4-config. Every user who wants to use Thunderbird needs to configure it as follows. For a user with username jdoe the internal email address is jdoe at postoffice.intern.

ThunderbirdStart Thunderbird Click 'Skip this and use my existing email' Enter your email address Don't enter your password as Kerberos single sign on will be used Click 'Continue' For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/GSSAPI'; adjust if not detected automatically Click 'Done'

Obtaining a Kerberos ticket to read email on diskless workstationsIf working on a diskless workstation, you don't have a Kerberos TGT by default. To get one, click the credentials button in the system tray. Enter your password and the ticket will be granted. CategoryPermalink

Contribute

Contribute locallyCurrently there are local teams in Norway, Germany, the region of Extremadura in Spain, Taiwan and France. "Isolated" contributors and users exist in Greece, the Netherlands, Japan and elsewhere. The support chapter has explanations and links to localised resources, as contribute and support are two sides of the same coin.

Contribute globallyInternationally we are organised into various teams working on different subjects. Most of the time, the developer mailing list is our main medium for communication, though we have monthly IRC meetings on #debian-edu on irc.debian.org and even, less frequently, real gatherings, where we meet each other in person. New contributors should read our . A good way to learn what is happening in the development of Debian Edu is to subscribe to the commit mailinglist.

Documentation writers and translatorsThis document needs your help! First and foremost, it is not finished yet: if you read it, you will notice various FIXMEs within the text. If you happen to know (a bit of) what needs to be explained there, please consider sharing your knowledge with us. The source of the text is a wiki and can be edited with a simple webbrowser. Just go to and you can contribute easily. Note: a user account is needed to edit the pages; you need to create a wiki user first. Another very good way to contribute and to help users is by translating software and documentation. Information on how to translate this document can be found in the translations chapter of this book. Please consider helping the translation effort of this book! CategoryPermalink

Support

Volunteer based support

in English - support mailing list #debian-edu on irc.debian.org - IRC channel, mostly development related; do not expect real time support even though it frequently happens :-)

in Norwegian - support mailing list - mailing list for the development member organisation in Norway (FRISK) #skolelinux on irc.debian.org - IRC channel to support Norwegian users

in German - support mailing list - official German representation #skolelinux.de on irc.debian.org - IRC channel to support German users

in French - support mailing list

Professional supportLists of companies providing professional support are available from . CategoryPermalink

New features in Debian Edu Bullseye

New features for Debian Edu 11 Codename Bullseye

Installation changesNew version of debian-installer from Debian Bullseye, see its installation manual for more details. FIXME artwork theme * New artwork based on the futurePrototype theme, the default artwork for Debian 11 Bullseye. The debian-installer doesn't support LTSP chroot setup anymore.

Software updatesFIXME check/update version numbers for next entries Everything which is new in Debian 11 Bullseye, eg: Linux kernel 5.4 Desktop environments KDE Plasma Workspace 5.17, GNOME 3.30, Xfce 4.14, LXDE 0.99.2, MATE 1.22 Firefox-ESR 68 and Chromium 79 LibreOffice 6.4 Educational toolbox GCompris 0.97 Music creator Rosegarden 19.12 GOsa 2.74 LTSP 21 Debian Bullseye includes more than 57000 packages available for installation. More information about Debian 11 Bullseye is provided in the release notes and the installation manual.

Documentation and translation updatesThe profile choice page is available in 29 languages, of which 19 are fully translated. The Debian Edu Bullseye Manual is fully translated to French, German, Italian, Danish, Dutch, Norwegian Bokmål and Japanese. Partly translated versions exist for Polish, Spanish, Simplified Chinese and Traditional Chinese.

Other changes compared to the previous releaseImproved TLS/SSL support inside the internal network. On clients, the Debian Edu rootCA certificate is now contained in the system-wide certificate bundle. New LTSP, re-written from scratch, dropping thin client support. Thin clients are now supported using X2Go.

Known issuessee the Debian Edu Bullseye status page. CategoryPermalink

Copyright and authorsThis document is written and copyrighted by Holger Levsen (2007-2020), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012-2020), Bernhard Hammes (2012) and Joe Hansen (2015) and is released under the GPL2 or any later version. Enjoy! If you add content to it, please only do so if you are the author. You need to release it under the same conditions! Then add your name here and release it under the "GPL v2 or any later version" licence.

Translation copyright and authorsThe Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012, 2015) and Norman Garcia (2010, 2012, 2013) and is released under the GPL v2 or any later version. The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, 2014, 2015, 2016, 2017, 2018, 2019), 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, 2017), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014), Ragnar Wisløff (2014) and Allan Nordhøy (2018-2020) and is released under the GPL v2 or any later version. The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012-2020) and is released under the GPL v2 or any later version. The Italian translation is copyrighted by Claudio Carboncini (2007-2019) and Beatrice Torracca (2013, 2014) and is released under the GPL v2 or any later version. The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012-2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is released under the GPL v2 or any later version. The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, 2016, 2019) and is released under the GPL v2 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and is released under the GPL v2 or any later version. The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 (2019) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is released under the GPL v2 or any later version. The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. The Romanian translation is copyrighted by Catalin Ene (2019) and is released under the GPL v2 or any later version. CategoryPermalink

Translations of this documentVersions of this document translated into German, Italian, French, Danish, Dutch, Norwegian Bokmål and Japanese are available. Incomplete translations exist for Spanish, Polish and Simplified Chinese. There is an online overview of shipped translations.

HowTo translate this document

Translate using PO filesAs in many free software projects, translations of this document are kept in PO files. More information about the process can be found in /usr/share/doc/debian-edu-doc/README.debian-edu-buster-manual-translations. The Git repository (see below) contains this file too. Take a look there and at the language specific conventions if you want to help translating this document. To commit your translations you need to be a member of the Salsa project debian-edu. Then check out the debian-edu-doc source using ssh access: git clone git at salsa.debian.org:debian-edu/debian-edu-doc.git If you only want to translate, you need to check out only a few files from Git (which can be done anonymously). Please file a bug against the debian-edu-doc package and attach the PO file to the bugreport. See instructions on how to submit bugs for more information. You can check out the debian-edu-doc source anonymously with the following command (you need to have the git package installed for this to work): git clone https://salsa.debian.org/debian-edu/debian-edu-doc.git Then edit the file documentation/debian-edu-buster/debian-edu-buster-manual.$CC.po (replacing $CC with your language code). There are many tools for translating available; we suggest using lokalize. Then you either commit the file directly to Git (if you have the rights to do so) or send the file to the bugreport. To update your local copy of the repository use the following command inside the debian-edu-doc directory: git pull Read /usr/share/doc/debian-edu-doc/README.debian-edu-buster-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations. Please keep in mind that this manual is still under development, so don't translate any string which contains "FIXME". status ignore Basic information about Salsa (the host where our Git repository is located) and Git is available at . If you are new to Git, look at the Pro Git book; it has a chapter on the recording changes to the repository. Also you might want to look at the gitk package that provides a GUI for Git.

Translate online using a web browserSome language teams have decided to translate via Weblate. See for more information. Please report any problems. CategoryPermalink

Appendix A - The GNU General Public License

Restricting pupils' network accessSome schools use Squidguard or Dansguardian to restrict Internet access. CategoryPermalink

HowTos for users

Running standalone Java applicationsStandalone Java applications are supported out of the box by the OpenJDK Java runtime.

Contribute

Support

Volunteer based support

in English - support mailing list #debian-edu on irc.debian.org - IRC channel, mostly development related; do not expect real time support even though it frequently happens :-)

in Norwegian - support mailing list - mailing list for the development member organisation in Norway (FRISK) #skolelinux on irc.debian.org - IRC channel to support Norwegian users

in German - support mailing list - official German representation #skolelinux.de on irc.debian.org - IRC channel to support German users

in French - support mailing list

Professional supportLists of companies providing professional support are available from . CategoryPermalink

New features in Debian Edu Bullseye

New features for Debian Edu 11 Codename Bullseye

Known issuessee the Debian Edu Bullseye status page. CategoryPermalink

Translation copyright and authorsThe Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012, 2015) and Norman Garcia (2010, 2012, 2013) and is released under the GPL v2 or any later version. The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, 2014, 2015, 2016, 2017, 2018, 2019), 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, 2017), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014), Ragnar Wisløff (2014) and Allan Nordhøy (2018-2020) and is released under the GPL v2 or any later version. The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012-2020) and is released under the GPL v2 or any later version. The Italian translation is copyrighted by Claudio Carboncini (2007-2019) and Beatrice Torracca (2013, 2014) and is released under the GPL v2 or any later version. The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012-2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is released under the GPL v2 or any later version. The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, 2016, 2019) and is released under the GPL v2 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and is released under the GPL v2 or any later version. The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 (2019) and is released under the GPL v2 or any later version. The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is released under the GPL v2 or any later version. The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released under the GPL v2 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. The Romanian translation is copyrighted by Catalin Ene (2019) and is released under the GPL v2 or any later version. CategoryPermalink

HowTo translate this document

Translate using PO filesAs in many free software projects, translations of this document are kept in PO files. More information about the process can be found in /usr/share/doc/debian-edu-doc/README.debian-edu-buster-manual-translations. The Git repository (see below) contains this file too. Take a look there and at the language specific conventions if you want to help translating this document. To commit your translations you need to be a member of the Salsa project debian-edu. Then check out the debian-edu-doc source using ssh access: git clone git at salsa.debian.org:debian-edu/debian-edu-doc.git If you only want to translate, you need to check out only a few files from Git (which can be done anonymously). Please file a bug against the debian-edu-doc package and attach the PO file to the bugreport. See instructions on how to submit bugs for more information. You can check out the debian-edu-doc source anonymously with the following command (you need to have the git package installed for this to work): git clone https://salsa.debian.org/debian-edu/debian-edu-doc.git Then edit the file documentation/debian-edu-buster/debian-edu-buster-manual.$CC.po (replacing $CC with your language code). There are many tools for translating available; we suggest using lokalize. Then you either commit the file directly to Git (if you have the rights to do so) or send the file to the bugreport. To update your local copy of the repository use the following command inside the debian-edu-doc directory: git pull Read /usr/share/doc/debian-edu-doc/README.debian-edu-buster-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations. Please keep in mind that this manual is still under development, so don't translate any string which contains "FIXME". status ignore Basic information about Salsa (the host where our Git repository is located) and Git is available at . If you are new to Git, look at the Pro Git book; it has a chapter on the recording changes to the repository. Also you might want to look at the gitk package that provides a GUI for Git.

Translate online using a web browserSome language teams have decided to translate via Weblate. See for more information. Please report any problems. CategoryPermalink

Appendix A - The GNU General Public License

Manual for Debian Edu 11 Codename BullseyeCopyright (C) 2007-2018 Holger Levsen < holger at layer-acht.org > and others, see the Copyright chapter for the full list of copyright owners. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Appendix B - no Debian Edu Live CD/DVDs for Bullseye yet/!\ Debian Edu Live CD/DVDs for Bullseye are not available at the moment.

Features of the Standalone imageXFCE desktop All packages from the Standalone profile All packages from the laptop task

Features of the Workstation imageXFCE desktop All packages from the Workstation profile All packages from the laptop task

Activating translations and regional supportTo activate a specific translation, boot using locale=ll_CC.UTF-8 as a boot option, where ll_CC.UTF-8 is the locale name you want. To activate a given keyboard layout, use the keyb=KB option where KB is the desired keyboard layout. Here is a list of commonly used locale codes: Language (Region) Locale value Keyboard layout Norwegian Bokmål nb_NO.UTF-8 no Norwegian Nynorsk nn_NO.UTF-8 no German de_DE.UTF-8 de French (France) fr_FR.UTF-8 fr Greek (Greece) el_GR.UTF-8 el Japanese ja_JP.UTF-8 jp Northern Sami (Norway) se_NO no(smi) A complete list of locale codes is available in /usr/share/i18n/SUPPORTED, but only the UTF-8 locales are supported by the live images. Not all locales have translations installed, though. The keyboard layout names can be found in /usr/share/keymaps/amd64/.

Stuff to knowThe password for the user is "user"; root has no password set.

Known issues with the image/!\ There are no images yet :( CategoryPermalink

Appendix C - Features in older releases

New features for Debian Edu 10+edu0 Codename Buster released 2019-07-06

Installation changesThis is the first time Debian Edu installation images are available at , thus these are official Debian images. New version of debian-installer from Debian Buster, see its installation manual for more details. New artwork based on the futurePrototype theme, the default artwork for Debian 10 Buster. New default desktop environment Xfce (replacing KDE). New CFEngine configuration management (replacing unmaintained package cfengine2 with cfengine3); this is a major change, for details see the official CFEngine documentation. The architecture of the LTSP chroot now defaults to the server one.

Software updatesEverything which is new in Debian 10 Buster, eg: Linux kernel 4.19 Desktop environments KDE Plasma Workspace 5.14, GNOME 3.30, Xfce 4.12, LXDE 0.99.2, MATE 1.20 Firefox 60.7 ESR and Chromium 73.0 LibreOffice 6.1 Educational toolbox GCompris 0.95 Music creator Rosegarden 18.12 GOsa 2.74 LTSP 5.18 Debian Buster includes more than 57000 packages available for installation. More information about Debian 10 Buster is provided in the release notes and the installation manual.

Documentation and translation updatesTranslation updates for the templates used in the installer. These templates are now available in 76 languages, of which 31 are fully translated. The profile choice page is available in 29 languages, of which 19 are fully translated. The Debian Edu Buster Manual is fully translated to French, German, Italian, Danish, Dutch, Norwegian Bokmål and Japanese. Partly translated versions exist for Polish, Spanish, Simplified Chinese and Traditional Chinese.

Other changes compared to the previous releaseThe BD ISO image can be used for offline installations again. New school level related meta-packages education-preschool, education-primaryschool, education-secondaryschool and education-highschool are available. None of them is installed by default. Some packages rather belonging to preschool or primaryschool level (like gcompris-qt, childsplay, tuxpaint or tuxmath) are no longer installed by default. Site specific modular installation. It is now possible to install only those educational packages that are actually wanted. See the installation chapter for more information. Site specific multi-language support. See the Desktop chapter for more information. LXQt 0.14 is offered as a new choice for the desktop environment. New GOsa²-Plugin Password Management. Unusable options have been removed from the GOsa² web interface. New netgroup available to exclude systems belonging to the shut-down-at-night-hosts netgroup from being woken up. New tool Standardskriver (Default printer). See the Administration chapter for more information. New tool Desktop-autoloader. It allows performance improvements for LTSP diskless clients. See the NetworkClients chapter for more information. Improved TLS/SSL support inside the internal network. A RootCA certificate is used to sign server certificates and user home directories are configured to accept it at account creation time; besides Firefox ESR, also Chromium and Konqueror can now use HTTPS without the need to allow insecure connections. Kerberized ssh. A password isn't needed anymore for connections inside the internal network; root needs to run kinit first to enable it. Kerberized NFS. It is now possible to use more secure home directory access, see the Administration chapter for more information. Added configuration file /etc/debian-edu/pxeinstall.conf with examples to make site specific changes easier. Added configuration file /etc/ltsp/ltsp-build-client.conf with examples to make site specific changes easier. New tool /usr/share/debian-edu-config/tools/edu-ldap-from-scratch. It allows to re-generate the LDAP database just like it has been right after the main server installation. The tool might also be useful to make site specific changes easier. With X2Go server now available in Debian, the related packages are now installed on all systems with Profile LTSP-Server. Support for running Java applets in the Firefox ESR browser has been dropped upstream. Support for nonfree flash has been dropped from the Firefox ESR browser. Like it has been before Stretch, Debian 10 doesn't install the unattended-upgrades package by default, see the Maintenance chapter for more information about security upgrades.

New features for Debian Edu 9+edu0 Codename Stretch released 2017-06-17

Installation changesNew version of debian-installer from Debian Stretch, see its installation manual for more details. The "Thin-Client-Server" profile has been renamed to "LTSP-Server" profile. New artwork based on the "soft Waves" theme, the default artwork for Debian 9 Stretch.

Software updatesEverything which was new in Debian 9 Stretch, eg: Linux kernel 4.9 Desktop environments KDE Plasma Workspace 5.8, GNOME 3.22, Xfce 4.12, LXDE 0.99.2, MATE 1.16 KDE Plasma Workspace is installed by default; to choose one of the others see this manual. Firefox 45.9 ESR and Chromium 59 Iceweasel has been re-renamed to Firefox! :-) Icedove has been re-renamed to Thunderbird and is now installed by default. LibreOffice 5.2.6 Educational toolbox GCompris 15.10 Music creator Rosegarden 16.06 GOsa 2.7.4 LTSP 5.5.9 Debian Stretch includes more than 50000 packages available for installation. More information about Debian 9 Stretch is provided in the release notes and the installation manual.

Documentation and translation updatesTranslation updates for the templates used in the installer. These templates are now available in 29 languages. The Debian Edu Stretch Manual is fully translated to German, French, Italian, Danish, Dutch, Norwegian Bokmål and Japanese. The Japanese translation was newly added for Stretch. Partly translated versions exist for Spanish, Polish and Simplified Chinese.

Other changes compared to the previous releaseIcinga replaces Nagios as monitoring tool. kde-spectacle replaces ksnapshot as screenshot tool. The free flash player gnash is back again. Plymouth is installed and activated by default, except for the 'Main Server' and 'Minimal' profiles; pressing ESC allows to view boot and shutdown messages. Upon upgrade from Jessie the LDAP data base has to be adjusted. The sudoHost value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an LDAP editor. The 32-bit PC support (known as the Debian architecture i386) now no longer covers a plain i586 processor. The new baseline is the i686, although some i586 processors (e.g. the "AMD Geode") will remain supported. Debian 9 enables unattended upgrades (for security updates) by default for new installations. This might cause a delay of about 15 minutes if a system with a low uptime value is powered off. LTSP now uses NBD instead of NFS for the root filesystem. After each single change to an LTSP chroot, the related NBD image must be regenerated (ltsp-update-image) for the changes to take effect. Concurrent logins of the same user on LTSP server and LTSP thin client are no longer allowed.

Historic information about older releasesThe following Debian Edu releases were made further in the past: Debian Edu 8+edu0 Codename Jessie released 2016-07-02. Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28. Debian Edu 6.0.7+r1 Codename "Squeeze", released 2013-03-03. Debian Edu 6.0.7+r1 Codename "Squeeze", released 2013-03-03. Debian Edu 6.0.4+r0 Codename "Squeeze", released 2012-03-11. Debian Edu 5.0.6+edu1 Codename "Lenny", released 2010-10-05. Debian Edu 5.0.4+edu0 Codename "Lenny", released 2010-02-08. Debian Edu "3.0r1 Terra", released 2007-12-05. Debian Edu "3.0r0 Terra" released 2007-07-22. Based on Debian 4.0 Etch released 2007-04-08. Debian Edu 2.0, released 2006-03-14. Based on Debian 3.1 Sarge released 2005-06-06. Debian Edu "1.0 Venus" release 2004-06-20. Based on Debian 3.0 Woody released 2002-07-19. A complete and detailed overview about older releases is contained in Appendix C of the Jessie manual; or see the related release manuals on the release manuals page. CategoryPermalink

CategoryPermalink

\ No newline at end of file View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/73d08e9d96d5017cd9dd8ee579b57639db19f43f -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/73d08e9d96d5017cd9dd8ee579b57639db19f43f You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at salsa.debian.org Sat Mar 28 10:49:03 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 28 Mar 2020 10:49:03 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Debian Edu ITIL manual from the wiki. Message-ID: <5e7f2b9f3e452_78e93fe0a0addc1423488a@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc Commits: 809fe68e by Holger Levsen at 2020-03-28T11:48:49+01:00 Update Debian Edu ITIL manual from the wiki. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 8 changed files: - debian/changelog - documentation/debian-edu-itil/debian-edu-itil-manual.nb.po - documentation/debian-edu-itil/debian-edu-itil-manual.nl.po - documentation/debian-edu-itil/debian-edu-itil-manual.pot - documentation/debian-edu-itil/debian-edu-itil-manual.xml - documentation/debian-edu-itil/debian-edu-itil-manual.zh.po - documentation/debian-edu-itil/debian-edu-itil-manual.zh_Hant.po - documentation/debian-edu-itil/source/AllInOne-debian-edu-itil-manual.xml Changes: ===================================== debian/changelog ===================================== @@ -1,6 +1,7 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium * Update Debian Edu Bullseye manual from the wiki. + * Update Debian Edu ITIL manual from the wiki. * Update Audacity manual from the wiki. * Update Rosegarden manual from the wiki. * Update debian/copyright from the wikis. ===================================== documentation/debian-edu-itil/debian-edu-itil-manual.nb.po ===================================== @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" -"POT-Creation-Date: 2020-02-26 21:23+0000\n" +"POT-Creation-Date: 2020-03-28 10:48+0000\n" "PO-Revision-Date: 2019-12-04 09:05+0000\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål

===================================== documentation/debian-edu-itil/debian-edu-itil-manual.nl.po ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-itil-manual\n" "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n" -"POT-Creation-Date: 2020-02-26 21:23+0000\n" +"POT-Creation-Date: 2020-03-28 10:48+0000\n" "PO-Revision-Date: 2020-02-26 22:11+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -14050,10 +14050,10 @@ msgstr "" #. type: Content of:

msgid "" "The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma " -"Yong (2018, 2019) and is released under the GPL v3 or any later version." +"Yong (2018-2020) and is released under the GPL v3 or any later version." msgstr "" "De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten " -"bij Liang Guo (2017) en Ma Yong (2018, 2019). Het document werd uitgegeven " +"bij Liang Guo (2017) en Ma Yong (2018-2020). Het document werd uitgegeven " "onder de licentie GPL v3 of een latere versie." #. type: Content of:

@@ -14062,8 +14062,8 @@ msgid "" "is released under the GPL v3 or any later version." msgstr "" "De auteursrechten van de vertaling naar het Nederlands berusten bij Frans " -"Spiesschaert (2017-2020). Het document werd uitgegeven onder de " -"licentie GPL v3 of een latere versie." +"Spiesschaert (2017-2020). Het document werd uitgegeven onder de licentie GPL " +"v3 of een latere versie." #. type: Content of:

msgid "" ===================================== documentation/debian-edu-itil/debian-edu-itil-manual.pot ===================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-26 21:23+0000\n" +"POT-Creation-Date: 2020-03-28 10:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -10010,7 +10010,7 @@ msgstr "" #. type: Content of:

===================================== documentation/debian-edu-itil/debian-edu-itil-manual.xml ===================================== @@ -5710,7 +5710,7 @@ Total: 30860 6004 24856]]> The Norwegian Bokmål translation is copyrighted by Ole-Erik Yrvin (2015), Ingrid Yrvin (2015) and Allan Nordhøy (2018, 2019) and is released under the GPL v3 or any later version. -The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma Yong (2018, 2019) and is released under the GPL v3 or any later version. +The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma Yong (2018-2020) and is released under the GPL v3 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2017-2020) and is released under the GPL v3 or any later version. ===================================== documentation/debian-edu-itil/debian-edu-itil-manual.zh.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-26 21:23+0000\n" +"POT-Creation-Date: 2020-03-28 10:48+0000\n" "PO-Revision-Date: 2020-02-24 01:32+0000\n" "Last-Translator: Ma Yong \n" "Language-Team: Chinese (Simplified)

===================================== documentation/debian-edu-itil/debian-edu-itil-manual.zh_Hant.po ===================================== @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-26 21:23+0000\n" +"POT-Creation-Date: 2020-03-28 10:48+0000\n" "PO-Revision-Date: 2019-01-26 19:04+0000\n" "Last-Translator: Louies \n" "Language-Team: Chinese (Traditional)

===================================== documentation/debian-edu-itil/source/AllInOne-debian-edu-itil-manual.xml ===================================== @@ -589,4 +589,4 @@ Total: 30860 6004 24856]]>reboot coyote#reboot This command does a reboot of Coyote Linux shutdown coyote#halt Here is Coyote Linux turned off

NextUse case: Author: Klaus Ade Johnstad. Co-author: Knut Yrvin

Exception handling

Verification

Update the configuration database

LastUse case: Author: Klaus Ade Johnstad. Co-author: Knut Yrvin

Exception handling

Verification

Update the configuration database

Copyright and authorsThis document is written and copyrighted by Knut Yrvin (2006), Andreas Johansen (2006), Klaus Ade Johnstad (2006), Halvor Dahl (2006), Snorre Løvås (2006), Finn-Arne Johansen (2006), Ragnar Wissløff (2006), Petter Reinholdtsen (2015), Ole-Erik Yrvin (2015) and Ingrid Yrvin (2015) and is released under the GPL3 or any later version. The source document was originally written in Norwegian Bokmål, and migrated to English in 2015. If you add content to it, please only do so if you are the author. You need to release it under the same conditions! Then add your name here and release it under the "GPL v3 or any later version" licence.

Translation copyright and authorsThe Norwegian Bokmål translation is copyrighted by Ole-Erik Yrvin (2015), Ingrid Yrvin (2015) and Allan Nordhøy (2018, 2019) and is released under the GPL v3 or any later version. The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma Yong (2018, 2019) and is released under the GPL v3 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2017-2020) and is released under the GPL v3 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. CategoryPermalink

Appendix A - Contract on operating Debian Edu / SkolelinuxContract no.: .................. Customer no.: ..................

CONTRACT ON OPERATING DEBIAN EDU / SKOLELINUXbetween Driftselskapet AS, Maskinrommet 1, 0313 Oslo Org.no.: 989 313 313 (hereafter called The Vendor) and NN Org.No: (hereafter called The Customer) The parties have reached an agreement on the delivery of operational services (hereinafter The Agreement) on subsequent contractual terms. The following appendixes are part of The Agreement: Appendix 1 - Definitions Appendix 2 - Customer Obligations Appendix 3 - The Vendor's obligations Appendix 4 - Prices and terms of payment Appendix 5 - General provisions Appendix 6 - The proxy Persons The agreement is valid from the signing date and a minimum of 12 months from The Delivery date. The agreement is then renewed automatically for periods lasting 12 months unless one of the parties denounces the Agreement in writing, three months before the expiry of a contract period. The contract is signed in two - 2 - copies, and each of the parties keeps one - 1 - copy. Place: ............................. Date: .................. 2006 For The Vendor: .................................................... For The Customer: ....................................................

Appendix 1 - DefinitionsTermDescriptionOperating periodFrom the Delivery day to the day when the agreement ceases to apply, regardless of the reason.Services providedServices from The Vendor in the Operating period. The services provided are further described in Appendix 3.ICT managerCompetence person(s) at the customer serving as liaison(s) to the supplier.Delivery dayThe day the customer can use the services provided.SkolelinuxLinux distribution built on Debian Linux and adjusted for use in Norwegian schools.

Appendix 2 - Customer Obligations

1. ICT skill requirementsICT administrator (1 - 3 named persons at the customer) to deal with inquiries from users related to the use of the applications included in Skolelinux/Debian Edu. ICT administrator shall have sufficient expertise to make a qualified assessment of whether a problem is related to the use or operation of the system. The ICT administrator should contact the supplier's the user support center by phone or e-mail. The customer's users should not contact the supplier directly.

2. Machine requirementsThe Customer should have installed and tested that the equipment operates satisfactorily before the delivery day.

3. Program requirementsThe customer shall, before delivery day, have installed Skolelinux / Debian Edu to get a verified, satisfactory functioning installation.

4. Communication requirementsThe Customer shall, before the delivery date, have installed and configured communication with the Internet and tested it works satisfactorily. To make it possible to provide services, the customer must arrange for the contractor to be able to access the customer's ICT-facilities via the Internet.

5. Information from The VendorWhen all the above requirements are met, the customer shall notify the contractor, in writing or by e-mail, that the ICT-system is prepared for the contractor for provide services. A list of all the users of the system including full name, username and wanted password should be sent electronically to the Vendor at the latest together with this message.

Appendix 3 - The Vendor's obligations

1. Delivery day requirementsThe supplier shall, after receiving notification from the customer in accordance with Appendix 2, paragraph 5, as soon as possible arrange for the Customer to receive the provided services. Delivery date shall be no later than 4 weeks after such notice is received by the supplier.

2. Information to The CustomerWhen all the above requirements are met, the contractor shall notify the customer, in writing or by e-mail, that the ICT-system is prepared for the customer to receive the provided services.

3. Service requirementsThe following table shows all relevant services related to operating Skolelinux/!DebianEdu. The crosses in the table show the responsibilities between the Supplier and the Customer for the different services: Delivered (incl.) are carried out by the supplier and included in the Agreement price. Delivered (running) performed by the Supplier at the Customer's account in accordance with the rates in Chapter 7. The Customer, is done by the Supplier at the Customer's expense. ServiceDelivered (incl.)Delivered (running)The CustomerTroubleshooting and user support over the phone and emailxParticipation in the user forumxReplacing the hardwareSupplier's responsibility is limited to managing the a change of hardware. The supplier is not responsible for hardware and warranties, pricing, shipping costs etc. which must bee agreed separately with machine supplier.xAdd, change and remove usersThe customer can do this using a separate application in Debian Edu. The supplier can do this server for NOK 50 per user excluding vat.(x)xChanging password when the password is forgotten(x)xSecurity updates on SkolelinuxxVersion updates on SkolelinuxxChange the user permissions(x)xMonitoring of filling on disksxMonitoring of the lifetime for the relevant componentsxExtending disk partitionsxOperation and monitoring of firewallxOperation and monitoring of networkxDeleting print jobs stuck in the queue at the request of the ICT administratorxMonitoring to ensure backup copies are takenxData deletion under request from the ICT administratorxReplacing backup medium and storing backup copiesxRestore with a security backup, at the request of the ICT administrator.xSet up new printers and printer queues(x)xStopping and restarting the printer queues at the request of the ICT administratorxStopping hanging processes on the server as a result of application errorsx

4. Response time requirementsThe supplier shall without undue delay, start troubleshooting and problem solving. ICT administrator should be held continuously updated on the status and progress of error correction.

5. Skill requirementsThe supplier shall at all times have sufficient resources with relevant expertise to provide services in a professional manner

Appendix 4 - Prices and terms of payment

1. Compensation for services providedThe compensation for the services provided is calculated on the basis of the number of workstations on the network. The agreement includes a minimum of 60 workstations. The Customer shall pay the Supplier £78 per year per workstation, excluding VAT, in compensation for the services provided, i.e. £390 per month excluding VAT for 60 workstations. If the number of workstations changes the customer shall give the supplier a written notice thereof with the corresponding dates for the change. Adjustment of the billing basis with a possible recalculation will be included in the next invoice

2. Consultant supportHourly rate for consultancy is NOK 800 (65 £) ex Moms (VAT). All work on an ongoing bill should be approved by the customer before work starts. Documented travel expenses are charged to the client. Compensation for travel time calculated by the elapsed time with hourly rate NOK 400 ex Moms.

3. Payment conditionsCompensation for the services provided is billed in advance for each quarter. For the first quarter, billing starts from the delivery date and runs until the end of the current quarter. Compensation for consultancy is billed as after-payment on the basis of agreed and work performed. All invoicing is done within a 30 days deadline.

4. Price regulationPrices may be adjusted every year with the increase in the national consumer price index (SSB CPI). This can take place for the first time one year after signing the agreement.

Appendix 5 - General provisions

1. The parts' cooperation and dutiesGeneral The parties shall cooperate to achieve the most efficient implementation of the Agreement. Both parties may, in writing, summon one another to meet with five business days' notice to discuss matters arising in connection with the implementation of the Agreement. The parties are obliged, without delay, to notify each other about matters that they understand or should understand may affect the implementation of the Agreement. Such notification does not relieve the parties from the responsibilities resulting from the Agreement. The suppliers duties The Supplier undertakes to supply the contract business performance at the terms of the Agreement. The supplier undertakes to allocate the resources necessary to implement the commitments in the Agreement. Customer duties The customer shall pay the agreed compensation. The customer must assist the supplier so that the supplier will not be delayed or otherwise prevented from fulfilling the obligations. The customer undertakes to allocate the necessary resources, and ensure the necessary assistance from a third party where this is agreed.

2.ConfidentialityThe parties are mutually obliged to keep confidentiality and not disseminate information which they become aware of in connection with carrying out the out the Agreement, to the extent that such information is not considered public. The same applies to all the material which is marked confidential. personal matters, and information that could harm the parties or that can be exploited by outsiders in business. This duty of confidentiality applies to the parties and their employees and others acting on behalf of the parties in connection with carrying out the of the Agreement. The duty of confidentiality applies correspondingly after the termination of the Agreement.

3.Force majeureIn the event of an extraordinary situation outside control of the parties, which could not be foreseen at inception and which significantly hampers the fulfilment of a party duties, the other party shall be notified without undue delay. The affected party's obligations are suspended to the extent that is relevant so long as the extraordinary situation prevails. The other party in return suspended for the same period. Either party may terminate the Agreement by giving one month's written notice if the force majeure situation makes it particularly burdensome to maintain the Agreement.

4. Transfer of the agreementParties may only reassign their rights and obligations under the agreement with the written consent of the counterparties. Consent may not be unreasonably withheld. It is not considered as transfer if one of the parties mergea with one or more other companies or the assignment is to a subsidiary. Right to compensation under this Agreement may be assigned freely, but such transfer does not relieve the Contractor from its obligations and responsibilities.

5. Non-fulfilment

5.1 Delay of the delivery date

a. Liquidated damagesIf delivery does not happen on the date agreed between the parties, and this is not due to the circumstances mentioned in Clause 3 or circumstances the Customer is responsible for, then a daily penalty is applied from the agreed delivery date. The penalty fee is 0.1% of the agreed annual compensation for the portion of services provided that are delayed, calculated per calendar day of delay and up to a maximum of 60 days. As long as daily penalties are being applied, the customer may neither terminate the Agreement nor demand a discount or other compensation for the delay.

b. CancelingIf the delivery date has not occurred by the end of liquidated damages period, you may terminate the Agreement with immediate effect.

c. Delay caused by customerIn case of delay caused by customer the supplier may, by written notice, cancel their work until the customer takes corrective action. The supplier is entitled to recover their additional costs as a result of customer's breach, and a reasonable time to the reassignment of resources.

5.2 Defaults in the operating period

5.2.1 The suppliers non-fullfillment

a. ShortcomingsThere is a shortcoming of the supplier if services provided do not meet the requirements and specifications stipulated in the Agreement, and this causes a circumstance for which the supplier is responsible. If there is a shortcoming in operating performance, the supplier shall without undue delay remedy the defect. Where a defect can not be repaired within a reasonable time the Customer shall be entitled to a proportionate discount, ref. Section b. Below.

b. Price discount for shortcomingsIf the client has not been able to use the services provided, fully or partially, as a result of the defect, the customer has the right, in the period from when the error or defect was notified in writing until the defect is corrected, to receive a proportionate discount. Any refund due to lack of availability due to the same circumstance, is deducted when calculating the discount.

c. CancelingIn the event of any other shortcoming, that is significant to the customer's use of the services provided, and is not corrected within 30 business days after the Customer notified the supplier in writing about the shortcoming, the Customer may notify the supplier in writing of intent to terminate the Agreement. If the supplier, after such notice, has not rectified the situation within 14 business days, the customer is entitled to terminate the Agreement with immediate effect.

5.2.2 The customers non-fullfillmentIf the customer does not pay on time, the supplier is entitled to interest for the amount that is overdue. (In Norway, this arises from a law relating to interest on late payment of 19. Dec. 1976 no. 100, § 3, first paragraph.) In cases where the payments plus interest are not paid within 14 days of the due date, the supplier can issue written notice that the services provided will be discontinued, or that the agreement will be terminated, unless the customer settles all outstanding bills within 7 days of receipt of this notification. Upon termination of the Agreement due to the customer's fault, the supplier shall be indemnified by the customer for the costs and liabilities undertaken in connection with the Agreement.

6.ReplacementThe customer may demand compensation for losses that can be reasonably attributed to the shortcoming, unless the supplier can demonstrate that the breach, or the cause of the breach, not attributed to him. Any liquidated damages caused by delay in accordance with Clause 5a for the same breach is deducted by calculating compensation. If the customer defaults on its obligations under this Agreement, supplier shall be entitled to recover their additional costs that may reasonably be attributed to the Customer defaults, unless the Customer can prove that the breach, or cause of the breach can not be attributed to him. Parties are not responsible for the other party's indirect losses, including expected savings or gains. Indirect losses included among others Losses due to reduced or lost production or sales (operational interruption); Losses arising because the services provided can not be used as intended (consequential losses); Lost profits as a result of a contract with a third party that is dropped or not fulfilled properly. Parties liability towards each other is limited to the agreed annual compensation, or a maximum of NOK 1 million, regardless of the number of damage cases. The limitations of the parties' liability does not apply, if the party or anyone he is responsible for, has shown gross negligence or willful misconduct.

7. Legal defectsIf a third party asserts that the use of software that the Customer or Vendor has license responsibility goes against the third party's rights, the Party shall ensure that appropriate rights are retained or acquired, or that other equivalent software functionality is obtained without charge to the other party. Should claims arise from a third party against the Customer or Vendor on the basis of defects inherent in the relationship of the other Party, that Party undertakes its own expense to assist and eventually lead case for both parties. From the time a party takes over the case, the other party is obliged to assist the special compensation.

8. Responsibility for subcontractorsParties are fully accountable for agreed services that are performed by subcontractors.

9. Regulating the termination of the AgreementUpon termination, the parties shall draw up a joint plan of liquidation of the customer relationship and obligations by mutual to assist each other in the practical work in this liquidation. The vendor is obliged by termination of this Agreement to return Client software and current data in the agreed format. The Customer chooses the means of transport and is responsible for transportation from the Vendors' premises. The Customer undertakes immediately after termination of the Agreement to return all equipment belonging to the Vendor. The Vendor chooses the mode of transport and is responsible for transportation from the Vendor's premises.

10. Legalities and solving disagreementsThe rights and obligations under this Agreement shall completely follow the Norwegian law. Upcoming Disagreements in connection with this Agreement shall be resolved by negotiation between the parties. If the parties fail within two weeks not to solve the disagreement through negotiations, either party may require the dispute to be resolved by arbitration under the rules of the law of 13 August 1915 No. 6, Chap. 32 (Civil Procedure). Each party shall appoint one arbitrator who together appoint the arbitration tribunal. If a party fails to designate its representative within two weeks after the other has demanded arbitration and appointed its representative, he will be appointed by the Chief Justice of the Oslo District Court. The same applies for the election of the chairman if the two arbitrators members have not chosen the President within 14 days after both being appointed.

Appendix 6 - Contacts and addresses1. Correspondence Requests regarding the agreement shall be in writing and addressed as follows: To VendorTo CustomerOperating company LtdBy authorized personMachine room 10313 OsloNNBy authorized person2. Authorized persons The following persons do have authority to sign on their part according to the agreement. NamePosition/FunctionTelephoneTelefaxE-mailThe vendorPetter SmartCEO+47 22 31 31 31ps at driftselskapet.noThe Customer

CategoryPermalink

\ No newline at end of file + r) Reboot system w) Write configuration to disk]]>reboot coyote#reboot This command does a reboot of Coyote Linux shutdown coyote#halt Here is Coyote Linux turned off

NextUse case: Author: Klaus Ade Johnstad. Co-author: Knut Yrvin

Exception handling

Verification

Update the configuration database

LastUse case: Author: Klaus Ade Johnstad. Co-author: Knut Yrvin

Exception handling

Verification

Update the configuration database

Translation copyright and authorsThe Norwegian Bokmål translation is copyrighted by Ole-Erik Yrvin (2015), Ingrid Yrvin (2015) and Allan Nordhøy (2018, 2019) and is released under the GPL v3 or any later version. The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma Yong (2018-2020) and is released under the GPL v3 or any later version. The Dutch translation is copyrighted by Frans Spiesschaert (2017-2020) and is released under the GPL v3 or any later version. The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. CategoryPermalink

Appendix A - Contract on operating Debian Edu / SkolelinuxContract no.: .................. Customer no.: ..................

Appendix 2 - Customer Obligations

2. Machine requirementsThe Customer should have installed and tested that the equipment operates satisfactorily before the delivery day.

3. Program requirementsThe customer shall, before delivery day, have installed Skolelinux / Debian Edu to get a verified, satisfactory functioning installation.

Appendix 3 - The Vendor's obligations

5. Skill requirementsThe supplier shall at all times have sufficient resources with relevant expertise to provide services in a professional manner

Appendix 4 - Prices and terms of payment

4. Price regulationPrices may be adjusted every year with the increase in the national consumer price index (SSB CPI). This can take place for the first time one year after signing the agreement.

Appendix 5 - General provisions

5. Non-fulfilment

5.1 Delay of the delivery date

b. CancelingIf the delivery date has not occurred by the end of liquidated damages period, you may terminate the Agreement with immediate effect.

5.2 Defaults in the operating period

5.2.1 The suppliers non-fullfillment

8. Responsibility for subcontractorsParties are fully accountable for agreed services that are performed by subcontractors.

CategoryPermalink

\ No newline at end of file View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/809fe68edd617441d717b7fdeb84ccf9b46f91ae -- View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/809fe68edd617441d717b7fdeb84ccf9b46f91ae You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at salsa.debian.org Sat Mar 28 10:53:02 2020 From: gitlab at salsa.debian.org (Holger Levsen) Date: Sat, 28 Mar 2020 10:53:02 +0000 Subject: [debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Debian Edu Buster manual from the wiki. Message-ID: <5e7f2c8ea7b16_78e93fe0a0a55da0235375@godard.mail> Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc Commits: 7904c952 by Holger Levsen at 2020-03-28T11:52:39+01:00 Update Debian Edu Buster manual from the wiki. Signed-off-by: Holger Levsen <holger at layer-acht.org> - - - - - 16 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.ro.po - documentation/debian-edu-buster/debian-edu-buster-manual.xml - documentation/debian-edu-buster/debian-edu-buster-manual.zh.po - documentation/debian-edu-buster/debian-edu-buster-manual.zh_Hant.po - documentation/debian-edu-buster/source/AllInOne-debian-edu-buster-manual.xml Changes: ===================================== debian/changelog ===================================== @@ -1,6 +1,7 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium * Update Debian Edu Bullseye manual from the wiki. + * Update Debian Edu Buster manual from the wiki. * Update Debian Edu ITIL manual from the wiki. * Update Audacity manual from the wiki. * Update Rosegarden manual from the wiki. ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.da.po ===================================== @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-buster-manual\n" -"POT-Creation-Date: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2019-07-07 20:30+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -9765,19 +9765,27 @@ msgstr "" "senere version." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " +#| "2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " +#| "version." msgid "" -"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " -"2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " -"version." +"The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and " +"is released under the GPL v2 or any later version." msgstr "" "Den hollandske oversættelse er underlagt ophavsretten af Frans Spiesschaert " "(2014, 2015, 2016, 2017, 2018, 2019) og er udgivet under GPL version 2 eller " "enhver senere version." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Japanese translation is copyrighted by victory (2016, 2017) and " +#| "hoxp18 (2019) and is released under the GPL v2 or any later version." msgid "" "The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 " -"(2019) and is released under the GPL v2 or any later version." +"(2019-2020) and is released under the GPL v2 or any later version." msgstr "" "Den japanske oversættelse er underlagt ophavsretten af victory (2016, 2017) " "og hoxp18 (2019) og er udgivet under GPL version 2 eller enhver senere " @@ -9799,9 +9807,14 @@ msgstr "" "udgivet under GPL version 2 eller enhver senere version." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " +#| "2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +#| "under the GPL v2 or any later version." msgid "" -"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " -"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " "under the GPL v2 or any later version." msgstr "" "Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013, " ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.de.po ===================================== @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-buster-manual.de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2020-02-27 18:02+0100\n" "Last-Translator: Wolfgang Schweer \n" "Language-Team: German \n" @@ -10082,21 +10082,19 @@ msgstr "" #. type: Content of:

msgid "" -"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " -"2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " -"version." +"The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and " +"is released under the GPL v2 or any later version." msgstr "" -"Die niederländische Übersetzung wurde verfasst von Frans Spiesschaert (2014, " -"2015, 2016, 2017, 2018, 2019) und ist unter der GPL v2 oder einer späteren " -"Version lizenziert." +"Die niederländische Übersetzung wurde verfasst von Frans Spiesschaert " +"(2014-2020) und ist unter der GPL v2 oder einer späteren Version lizenziert." #. type: Content of:

msgid "" "The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 " -"(2019) and is released under the GPL v2 or any later version." +"(2019-2020) and is released under the GPL v2 or any later version." msgstr "" "Die japanische Übersetzung wurde verfasst von victory (2016, 2017) und " -"hoxp18 (2019) und ist unter der GPL v2 oder einer späteren Version " +"hoxp18 (2019-2020) und ist unter der GPL v2 oder einer späteren Version " "lizenziert." #. type: Content of:

@@ -10111,13 +10109,13 @@ msgstr "" #. type: Content of:

msgid "" -"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " -"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " "under the GPL v2 or any later version." msgstr "" "Die chinesische Übersetzung (vereinfachte Schriftzeichen) wurde verfasst von " -"Ma Yong (2016, 2017, 2018, 2019, 2020), Boyuan Yang (2017) und Roy Zhang " -"(2017); sie ist unter der GPL v2 oder einer späteren Version lizenziert." +"Ma Yong (2016-2020), Boyuan Yang (2017) und Roy Zhang (2017) und EldersJavas " +"(2020); sie ist unter der GPL v2 oder einer späteren Version lizenziert." #. type: Content of:

msgid "" @@ -10276,8 +10274,8 @@ msgstr "" "translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre " "Sprache anlegen und wie Übersetzungen aktualisiert werden." -#. -#. status ignore +#. +#. status ignore #. type: Content of:

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 ===================================== @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2015-03-30 22:30+0000\n" "Last-Translator: Rafael Ernesto Rivas \n" "Language-Team: Debian Spanish \n" @@ -9427,15 +9427,14 @@ msgstr "" #. type: Content of:

@@ -9447,8 +9446,8 @@ msgstr "" #. type: Content of:

msgid "" -"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " -"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " "under the GPL v2 or any later version." msgstr "" ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.fr.po ===================================== @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" -"POT-Creation-Date: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2019-11-10 12:03+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" @@ -10122,19 +10122,27 @@ msgstr "" "version ultérieure." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " +#| "2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " +#| "version." msgid "" -"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " -"2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " -"version." +"The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and " +"is released under the GPL v2 or any later version." msgstr "" "La traduction néerlandaise, dont les droits d'auteur appartiennent à Frans " "Spiesschaert (2014, 2015, 2016, 2017, 2018, 2019), est distribuée sous " "GPL v2 ou toute version ultérieure." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Japanese translation is copyrighted by victory (2016, 2017) and " +#| "hoxp18 (2019) and is released under the GPL v2 or any later version." msgid "" "The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 " -"(2019) and is released under the GPL v2 or any later version." +"(2019-2020) and is released under the GPL v2 or any later version." msgstr "" "La traduction japonaise, dont les droits d'auteur appartiennent à victory " "(2016, 2017) et hoxp18 (2019), est distribuée sous GPL v2 ou toute version " @@ -10156,9 +10164,14 @@ msgstr "" "est distribuée sous GPL v2 ou toute version ultérieure." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " +#| "2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +#| "under the GPL v2 or any later version." msgid "" -"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " -"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " "under the GPL v2 or any later version." msgstr "" "La traduction en chinois simplifié, dont les droits d'auteur appartiennent à " ===================================== 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: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2019-11-24 18:52+0100\n" "Last-Translator: Claudio Carboncini \n" "Language-Team: Italian \n" @@ -9915,19 +9915,27 @@ msgstr "" "2014, 2015, 2016, 2019) e rilasciata sotto licenza GPL v2 o successiva." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " +#| "2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " +#| "version." msgid "" -"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " -"2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " -"version." +"The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and " +"is released under the GPL v2 or any later version." msgstr "" "La traduzione in olandese è protetta da copyright di Frans Spiesschaert " "(2014, 2015, 2016, 2017, 2018, 2019) e rilasciata sotto licenza GPL v2 o " "successiva." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Japanese translation is copyrighted by victory (2016, 2017) and " +#| "hoxp18 (2019) and is released under the GPL v2 or any later version." msgid "" "The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 " -"(2019) and is released under the GPL v2 or any later version." +"(2019-2020) and is released under the GPL v2 or any later version." msgstr "" "La traduzione in giapponese è protetta da copyright da victory (2016, 2017) " "e hoxp18 (2019) e rilasciata sotto licenza GPL v2 o successiva." @@ -9948,9 +9956,14 @@ msgstr "" "rilasciata sotto licenza GPL v2 o successiva." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " +#| "2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +#| "under the GPL v2 or any later version." msgid "" -"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " -"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " "under the GPL v2 or any later version." msgstr "" "La traduzione in cinese semplificato è protetta da copyright di Ma Yong " ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.ja.po ===================================== @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-stretch\n" -"POT-Creation-Date: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2019-06-08 10:11+0000\n" "Last-Translator: hoxp18 \n" "Language-Team: Japanese

+#, fuzzy +#| msgid "" +#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " +#| "2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " +#| "version." msgid "" -"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " -"2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " -"version." +"The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and " +"is released under the GPL v2 or any later version." msgstr "" "オランダ語の翻訳版は、Frans Spiesschaert (2014, 2015, 2016, 2017, 2018, 2019)" "に著作権があり、GPL v2 以降のライセンスで提供されています。" #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Japanese translation is copyrighted by victory (2016, 2017) and " +#| "hoxp18 (2019) and is released under the GPL v2 or any later version." msgid "" "The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 " -"(2019) and is released under the GPL v2 or any later version." +"(2019-2020) and is released under the GPL v2 or any later version." msgstr "" "日本語版は、victory (2016, 2017)、hoxp18 (2019)に著作権があり、GPL v2 とそれ" "以降で提供されています。" @@ -9763,9 +9771,14 @@ msgstr "" "著作権があり、GPL v2 とそれ以降のライセンスで提供されています。" #. type: Content of:

-msgid "" -"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " -"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " +#| "2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +#| "under the GPL v2 or any later version." +msgid "" +"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " "under the GPL v2 or any later version." msgstr "" "中国語(簡易体)版は、Ma Yong (2016, 2017, 2018, 2019, 2020)、Boyuan Yang " ===================================== documentation/debian-edu-buster/debian-edu-buster-manual.nb.po ===================================== @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: debian-edu-doc\n" -"POT-Creation-Date: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2019-12-11 16:44+0000\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål

#, fuzzy msgid "" -"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " -"2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " -"version." +"The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and " +"is released under the GPL v2 or any later version." msgstr "" "Opphavsretten for den nederlandske oversettelsen tilhører Frans Spiesschaert " "(2014, 2015, 2016, 2017, 2018), og er utgitt under GPL v2 eller en senere " "versjon." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Japanese translation is copyrighted by victory (2016, 2017) and " +#| "hoxp18 (2019) and is released under the GPL v2 or any later version." msgid "" "The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 " -"(2019) and is released under the GPL v2 or any later version." +"(2019-2020) and is released under the GPL v2 or any later version." msgstr "" "Opphavsretten for den japanske oversettelsen tilhører Victory (2016, 2017) " "og hoxp18 (2019), og er utgitt under GPL v2, eller enhver senere versjon." @@ -9919,8 +9922,8 @@ msgstr "" #. type: Content of:

#, fuzzy msgid "" -"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " -"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " "under the GPL v2 or any later version." msgstr "" "Opphavsretten for oversettelsen på forenklet kinesisk tilhører Ma Yong " ===================================== 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: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2020-03-01 12:47+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -10262,19 +10262,27 @@ msgstr "" "GPL v2 of een latere versie." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " +#| "2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " +#| "version." msgid "" -"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, " -"2016, 2017, 2018, 2019) and is released under the GPL v2 or any later " -"version." +"The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and " +"is released under the GPL v2 or any later version." msgstr "" "De auteursrechten van de Nederlandse vertaling berusten bij Frans " "Spiesschaert (2014, 2015, 2016, 2017, 2018, 2019). De vertaling is " "vrijgegeven onder de licentie GPL v2 of een latere versie." #. type: Content of:

+#, fuzzy +#| msgid "" +#| "The Japanese translation is copyrighted by victory (2016, 2017) and " +#| "hoxp18 (2019) and is released under the GPL v2 or any later version." msgid "" "The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 " -"(2019) and is released under the GPL v2 or any later version." +"(2019-2020) and is released under the GPL v2 or any later version." msgstr "" "De auteursrechten van de Japanse vertaling berusten bij victory (2016, 2017) " "en hoxp18 (2019). De vertaling is vrijgegeven onder de licentie GPL v2 of " @@ -10292,9 +10300,14 @@ msgstr "" "latere versie." #. type: Content of:

-msgid "" -"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " -"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +#, fuzzy +#| msgid "" +#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, " +#| "2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released " +#| "under the GPL v2 or any later version." +msgid "" +"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), " +"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released " "under the GPL v2 or any later version." msgstr "" "De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten " @@ -10464,8 +10477,8 @@ msgstr "" "bestand voor uw taal als er zo nog geen bestaat. U vindt er ook informatie " "over hoe u vertalingen moet bijwerken." -#. -#. status ignore +#. +#. status ignore #. type: Content of:

msgid "" "Please keep in mind that this manual is still under development, so don't " ===================================== 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: 2020-02-25 17:50+0000\n" +"POT-Creation-Date: 2020-03-28 10:51+0000\n" "PO-Revision-Date: 2020-02-21 15:33+0000\n" "Last-Translator: Michal Biesiada