[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Debian Edu Bullseye manual from the wiki

[Wolfgang Schweer (@schweer-guest)]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-doc


Commits:
459dcdfb by Wolfgang Schweer at 2021-06-24T11:04:09+02:00
Update Debian Edu Bullseye manual from the wiki

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


21 changed files:

- debian/changelog
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual-stripped.xml
- 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-no.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.pt-br.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt-pt.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ro.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.sv.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-cn.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-tw.po
- documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+debian-edu-doc (2.11.26) UNRELEASED; urgency=medium
+
+  * Update Debian Edu Bullseye manual from the wiki.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 24 Jun 2021 11:03:08 +0200
+
 debian-edu-doc (2.11.25) unstable; urgency=medium
 
   * Update Debian Edu Bullseye manual from the wiki.


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual-stripped.xml
=====================================
@@ -1528,10 +1528,6 @@ apt full-upgrade]]></screen>
 </para></listitem></itemizedlist><screen><![CDATA[apt clean]]></screen>
 <itemizedlist>
 <listitem>
-<para>To avoid a possible squid file permission pitfall, run 
-</para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/squid/conf.d/debian-edu.conf]]></screen>
-<itemizedlist>
-<listitem>
 <para>Prepare and start the upgrade to Bullseye (new security entry):  
 </para></listitem></itemizedlist><screen><![CDATA[sed -i 's/buster/bullseye/g' /etc/apt/sources.list
 sed -i 's#/debian-security bullseye/updates# bullseye-security#g' /etc/apt/sources.list
@@ -1547,10 +1543,16 @@ apt full-upgrade]]></screen>
 </para>
 <itemizedlist>
 <listitem>
-<para>restart services: Choose yes. 
+<para>restart services: Choose Yes. 
+</para></listitem>
+<listitem>
+<para>base-passwd: Choose Yes. 
+</para></listitem>
+<listitem>
+<para>openssh-server: Choose 'keep the local version currently installed'. 
 </para></listitem>
 <listitem>
-<para>base-passwd: Choose yes. 
+<para>/etc/plymouth/plymouthd.conf: Choose Y. 
 </para></listitem>
 <listitem>
 <para>Samba server and utilities: Choose 'keep the local version currently installed'. 
@@ -1562,9 +1564,6 @@ apt full-upgrade]]></screen>
 <para>/etc/default/slapd: Choose N. 
 </para></listitem>
 <listitem>
-<para>openssh-server: Choose 'keep the local version currently installed'. 
-</para></listitem>
-<listitem>
 <para>/etc/cups/cups-files.conf: Choose N. 
 </para></listitem>
 <listitem>
@@ -1572,7 +1571,8 @@ apt full-upgrade]]></screen>
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>Apply and adjust configuration: 
-</para></listitem></itemizedlist><screen><![CDATA[cf-agent -v -D di,installation]]></screen>
+</para></listitem></itemizedlist><screen><![CDATA[cf-agent -v -D installation
+service squid restart]]></screen>
 <itemizedlist>
 <listitem>
 <para>Setup and configure the Icinga2 web interface: 
@@ -1582,10 +1582,7 @@ apt full-upgrade]]></screen>
 <para>Run <computeroutput>apt install icinga2-ido-mysql</computeroutput>, always choose <emphasis role="strong">No</emphasis> if asked by debconf. 
 </para></listitem>
 <listitem>
-<para>Ignore an error message about the <emphasis>icingadb</emphasis> existence. 
-</para></listitem>
-<listitem>
-<para>Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput> 
+<para>Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</computeroutput> 
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>Get the new Debian Edu Homeworld artwork: 
@@ -1593,6 +1590,11 @@ apt full-upgrade]]></screen>
 apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative]]></screen>
 <itemizedlist>
 <listitem>
+<para>Adjust Xfce panel configuration: 
+</para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved
+mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml]]></screen>
+<itemizedlist>
+<listitem>
 <para>Cope with new LTSP and related changes: 
 </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/default/tftpd-hpa        # to remove no longer needed modifications
 rm -rf /var/lib/tftpboot            # to remove no longer used tftp base directory


=====================================
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: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2019-07-07 20:30+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -4673,15 +4673,6 @@ msgstr "Ryd op i pakkemellemlageret:"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "Prepare and start the upgrade to Bullseye:"
@@ -4721,15 +4712,23 @@ msgstr ""
 "tryk på retur være okay."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "genstart tjenester: Vælg ja (yes)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "restart services: Choose yes."
-msgid "base-passwd: Choose yes."
+#| msgid "restart services: Choose Yes."
+msgid "base-passwd: Choose Yes."
 msgstr "genstart tjenester: Vælg ja (yes)."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4744,10 +4743,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -4761,8 +4756,11 @@ msgid "Apply and adjust configuration:"
 msgstr "Anvend og juster konfiguration:"
 
 #. type: CDATA
-#, no-wrap
-msgid "cf-agent -v -D di,installation"
+#, fuzzy, no-wrap
+#| msgid "cf-agent -v -D installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr "cf-agent -v -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4777,12 +4775,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
-msgstr "kør <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"kør <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Homeworld artwork:"
@@ -4795,6 +4792,19 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Anvend og juster konfiguration:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr ""


=====================================
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: 2021-06-16 21:52+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-06-16 21:50+0200\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4610,17 +4610,6 @@ msgstr "Den Paket-Cache leeren:"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-"Führen Sie den folgenden Befehl aus, um ein mögliches Zugriffsproblem für "
-"Squid zu vermeiden:"
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -4667,13 +4656,24 @@ msgstr ""
 "»Enter« richtig sein."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "Services neustarten: »yes« wählen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
 msgstr "base-passwd: »Ja« wählen."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+"openssh-server: »Die momentan installierte Version beibehalten« wählen."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "/etc/munin/munin.conf: Choose N."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr "/etc/munin/munin.conf: »N« wählen."
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4688,11 +4688,6 @@ msgstr "Kerberos servers: »kerberos« eingeben und »OK« drücken."
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/slapd: »N« wählen."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-"openssh-server: »Die momentan installierte Version beibehalten« wählen."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr "/etc/cups/cups-files.conf: »N« wählen."
@@ -4706,9 +4701,12 @@ msgid "Apply and adjust configuration:"
 msgstr "Konfiguration anpassen und anwenden:"
 
 #. type: CDATA
-#, no-wrap
-msgid "cf-agent -v -D di,installation"
-msgstr "cf-agent -v -D di,installation"
+#, fuzzy, no-wrap
+#| msgid "cf-agent -v -D installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
+msgstr "cf-agent -v -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Setup and configure the Icinga2 web interface:"
@@ -4725,16 +4723,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-"Ignorieren Sie eine Fehlermeldung über die Existenz von <emphasis>icingadb</"
-"emphasis>."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
-"Führen Sie <computeroutput>/usr/share/tools/edu-icinga-setup</"
-"computeroutput> aus"
+"Führen Sie <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-"
+"setup</computeroutput> aus"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Homeworld artwork:"
@@ -4749,6 +4742,19 @@ msgstr ""
 "apt install debian-edu-artwork-homeworld\n"
 "apt purge debian-edu-artwork-buster      # es sei denn, Buster-Artwork sollte als Alternative beibehalten werden"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Konfiguration anpassen und anwenden:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr " Umgang mit dem neuen LTSP und den damit verbundenen Änderungen:"
@@ -9168,6 +9174,21 @@ msgstr ""
 "Release-Handbücher auch auf der <ulink url=\"https://wiki.debian.org/"
 "DebianEdu/Documentation\">Dokumentations-Übersichtsseite</ulink>."
 
+#~ msgid "To avoid a possible squid file permission pitfall, run"
+#~ msgstr ""
+#~ "Führen Sie den folgenden Befehl aus, um ein mögliches Zugriffsproblem für "
+#~ "Squid zu vermeiden:"
+
+#, no-wrap
+#~ msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
+#~ msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
+
+#~ msgid ""
+#~ "Ignore an error message about the <emphasis>icingadb</emphasis> existence."
+#~ msgstr ""
+#~ "Ignorieren Sie eine Fehlermeldung über die Existenz von "
+#~ "<emphasis>icingadb</emphasis>."
+
 #~ msgid ""
 #~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 #~ msgstr ""


=====================================
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: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-05-23 13:30+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitojb at ubuntu.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/debian-edu-"
@@ -4140,15 +4140,6 @@ msgstr ""
 msgid "apt clean"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -4179,11 +4170,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -4200,10 +4199,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -4219,7 +4214,9 @@ msgstr "Configuración del acceso al sistema de archivos"
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "cf-agent -v -D di,installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr "Configurar la instalación de PXE"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4232,14 +4229,11 @@ msgid ""
 "choose <emphasis role=\"strong\">No</emphasis> if asked by debconf."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+msgid ""
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
 "ejecute <computeroutput>/usr/share/debian-edu-config/tools/copy-host-keytab</"
 "computeroutput>"
@@ -4256,6 +4250,18 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+msgid "Adjust Xfce panel configuration:"
+msgstr "Configuración del acceso al sistema de archivos"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr ""


=====================================
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: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-03-04 22:21+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud at neuf.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -4639,16 +4639,6 @@ msgstr "Nettoyez le cache de paquets :"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-"Pour éviter un écueil potentiel dans les droits du fichier squid, exécutez :"
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -4694,13 +4684,24 @@ msgstr ""
 "dessous. Dans la plupart des cas, appuyer sur entrée sera suffisant."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "Redémarrez les services : choisir Oui."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
 msgstr "base-passwd : choisir Oui."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+"openssh-server : choisir « garder la version locale installée actuellement »."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "/etc/munin/munin.conf: Choose N."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr "/etc/munin/munin.conf : choisir N."
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4717,11 +4718,6 @@ msgstr "Serveurs Kerberos : entrer « kerberos » et appuyer sur « OK »."
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/slapd : choisir N."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-"openssh-server : choisir « garder la version locale installée actuellement »."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr "/etc/cups/cups-files.conf : choisir N."
@@ -4735,9 +4731,12 @@ msgid "Apply and adjust configuration:"
 msgstr "Appliquer la configuration et l'ajuster :"
 
 #. type: CDATA
-#, no-wrap
-msgid "cf-agent -v -D di,installation"
-msgstr "cf-agent -v -D di,installation"
+#, fuzzy, no-wrap
+#| msgid "cf-agent -v -D installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
+msgstr "cf-agent -v -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Setup and configure the Icinga2 web interface:"
@@ -4754,15 +4753,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-"Ignorez le message d'erreur sur l'existence d'<emphasis>icingadb</emphasis>."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
-msgstr ""
-"Exécutez la commande <computeroutput>/usr/share/tools/edu-icinga-setup</"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
 "computeroutput>"
+msgstr ""
+"Exécutez la commande <computeroutput>/usr/share/debian-edu-config/tools/edu-"
+"icinga-setup</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Homeworld artwork:"
@@ -4777,6 +4772,19 @@ msgstr ""
 "apt install debian-edu-artwork-homeworld\n"
 "apt purge debian-edu-artwork-buster      # sauf si le thème de Buster doit être gardé comme alternative"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Appliquer la configuration et l'ajuster :"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "Cope with new LTSP and related changes, run:"
@@ -9228,6 +9236,21 @@ msgstr ""
 "\"https://wiki.debian.org/DebianEdu/Documentation\">manuels de publication</"
 "ulink>."
 
+#~ msgid "To avoid a possible squid file permission pitfall, run"
+#~ msgstr ""
+#~ "Pour éviter un écueil potentiel dans les droits du fichier squid, "
+#~ "exécutez :"
+
+#, no-wrap
+#~ msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
+#~ msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
+
+#~ msgid ""
+#~ "Ignore an error message about the <emphasis>icingadb</emphasis> existence."
+#~ msgstr ""
+#~ "Ignorez le message d'erreur sur l'existence d'<emphasis>icingadb</"
+#~ "emphasis>."
+
 #~ msgid ""
 #~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 #~ msgstr ""


=====================================
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: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-03-15 19:00+0100\n"
 "Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -4546,16 +4546,6 @@ msgstr "Ripulire la cache dei pacchetti:"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-"Per evitare un possibile problema di permessi per i file di Squid, eseguire"
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr "Preparare e avviare l'aggiornamento a Bullseye:"
@@ -4598,12 +4588,23 @@ msgstr ""
 "diversamente in seguito: nella maggior parte dei casi funzionerà."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "restart services: scegliere yes."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
-msgstr "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
+msgstr "base-passwd: Choose Yes."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+"openssh-server: Scegliere 'keep the local version currently installed'."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "/etc/munin/munin.conf: Choose N."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr "/etc/munin/munin.conf: Scegliere N."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -4621,11 +4622,6 @@ msgstr "Server Kerberos: inserire 'kerberos' e premere 'OK'."
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/slapd: Scegliere N."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-"openssh-server: Scegliere 'keep the local version currently installed'."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr "/etc/cups/cups-files.conf: Scegliere N."
@@ -4639,9 +4635,12 @@ msgid "Apply and adjust configuration:"
 msgstr "Applicare e regolare la configurazione:"
 
 #. type: CDATA
-#, no-wrap
-msgid "cf-agent -v -D di,installation"
-msgstr "cf-agent -v -D di,installation"
+#, fuzzy, no-wrap
+#| msgid "cf-agent -v -D installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
+msgstr "cf-agent -v -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Setup and configure the Icinga2 web interface:"
@@ -4658,15 +4657,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-"Ignorare un messaggio di errore riguardante l'esistenza di "
-"<emphasis>icingadb</emphasis>."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
-"eseguire <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"eseguire <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-"
+"setup</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Homeworld artwork:"
@@ -4681,6 +4676,19 @@ msgstr ""
 "apt install debian-edu-artwork-homeworld\n"
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Applicare e regolare la configurazione:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "Cope with new LTSP and related changes, run:"
@@ -9044,6 +9052,21 @@ msgstr ""
 "delle relative versioni sui <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">manuali delle versioni</ulink>."
 
+#~ msgid "To avoid a possible squid file permission pitfall, run"
+#~ msgstr ""
+#~ "Per evitare un possibile problema di permessi per i file di Squid, "
+#~ "eseguire"
+
+#, no-wrap
+#~ msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
+#~ msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
+
+#~ msgid ""
+#~ "Ignore an error message about the <emphasis>icingadb</emphasis> existence."
+#~ msgstr ""
+#~ "Ignorare un messaggio di errore riguardante l'esistenza di "
+#~ "<emphasis>icingadb</emphasis>."
+
 #~ msgid ""
 #~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 #~ msgstr ""


=====================================
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: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-06-18 23:24+0000\n"
 "Last-Translator: hoxp18 <hoxp18 at noramail.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/debian-edu-"
@@ -4399,15 +4399,6 @@ msgstr "パッケージキャッシュの掃除:"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr "squid でのファイル権限周りのトラブル回避のため、"
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr "Bullseye へのアップグレードの準備と実行 (security パスの変更点):"
@@ -4452,13 +4443,24 @@ msgstr ""
 "す。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "restart services: \"yes\" を選択します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
 msgstr "base-passwd: \"yes\" を選択します。"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+"openssh-server: 'keep the local version currently installed' を選択します。"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "/etc/munin/munin.conf: Choose N."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr "/etc/munin/munin.conf: N を選択します。"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4475,11 +4477,6 @@ msgstr "Kerberos servers: 'kerberos' と入力して 'OK' を選択します。"
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/slapd: N を選択します。"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-"openssh-server: 'keep the local version currently installed' を選択します。"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr "/etc/cups/cups-files.conf: N を選択します。"
@@ -4493,9 +4490,12 @@ msgid "Apply and adjust configuration:"
 msgstr "設定の適用と調整:"
 
 #. type: CDATA
-#, no-wrap
-msgid "cf-agent -v -D di,installation"
-msgstr "cf-agent -v -D di,installation"
+#, fuzzy, no-wrap
+#| msgid "cf-agent -v -D installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
+msgstr "cf-agent -v -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Setup and configure the Icinga2 web interface:"
@@ -4512,14 +4512,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr "<emphasis>icingadb</emphasis> の存在に関するエラーは無視します。"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
-"<computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput> を実行しま"
-"す。"
+"<computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput> を実行します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Homeworld artwork:"
@@ -4534,6 +4531,19 @@ msgstr ""
 "apt install debian-edu-artwork-homeworld\n"
 "apt purge debian-edu-artwork-buster      # Buster のアートワークが代用として不要な場合"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "設定の適用と調整:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr "新しい LTSP と関連する変更に対する修正:"
@@ -8880,6 +8890,17 @@ msgstr ""
 "ulink> にあります。あるいは <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">リリースマニュアル</ulink> で関連しているものをご覧ください。"
 
+#~ msgid "To avoid a possible squid file permission pitfall, run"
+#~ msgstr "squid でのファイル権限周りのトラブル回避のため、"
+
+#, no-wrap
+#~ msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
+#~ msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
+
+#~ msgid ""
+#~ "Ignore an error message about the <emphasis>icingadb</emphasis> existence."
+#~ msgstr "<emphasis>icingadb</emphasis> の存在に関するエラーは無視します。"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "NBD (ネットワークブロックデバイス) サーバー"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nb-no.po
=====================================
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2020-10-16 02:26+0000\n"
 "Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -4743,15 +4743,6 @@ msgstr "Opprydding i pakkens hurtigbuffer:"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
@@ -4798,15 +4789,23 @@ msgstr ""
 "bruk bare «return»-tasten."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "omstart av tjenester: Velg ja."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "restart services: Choose yes."
-msgid "base-passwd: Choose yes."
+#| msgid "restart services: Choose Yes."
+msgid "base-passwd: Choose Yes."
 msgstr "omstart av tjenester: Velg ja."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4823,10 +4822,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/ldap2zone: Velg  Y."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -4842,7 +4837,9 @@ msgstr "Aktiver og juster oppsett:"
 #. type: CDATA
 #, fuzzy, no-wrap
 #| msgid "cf-agent -I -D installation"
-msgid "cf-agent -v -D di,installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr "cf-agent -I -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4861,17 +4858,14 @@ msgstr ""
 "kjør <computeroutput>exportfs</computeroutput> for å kontrollere at "
 "<emphasis>gss/krb5i</emphasis> er aktivt for begge oppføringer."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
 #| "run <computeroutput>/usr/share/debian-edu-config/tools/copy-host-keytab</"
 #| "computeroutput>"
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+msgid ""
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
 "kjør <computeroutput>/usr/share/debian-edu-config/tools/copy-host-keytab</"
 "computeroutput>"
@@ -4888,6 +4882,19 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Aktiver og juster oppsett:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "Other LDAP related changes"


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nl.po
=====================================
The diff for this file was not included because it is too large.

=====================================
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: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-03-31 19:01+0000\n"
 "Last-Translator: WaldiS <sto at tutanota.de>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -3976,15 +3976,6 @@ msgstr ""
 msgid "apt clean"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -4015,11 +4006,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "base-passwd: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -4036,10 +4035,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -4054,7 +4049,9 @@ msgstr "Zastosuj i dostosuj konfigurację:"
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "cf-agent -v -D di,installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr "instalacja cf-agent -I -D"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4069,11 +4066,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4088,6 +4082,19 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Zastosuj i dostosuj konfigurację:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pot
=====================================
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\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"
@@ -3337,15 +3337,6 @@ msgstr ""
 msgid "apt clean"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -3376,11 +3367,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "base-passwd: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -3397,10 +3396,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -3415,7 +3410,9 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "cf-agent -v -D di,installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3430,11 +3427,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3448,6 +3442,17 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Adjust Xfce panel configuration:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt-br.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-06-11 18:33+0000\n"
 "Last-Translator: Barbara Tostes <barbaratostes at gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -4595,16 +4595,6 @@ msgstr "Limpar a cache do pacote:"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-"Para evitar um possível problema nas permissões do arquivo squid, executar"
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -4650,13 +4640,23 @@ msgstr ""
 "o indicado."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "reiniciar serviços: Escolher sim."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
 msgstr "base-passwd: Escolher sim."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr "openssh-server: Escolher 'manter a versão local atualmente instalada'."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "/etc/munin/munin.conf: Choose N."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr "/etc/munin/munin.conf: Escolher N."
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4673,10 +4673,6 @@ msgstr "servidores Kerberos: Introduzir 'kerberos' e apertar 'OK'."
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/slapd: Escolher N."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr "openssh-server: Escolher 'manter a versão local atualmente instalada'."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr "/etc/cups/cups-files.conf: Escolher N."
@@ -4690,9 +4686,12 @@ msgid "Apply and adjust configuration:"
 msgstr "Aplicar e ajustar a configuração:"
 
 #. type: CDATA
-#, no-wrap
-msgid "cf-agent -v -D di,installation"
-msgstr "cf-agent -v -D di,installation"
+#, fuzzy, no-wrap
+#| msgid "cf-agent -v -D installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
+msgstr "cf-agent -v -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Setup and configure the Icinga2 web interface:"
@@ -4709,15 +4708,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-"Ignorar uma mensagem de erro sobre a existência da <emphasis>icingadb</"
-"emphasis>."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
-"Executar <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Executar <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-"
+"setup</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Homeworld artwork:"
@@ -4732,6 +4727,19 @@ msgstr ""
 "apt install debian-edu-artwork-homeworld\n"
 "apt purge debian-edu-artwork-buster # a menos que se queira manter as imagens do Buster como alternativa"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Aplicar e ajustar a configuração:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "Cope with new LTSP and related changes:"
@@ -9225,6 +9233,20 @@ msgstr ""
 "versões na página <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">manuais das diferentes versões</ulink>."
 
+#~ msgid "To avoid a possible squid file permission pitfall, run"
+#~ msgstr ""
+#~ "Para evitar um possível problema nas permissões do arquivo squid, executar"
+
+#, no-wrap
+#~ msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
+#~ msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
+
+#~ msgid ""
+#~ "Ignore an error message about the <emphasis>icingadb</emphasis> existence."
+#~ msgstr ""
+#~ "Ignorar uma mensagem de erro sobre a existência da <emphasis>icingadb</"
+#~ "emphasis>."
+
 #~ msgid ""
 #~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 #~ msgstr ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt-pt.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-04-19 22:29+0000\n"
 "Last-Translator: José Vieira <jvieira33 at sapo.pt>\n"
 "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/"
@@ -4593,16 +4593,6 @@ msgstr "Limpar a cache do pacote:"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-"Para evitar um possível problema nas permissões do ficheiro squid, executar"
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -4648,13 +4638,23 @@ msgstr ""
 "(enter) é o indicado."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "reiniciar serviços: Escolher 'sim'."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
 msgstr "senha-base: Escolher 'sim'."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr "openssh-server: Escolher 'manter a versão local atualmente instalada'."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "/etc/munin/munin.conf: Choose N."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr "/etc/munin/munin.conf: Escolher N."
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4671,10 +4671,6 @@ msgstr "servidores Kerberos: Introduzir 'kerberos' e premir 'OK'."
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/slapd: Escolher N."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr "openssh-server: Escolher 'manter a versão local atualmente instalada'."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr "/etc/cups/cups-files.conf: Escolher N."
@@ -4688,9 +4684,12 @@ msgid "Apply and adjust configuration:"
 msgstr "Aplicar e ajustar a configuração:"
 
 #. type: CDATA
-#, no-wrap
-msgid "cf-agent -v -D di,installation"
-msgstr "cf-agent -v -D di,installation"
+#, fuzzy, no-wrap
+#| msgid "cf-agent -v -D installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
+msgstr "cf-agent -v -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Setup and configure the Icinga2 web interface:"
@@ -4707,15 +4706,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-"Ignorar uma mensagem de erro sobre a existência da <emphasis>icingadb</"
-"emphasis>."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
-"Executar <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Executar <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-"
+"setup</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Homeworld artwork:"
@@ -4730,6 +4725,19 @@ msgstr ""
 "apt install debian-edu-artwork-homeworld\n"
 "apt purge debian-edu-artwork-buster      # a menos que se queira manter as imagens do Buster como alternativa"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Aplicar e ajustar a configuração:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "Cope with new LTSP and related changes, run:"
@@ -9115,6 +9123,21 @@ msgstr ""
 "versões na página <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">manuais das diferentes versões</ulink>."
 
+#~ msgid "To avoid a possible squid file permission pitfall, run"
+#~ msgstr ""
+#~ "Para evitar um possível problema nas permissões do ficheiro squid, "
+#~ "executar"
+
+#, no-wrap
+#~ msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
+#~ msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
+
+#~ msgid ""
+#~ "Ignore an error message about the <emphasis>icingadb</emphasis> existence."
+#~ msgstr ""
+#~ "Ignorar uma mensagem de erro sobre a existência da <emphasis>icingadb</"
+#~ "emphasis>."
+
 #~ msgid ""
 #~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 #~ msgstr ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-05-15 18:32+0000\n"
 "Last-Translator: ssantos <ssantos at web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/debian-edu-"
@@ -4596,16 +4596,6 @@ msgstr "Limpar a cache do pacote:"
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-"Para evitar um possível problema nas permissões do ficheiro squid, executar"
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -4651,13 +4641,23 @@ msgstr ""
 "(enter) é o indicado."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "restart services: Escolher sim."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
 msgstr "base-passwd: Escolher yes."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr "openssh-server: Escolher 'keep the local version currently installed'."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "/etc/munin/munin.conf: Choose N."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr "/etc/munin/munin.conf: Escolher N."
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4674,10 +4674,6 @@ msgstr "Kerberos servers: Introduzir 'kerberos' e premir 'OK'."
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/slapd: Escolher N."
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr "openssh-server: Escolher 'keep the local version currently installed'."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr "/etc/cups/cups-files.conf: Escolher N."
@@ -4691,9 +4687,12 @@ msgid "Apply and adjust configuration:"
 msgstr "Aplicar e ajustar a configuração:"
 
 #. type: CDATA
-#, no-wrap
-msgid "cf-agent -v -D di,installation"
-msgstr "cf-agent -v -D di,installation"
+#, fuzzy, no-wrap
+#| msgid "cf-agent -v -D installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
+msgstr "cf-agent -v -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Setup and configure the Icinga2 web interface:"
@@ -4710,15 +4709,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-"Ignorar uma mensagem de erro sobre a existência da <emphasis>icingadb</"
-"emphasis>."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
-"Executar <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Executar <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-"
+"setup</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Get the new Debian Edu Homeworld artwork:"
@@ -4733,6 +4728,19 @@ msgstr ""
 "apt install debian-edu-artwork-homeworld\n"
 "apt purge debian-edu-artwork-buster      # a menos que se queira manter as imagens do Buster como alternativa"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Aplicar e ajustar a configuração:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "Cope with new LTSP and related changes, run:"
@@ -9116,6 +9124,21 @@ msgstr ""
 "versões na página <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">manuais das diferentes versões</ulink>."
 
+#~ msgid "To avoid a possible squid file permission pitfall, run"
+#~ msgstr ""
+#~ "Para evitar um possível problema nas permissões do ficheiro squid, "
+#~ "executar"
+
+#, no-wrap
+#~ msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
+#~ msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
+
+#~ msgid ""
+#~ "Ignore an error message about the <emphasis>icingadb</emphasis> existence."
+#~ msgstr ""
+#~ "Ignorar uma mensagem de erro sobre a existência da <emphasis>icingadb</"
+#~ "emphasis>."
+
 #~ msgid ""
 #~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 #~ msgstr ""


=====================================
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: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2019-12-11 17:02+0000\n"
 "Last-Translator: Catalin ENE <catalin.ene73 at gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/debian-edu-"
@@ -4861,15 +4861,6 @@ msgstr ""
 msgid "apt clean"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -4900,11 +4891,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -4921,10 +4920,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -4940,7 +4935,9 @@ msgstr ""
 #. type: CDATA
 #, fuzzy, no-wrap
 #| msgid "After the installation:"
-msgid "cf-agent -v -D di,installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr "Dupa instalrea lui procedati dupa cum urmeaza:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4953,15 +4950,12 @@ msgid ""
 "choose <emphasis role=\"strong\">No</emphasis> if asked by debconf."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "<computeroutput>lsblk -p</computeroutput>"
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+msgid ""
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr "<computeroutput>lsblk -p</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4975,6 +4969,19 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Configuratia accessului la sistemul de fisiere"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.sv.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2020-08-21 10:36+0000\n"
 "Last-Translator: Luna Jernberg <droidbittin at gmail.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/debian-edu-"
@@ -3420,15 +3420,6 @@ msgstr ""
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -3459,11 +3450,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -3480,10 +3479,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -3499,7 +3494,9 @@ msgstr ""
 #. type: CDATA
 #, fuzzy, no-wrap
 #| msgid "cf-agent -I -D installation"
-msgid "cf-agent -v -D di,installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr "cf-agent -I -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3512,17 +3509,14 @@ msgid ""
 "choose <emphasis role=\"strong\">No</emphasis> if asked by debconf."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
 #| "run <computeroutput>/usr/share/debian-edu-config/tools/copy-host-keytab</"
 #| "computeroutput>"
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+msgid ""
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
 "kör <computeroutput>usr/share/debian-edu-config/tools/copy-host-keytab</"
 "computeroutput>"
@@ -3538,6 +3532,19 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Automatic Configuration"
+msgid "Adjust Xfce panel configuration:"
+msgstr "Automatisk konfiguration"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml
=====================================
@@ -1528,10 +1528,6 @@ apt full-upgrade]]></screen>
 </para></listitem></itemizedlist><screen><![CDATA[apt clean]]></screen>
 <itemizedlist>
 <listitem>
-<para>To avoid a possible squid file permission pitfall, run 
-</para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/squid/conf.d/debian-edu.conf]]></screen>
-<itemizedlist>
-<listitem>
 <para>Prepare and start the upgrade to Bullseye (new security entry):  
 </para></listitem></itemizedlist><screen><![CDATA[sed -i 's/buster/bullseye/g' /etc/apt/sources.list
 sed -i 's#/debian-security bullseye/updates# bullseye-security#g' /etc/apt/sources.list
@@ -1547,10 +1543,16 @@ apt full-upgrade]]></screen>
 </para>
 <itemizedlist>
 <listitem>
-<para>restart services: Choose yes. 
+<para>restart services: Choose Yes. 
+</para></listitem>
+<listitem>
+<para>base-passwd: Choose Yes. 
+</para></listitem>
+<listitem>
+<para>openssh-server: Choose 'keep the local version currently installed'. 
 </para></listitem>
 <listitem>
-<para>base-passwd: Choose yes. 
+<para>/etc/plymouth/plymouthd.conf: Choose Y. 
 </para></listitem>
 <listitem>
 <para>Samba server and utilities: Choose 'keep the local version currently installed'. 
@@ -1562,9 +1564,6 @@ apt full-upgrade]]></screen>
 <para>/etc/default/slapd: Choose N. 
 </para></listitem>
 <listitem>
-<para>openssh-server: Choose 'keep the local version currently installed'. 
-</para></listitem>
-<listitem>
 <para>/etc/cups/cups-files.conf: Choose N. 
 </para></listitem>
 <listitem>
@@ -1572,7 +1571,8 @@ apt full-upgrade]]></screen>
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>Apply and adjust configuration: 
-</para></listitem></itemizedlist><screen><![CDATA[cf-agent -v -D di,installation]]></screen>
+</para></listitem></itemizedlist><screen><![CDATA[cf-agent -v -D installation
+service squid restart]]></screen>
 <itemizedlist>
 <listitem>
 <para>Setup and configure the Icinga2 web interface: 
@@ -1582,10 +1582,7 @@ apt full-upgrade]]></screen>
 <para>Run <computeroutput>apt install icinga2-ido-mysql</computeroutput>, always choose <emphasis role="strong">No</emphasis> if asked by debconf. 
 </para></listitem>
 <listitem>
-<para>Ignore an error message about the <emphasis>icingadb</emphasis> existence. 
-</para></listitem>
-<listitem>
-<para>Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput> 
+<para>Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</computeroutput> 
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>Get the new Debian Edu Homeworld artwork: 
@@ -1593,6 +1590,11 @@ apt full-upgrade]]></screen>
 apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative]]></screen>
 <itemizedlist>
 <listitem>
+<para>Adjust Xfce panel configuration: 
+</para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved
+mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml]]></screen>
+<itemizedlist>
+<listitem>
 <para>Cope with new LTSP and related changes: 
 </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/default/tftpd-hpa        # to remove no longer needed modifications
 rm -rf /var/lib/tftpboot            # to remove no longer used tftp base directory


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-cn.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\n"
 "PO-Revision-Date: 2021-03-18 22:18+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -4070,15 +4070,6 @@ msgstr "清理软件包仓库："
 msgid "apt clean"
 msgstr "apt clean"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
@@ -4121,14 +4112,22 @@ msgstr ""
 "非在下面有不同的规定；大多数情况点回车就好了。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
 msgstr "restart services：选择 yes。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-msgid "base-passwd: Choose yes."
+msgid "base-passwd: Choose Yes."
 msgstr "restart services：选择 yes。"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Samba server and utilities: Choose 'keep the local version currently "
@@ -4144,10 +4143,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr "/etc/default/ldap2zone：选择 Y。"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -4162,7 +4157,9 @@ msgstr "应用和调整配置："
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "cf-agent -v -D di,installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr "cf-agent -I -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4175,14 +4172,11 @@ msgid ""
 "choose <emphasis role=\"strong\">No</emphasis> if asked by debconf."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+msgid ""
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
 "运行 <computeroutput>/usr/share/debian-edu-config/tools/copy-host-keytab</"
 "computeroutput>"
@@ -4199,6 +4193,19 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Apply and adjust configuration:"
+msgid "Adjust Xfce panel configuration:"
+msgstr "应用和调整配置："
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "LDAP related changes"
@@ -8123,6 +8130,10 @@ msgstr ""
 "述；或参阅<ulink url=\"https://wiki.debian.org/DebianEdu/Documentation\">发行"
 "手册页面</ulink>上相关的发行手册。"
 
+#, no-wrap
+#~ msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
+#~ msgstr "rm -f /etc/squid/conf.d/debian-edu.conf"
+
 #~ msgid ""
 #~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 #~ msgstr ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-tw.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-17 22:49+0200\n"
+"POT-Creation-Date: 2021-06-24 11:02+0200\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/"
@@ -3419,15 +3419,6 @@ msgstr ""
 msgid "apt clean"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "To avoid a possible squid file permission pitfall, run"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "rm -f /etc/squid/conf.d/debian-edu.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye (new security entry):"
 msgstr ""
@@ -3458,11 +3449,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "restart services: Choose yes."
+msgid "restart services: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "base-passwd: Choose Yes."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "openssh-server: Choose 'keep the local version currently installed'."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "base-passwd: Choose yes."
+msgid "/etc/plymouth/plymouthd.conf: Choose Y."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -3479,10 +3478,6 @@ msgstr ""
 msgid "/etc/default/slapd: Choose N."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "openssh-server: Choose 'keep the local version currently installed'."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/cups/cups-files.conf: Choose N."
 msgstr ""
@@ -3498,7 +3493,9 @@ msgstr ""
 #. type: CDATA
 #, fuzzy, no-wrap
 #| msgid "Installation"
-msgid "cf-agent -v -D di,installation"
+msgid ""
+"cf-agent -v -D installation\n"
+"service squid restart"
 msgstr "安裝"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3513,11 +3510,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Ignore an error message about the <emphasis>icingadb</emphasis> existence."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Run <computeroutput>/usr/share/tools/edu-icinga-setup</computeroutput>"
+"Run <computeroutput>/usr/share/debian-edu-config/tools/edu-icinga-setup</"
+"computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3531,6 +3525,19 @@ msgid ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Automatic Configuration"
+msgid "Adjust Xfce panel configuration:"
+msgstr "自動配置"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved\n"
+"mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with new LTSP and related changes:"
 msgstr ""


=====================================
documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml
=====================================
@@ -12,12 +12,14 @@ enter password: ********
 root at tjener:~#]]></screen><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/GettingStarted?action=AttachFile&do=get&target=gosa_systems_list.png" width="800"/></imageobject><textobject><phrase>GOsa² systems listing</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/GettingStarted?action=AttachFile&do=get&target=gosa_systems_host_details.png" width="800"/></imageobject><textobject><phrase>Host details</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/GettingStarted?action=AttachFile&do=get&target=gosa_systems_edit_host.png" width="800"/></imageobject><textobject><phrase>Modify host</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/GettingStarted?action=AttachFile&do=get&target=gosa_systems_add_netgroup.png" width="800"/></imageobject><textobject><phrase>Add netgroup</phrase></textobject></inlinemediaobject> </para><para>A cronjob updating DNS runs every hour; <code>su -c ldap2bind</code> can be used to trigger the update manually.  </para><section><title>Search and delete machines</title><para>Searching for and deleting machines is quite similar to searching for and deleting users, so that information is not repeated here. </para></section><section><title>Modify existing machines / Netgroup management</title><para>After adding a machine to the LDAP tree using GOsa², you can modify its properties using the search functionality and clicking on the machine name (as you would with users). </para><para>The format of these system entries is similar to the one you already know from modifying user entries, but the fields mean different things in this context. </para><para>For example, adding a machine to a <code>NetGroup</code> does not modify the file access or command execution permissions for that machine or the users logged in to that machine; instead it restricts the services that machine can use on your main-server. </para><para>The default installation provides the <code>NetGroups</code> </para><itemizedlist><listitem><para>all-hosts </para></listitem><listitem><para>cups-queue-autoflush-hosts </para></listitem><listitem><para>cups-queue-autoreenable-hosts </para></listitem><listitem><para>fsautoresize-hosts </para></listitem><listitem><para>ltsp-server-hosts </para></listitem><listitem><para>netblock-hosts </para></listitem><listitem><para>printer-hosts </para></listitem><listitem><para>server-hosts </para></listitem><listitem><para>shutdown-at-night-hosts </para></listitem><listitem><para>shutdown-at-night-wakeup-hosts-blacklist </para></listitem><listitem><para>workstation-hosts </para></listitem></itemizedlist><para>Currently the <code>NetGroup</code> functionality is used for: </para><itemizedlist><listitem><para><emphasis role="strong">Resizing partitions</emphasis> (fsautoresize-hosts) </para><itemizedlist><listitem override="none"><para>Debian Edu machines in this group will automatically resize LVM partitions that run out of space. </para></listitem></itemizedlist></listitem><listitem><para><emphasis role="strong">Shutdown machines at night</emphasis> (shutdown-at-night-hosts and shutdown-at-night-wakeup-hosts-blacklist) </para><itemizedlist><listitem override="none"><para>Debian Edu machines in this group will automatically shut down at night to save energy. </para></listitem></itemizedlist></listitem><listitem><para><emphasis role="strong">Managing printers</emphasis> (cups-queue-autoflush-hosts and cups-queue-autoreenable-hosts) </para><itemizedlist><listitem override="none"><para>Debian Edu machines in these groups will automatically flush all print queues every night, and re-enable any disabled print queue every hour. </para></listitem></itemizedlist></listitem><listitem><para><emphasis role="strong">Blocking Internet access</emphasis> (netblock-hosts) </para><itemizedlist><listitem override="none"><para>Debian Edu machines in this group will be allowed to connect to machines only on the local network.  Combined with web proxy restrictions this might be used during exams. </para></listitem></itemizedlist></listitem></itemizedlist></section></section></section><section><title>Printer Management</title><para>For centralized printer management point your web browser to <ulink url="https://www.intern:631"/>. This is the normal CUPS management interface where you can add/delete/modify your printers and can clean up the printing queue. By default only the first user is allowed but this can be changed by adding users to the GOsa² <code>printer-admins</code> group. </para><section><title>Use printers attached to workstations</title><para>The package <emphasis>p910nd</emphasis> is installed by default on a system with the <emphasis>Workstation</emphasis> profile. </para><itemizedlist><listitem><para>Edit <code>/etc/default/p910nd</code> like this (USB printer): </para><itemizedlist><listitem><para>P910ND_OPTS="-f /dev/usb/lp0"  </para></listitem><listitem><para>P910ND_START=1 </para></listitem></itemizedlist></listitem><listitem><para>Configure the printer using the web interface <code>https://www.intern:631</code>; choose network printer type <code>AppSocket/HP JetDirect</code> (for all printers regardless of brand or model) and set <code>socket://<workstation ip>:9100</code> as connection URI. </para></listitem></itemizedlist></section><section><title>Network printers</title><para>It is recommended to disable all self-advertising features in the used network printers. Instead, assign a fixed IP address with GOsa² and configure them as <code>AppSocket/HP JetDirect</code> network printers. </para></section></section><section><title>Clock synchronisation</title><para>The default configuration in Debian Edu is to keep the clocks on all machines synchronous but not necessarily correct.  NTP is used to update the time. The clocks will be synchronised with an external source by default.  This can cause machines to keep the external Internet connection open if it is created when used. </para><para><inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org/htdocs/debwiki/img/alert.png" width="16"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> If you use dialup or ISDN and pay per minute, you want to change this default setting. </para><para>To disable synchronisation with an external clock, the file /etc/ntp.conf on the main server needs to be modified. Add comment ("#") marks in front of the <code>server</code> entries. After this, the NTP server needs to be restarted by running <code>service ntp restart</code> as root. To test if a machine is using the external clock sources, run <code>ntpq -c lpeer</code>. </para></section><section><title>Extending full partitions</title><para>Because of a possible bug with automatic partitioning, some partitions might be too full after installation.  To extend these partitions, run <code>debian-edu-fsautoresize -n</code> as root.  See the "Resizing Partitions" HowTo in the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Administration#">administration HowTo chapter</ulink> for more information. </para><para><ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/CategoryPermalink#">CategoryPermalink</ulink> </para></section><para><anchor id="Maintenance"/> </para><section><title>Maintenance</title><section><title>Updating the software</title><para>This section explains how to use <code>apt full-upgrade</code>. </para><para>Using <code>apt</code> is really simply. To update a system you need to execute two commands on the command line as root: <code>apt update</code> (which updates the lists of available packages) and <code>apt full-upgrade</code> (which upgrades the packages for which an upgrade is available). </para><para>It is also a good idea to upgrade using the C locale to get English output which in cases of problems is more likely to produce results in search engines. </para><screen><![CDATA[LC_ALL=C apt full-upgrade -y]]></screen><para><inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org/htdocs/debwiki/img/alert.png" width="16"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> After upgrading the <code>debian-edu-config</code> package, changed Cfengine configuration files might be available. Run <code>ls -ltr /etc/cfengine3/debian-edu/</code> to check if this is the case. To apply the changes, run <code>LC_ALL=C cf-agent -D installation</code>. </para><para><inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org/htdocs/debwiki/img/alert.png" width="16"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> It is important to run <code>debian-edu-ltsp-install --diskless_workstation yes</code> after LTSP server upgrades to keep the SquashFS image for diskless clients menu in sync. </para><para><inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org/htdocs/debwiki/img/alert.png" width="16"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> After a point release upgrade of a system with <emphasis>Main Server</emphasis> or <emphasis>LTSP Server</emphasis> profile, <code>debian-edu-pxeinstall</code> needs to be run to update the PXE installation environment. </para><para>It is also a good idea to install <code>cron-apt</code> and <code>apt-listchanges</code> and configure them to send mail to an address you are reading. </para><para><code>cron-apt</code> will notify you once a day via email about any packages that can be upgraded. It does not install these upgrades, but does download them (usually in the night), so you don't have to wait for the download when you do <code>apt full-upgrade</code>. </para><para>Automatic installation of updates can be done easily if desired, it just needs the <code>unattended-upgrades</code> package to be installed and configured as described on <ulink url="https://wiki.debian.org/UnattendedUpgrades">wiki.debian.org/UnattendedUpgrades</ulink>. </para><para><code>apt-listchanges</code> can send new changelog entries to you via email, or alternatively display them in the terminal when running <code>apt</code>. </para><section><title>Keep yourself informed about security updates</title><para>Running <code>cron-apt</code> as described above is a good way to learn when security updates are available for installed packages. Another way to stay informed about security updates is to subscribe to the <ulink url="http://lists.debian.org/debian-security-announce/">Debian security-announce mailinglist</ulink>, which has the benefit of also telling you what the security update is about. The downside (compared to <code>cron-apt</code>) is that it also includes information about updates for packages which aren't installed. </para></section></section><section><title>Backup Management</title><para>For backup management point your browser to <ulink url="https://www/slbackup-php"/>. Please note that you need to access this site via SSL, since you have to enter the root password there. If you try to access this site without using SSL it will fail.</para><para>  <inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org/htdocs/debwiki/img/alert.png" width="16"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Note: the site will only work if you temporarily allow ssh root login on the backup server (main server 'tjener' by default). </para><para>By default tjener will back up <code>/skole/tjener/home0</code>, <code>/etc/</code>, <code>/root/.svk</code> and LDAP to /skole/backup which is under the LVM. If you only want to have spare copies of things (in case you delete them) this setup should be fine for you. </para><para><inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org/htdocs/debwiki/img/alert.png" width="16"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be aware that this backup scheme doesn't protect you from failing hard drives. </para><para>If you want to back up your data to an external server, a tape device or another hard drive you'll have to modify the existing configuration a bit. </para><para>If you want to restore a complete folder, your best option is to use the command-line: </para><screen><![CDATA[$ sudo rdiff-backup -r <date>  \
    /skole/backup/tjener/skole/tjener/home0/user \
    /skole/tjener/home0/user_<date>]]></screen><para>This will leave the content from <code>/skole/tjener/home0/user</code> for <code><date></code> in the folder <code>/skole/tjener/home0/user_<date></code> </para><para>If you want to restore a single file, then you should be able to select the file (and the version) from the web interface, and download only that file. </para><para>If you want to get rid of older backups, choose "Maintenance" in the menu on the backup page and select the oldest snapshot to keep: </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/Maintenance?action=AttachFile&do=get&target=slbackup-php_maintenance.png" width="1024"/></imageobject><textobject><phrase>slbackup-php Maintenance</phrase></textobject></inlinemediaobject> </para></section><section><title>Server Monitoring</title><section><title>Munin</title><para>The Munin trend reporting system is available from <ulink url="https://www/munin/"/>.  It provides system status measurement graphs on a daily, weekly, monthly and yearly basis, and provides the system administrator with help when looking for bottlenecks and the source of system problems. </para><para>The list of machines being monitored using Munin is generated automatically, based on the list of hosts reporting to sitesummary.  All hosts with the package munin-node installed are registered for Munin monitoring.  It will normally take one day from a machine being installed until Munin monitoring starts, because of the order the cron jobs are executed.  To speed up the process, run <code>sitesummary-update-munin</code> as root on the sitesummary server (normally the main server).  This will update the <code>/etc/munin/munin.conf</code> file. </para><para>The set of measurements being collected is automatically generated on each machine using the <code>munin-node-configure</code> program which probes the plugins available from <code>/usr/share/munin/plugins/</code> and symlinks the relevant ones to <code>/etc/munin/plugins/</code>. </para><para>Information about Munin is available from <ulink url="http://munin-monitoring.org/"/>. </para></section><section><title>Icinga</title><para>Icinga system and service monitoring is available from <ulink url="https://www/icingaweb2/"/>. The set of machines and services being monitored is automatically generated using information collected by the sitesummary system. The machines with the profile Main-server and LTSP-server receive full monitoring, while workstations and thin clients receive simple monitoring. To enable full monitoring on a workstation, install the <code>nagios-nrpe-server</code> package on the workstation. </para><para>By default Icinga does not send email. This can be changed by replacing <code>notify-by-nothing</code> with <code>host-notify-by-email</code> and <code>notify-by-email</code> in the file <code>/etc/icinga/sitesummary-template-contacts.cfg</code>. </para><para>The Icinga configuration file used is <code>/etc/icinga/sitesummary.cfg</code>.  The sitesummary cron job generates <code>/var/lib/sitesummary/icinga-generated.cfg</code> with the list of hosts and services to monitor. </para><para>Extra Icinga checks can be put in the file <code>/var/lib/sitesummary/icinga-generated.cfg.post</code> to get them included in the generated file. </para><para>Information about Icinga is available from <ulink url="https://www.icinga.com/"/> or in the <code>icinga-doc</code> package. </para><section><title>Common Icinga warnings and how to handle them</title><para>Here are instructions on how to handle the most common Icinga warnings. </para><section><title>DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):</title><para>The partition (/usr/ in the example) is too full.  There are in general two ways to handle this: (1) remove some files or (2) increase the size of the partition.  If the partition is /var/, purging the APT cache by calling <code>apt clean</code> might remove some files.  If there is more room available in the LVM volume group, running the program <code>debian-edu-fsautoresize</code> to extend the partitions might help.  To run this program automatically every hour, the host in question can be added to the <code>fsautoresize-hosts</code> netgroup. </para></section><section><title>APT CRITICAL: 13 packages available for upgrade (13 critical updates).</title><para>New package are available for upgrades.  The critical ones are normally security fixes.  To upgrade, run 'apt upgrade && apt full-upgrade' as root in a terminal or log in via ssh to do the same. </para><para>If you do not want to manually upgrade packages and trust Debian to do a good job with new versions, you can configure <code>unattended-upgrades</code> to automatically upgrade all new packages every night.  This will not upgrade the LTSP chroots. </para></section><section><title>WARNING - Reboot required : running kernel = 2.6.32-37.81.0, installed kernel = 2.6.32-38.83.0</title><para>The running kernel is older than the newest installed kernel, and a reboot is required to activate the newest installed kernel.  This is normally fairly urgent, as new kernels normally show up in Debian Edu to fix security issues. </para></section><section><title>WARNING: CUPS queue size - 61</title><para>The printer queues in CUPS have a lot of jobs pending.  This is most likely because of a unavailable printer.  Disabled print queues are enabled every hour on hosts that are member of the <code>cups-queue-autoreenable-hosts</code> netgroup, so for such hosts no manual action should be required.  The print queues are emptied every night on hosts that are member of the <code>cups-queue-autoflush-hosts</code> netgroup.  If a host have a lot of jobs in their queue, consider adding this host to one or both of these netgroups. </para></section></section></section><section><title>Sitesummary</title><para>Sitesummary is used to collect information from each computer and submit it to the central server.  The information collected is available in <code>/var/lib/sitesummary/entries/</code>. Scripts in <code>/usr/lib/sitesummary/</code> are available to generate reports. </para><para>A simple report from sitesummary without any details is available from <ulink url="https://www/sitesummary/"/>. </para><para>Some documentation on sitesummary is available from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/SiteSummary"/> </para></section></section><section><title>More information about Debian Edu customisations</title><para>More information about Debian Edu customisations useful for system administrators can be found in the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Administration#">Administration Howto chapter</ulink> and in the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/AdvancedAdministration#">Advanced administration Howto chapter</ulink> </para><para><ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/CategoryPermalink#">CategoryPermalink</ulink> </para></section></section><para><anchor id="Upgrades"/> </para><section><title>Upgrades</title><para><inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org/htdocs/debwiki/img/alert.png" width="16"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Before reading this upgrade guide, please note that live updates to your production servers are carried out at your own risk. <emphasis role="strong">Debian Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by applicable law.</emphasis>  </para><para>Please read this chapter and the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/Features#">New features in Bullseye</ulink> chapter of this manual completely before attempting to upgrade. </para><section><title>General notes on upgrading</title><para>Upgrading Debian from one distribution to the next is generally rather easy. For Debian Edu this is unfortunately a bit more complicated as we modify configuration files in ways we shouldn't. However we have documented the needed steps below. (See Debian bug <ulink url="https://bugs.debian.org/311188#">311188</ulink> for more information how Debian Edu should modify configuration files.)  </para><para>In general, upgrading the servers is more difficult than the workstations and the main-server is the most difficult to upgrade. </para><para>If you want to be sure that after the upgrade everything works as before, you should test the upgrade on a test system or systems configured the same way as your production machines. There you can test the upgrade without risk and see if everything works as it should. </para><para>Make sure to also read the information about the current Debian Stable release in its <ulink url="https://www.debian.org/releases/stable/installmanual">installation manual</ulink>. </para><para>It may also be wise to wait a bit and keep running Oldstable for a few weeks longer, so that others can test the upgrade and document any problems they experience. The Oldstable release of Debian Edu will receive continued support for some time after the next Stable release, but when Debian <ulink url="https://www.debian.org/security/faq#lifespan">ceases support for Oldstable</ulink>, Debian Edu will necessarily do the same. </para></section><section><title>Upgrades from Debian Edu Buster</title><para><inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org/htdocs/debwiki/img/alert.png" width="16"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be prepared: make sure you have tested the upgrade from Buster in a test environment or have backups ready to be able to go back. </para><para>Please note that the following recipe applies to a default Debian Edu main server installation (desktop=xfce, profiles Main Server, Workstation, LTSP Server). (For a general overview concerning Buster to Bullseye upgrade, see: <ulink url="https://www.debian.org/releases/bullseye/releasenotes"/>) </para><para>Don't use X, use a virtual console, log in as root. </para><para>If <code>apt</code> finishes with an error, try to fix it and/or run <code>apt -f install</code> and then <code>apt -y full-upgrade</code> once again. </para><section><title>Upgrading the main server</title><itemizedlist><listitem><para>Start by making sure the current system is up-to-date: </para></listitem></itemizedlist><screen><![CDATA[apt update
-apt full-upgrade]]></screen><itemizedlist><listitem><para>Cleanup the package cache: </para></listitem></itemizedlist><screen><![CDATA[apt clean]]></screen><itemizedlist><listitem><para>To avoid a possible squid file permission pitfall, run </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/squid/conf.d/debian-edu.conf]]></screen><itemizedlist><listitem><para>Prepare and start the upgrade to Bullseye (new security entry):  </para></listitem></itemizedlist><screen><![CDATA[sed -i 's/buster/bullseye/g' /etc/apt/sources.list
+apt full-upgrade]]></screen><itemizedlist><listitem><para>Cleanup the package cache: </para></listitem></itemizedlist><screen><![CDATA[apt clean]]></screen><itemizedlist><listitem><para>Prepare and start the upgrade to Bullseye (new security entry):  </para></listitem></itemizedlist><screen><![CDATA[sed -i 's/buster/bullseye/g' /etc/apt/sources.list
 sed -i 's#/debian-security bullseye/updates# bullseye-security#g' /etc/apt/sources.list
 export LC_ALL=C        # optional (to get English output)
 apt update
-apt full-upgrade]]></screen><itemizedlist><listitem><para>apt-list-changes: be prepared for a lot of NEWS to read; press <return> to scroll down, <q> to leave the pager. All information will be mailed to root so that you can read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</emphasis>). </para></listitem><listitem><para>Read all debconf information carefully, choose 'keep the local version currently installed' unless stated differently below; in most cases hitting return will be fine. </para><itemizedlist><listitem><para>restart services: Choose yes. </para></listitem><listitem><para>base-passwd: Choose yes. </para></listitem><listitem><para>Samba server and utilities: Choose 'keep the local version currently installed'. </para></listitem><listitem><para>Kerberos servers: Enter 'kerberos' and hit 'OK'. </para></listitem><listitem><para>/etc/default/slapd: Choose N. </para></listitem><listitem><para>openssh-server: Choose 'keep the local version currently installed'. </para></listitem><listitem><para>/etc/cups/cups-files.conf: Choose N. </para></listitem><listitem><para>/etc/munin/munin.conf: Choose N. </para></listitem></itemizedlist></listitem><listitem><para>Apply and adjust configuration: </para></listitem></itemizedlist><screen><![CDATA[cf-agent -v -D di,installation]]></screen><itemizedlist><listitem><para>Setup and configure the Icinga2 web interface: </para><itemizedlist><listitem><para>Run <code>apt install icinga2-ido-mysql</code>, always choose <emphasis role="strong">No</emphasis> if asked by debconf. </para></listitem><listitem><para>Ignore an error message about the <emphasis>icingadb</emphasis> existence. </para></listitem><listitem><para>Run <code>/usr/share/tools/edu-icinga-setup</code> </para></listitem></itemizedlist></listitem><listitem><para>Get the new Debian Edu Homeworld artwork: </para></listitem></itemizedlist><screen><![CDATA[apt install debian-edu-artwork-homeworld
-apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative]]></screen><itemizedlist><listitem><para>Cope with new LTSP and related changes: </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/default/tftpd-hpa        # to remove no longer needed modifications
+apt full-upgrade]]></screen><itemizedlist><listitem><para>apt-list-changes: be prepared for a lot of NEWS to read; press <return> to scroll down, <q> to leave the pager. All information will be mailed to root so that you can read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</emphasis>). </para></listitem><listitem><para>Read all debconf information carefully, choose 'keep the local version currently installed' unless stated differently below; in most cases hitting return will be fine. </para><itemizedlist><listitem><para>restart services: Choose Yes. </para></listitem><listitem><para>base-passwd: Choose Yes. </para></listitem><listitem><para>openssh-server: Choose 'keep the local version currently installed'. </para></listitem><listitem><para>/etc/plymouth/plymouthd.conf: Choose Y. </para></listitem><listitem><para>Samba server and utilities: Choose 'keep the local version currently installed'. </para></listitem><listitem><para>Kerberos servers: Enter 'kerberos' and hit 'OK'. </para></listitem><listitem><para>/etc/default/slapd: Choose N. </para></listitem><listitem><para>/etc/cups/cups-files.conf: Choose N. </para></listitem><listitem><para>/etc/munin/munin.conf: Choose N. </para></listitem></itemizedlist></listitem><listitem><para>Apply and adjust configuration: </para></listitem></itemizedlist><screen><![CDATA[cf-agent -v -D installation
+service squid restart]]></screen><itemizedlist><listitem><para>Setup and configure the Icinga2 web interface: </para><itemizedlist><listitem><para>Run <code>apt install icinga2-ido-mysql</code>, always choose <emphasis role="strong">No</emphasis> if asked by debconf. </para></listitem><listitem><para>Run <code>/usr/share/debian-edu-config/tools/edu-icinga-setup</code> </para></listitem></itemizedlist></listitem><listitem><para>Get the new Debian Edu Homeworld artwork: </para></listitem></itemizedlist><screen><![CDATA[apt install debian-edu-artwork-homeworld
+apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative]]></screen><itemizedlist><listitem><para>Adjust Xfce panel configuration: </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/xdg/xfce4/panel/default.xml.cfsaved
+mv /etc/xdg/xfce4/panel/default.xml.dpkg-new /etc/xdg/xfce4/panel/default.xml]]></screen><itemizedlist><listitem><para>Cope with new LTSP and related changes: </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/default/tftpd-hpa        # to remove no longer needed modifications
 rm -rf /var/lib/tftpboot            # to remove no longer used tftp base directory
 dpkg-reconfigure -p low tftpd-hpa   # first prompt: keep ''tftp'' as system account, second: change TFTP root directory to ''/srv/tftp''
                                     # third: keep address and port, last one: enter ''--secure'' as additional option 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/459dcdfb615104898369a8b0e7851b145059da14

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/459dcdfb615104898369a8b0e7851b145059da14
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/20210624/cd45772d/attachment-0001.htm>