[debian-edu-commits] debian-edu/ 01/01: updated from the wiki
Holger Levsen
holger at layer-acht.org
Sat Jan 21 11:43:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-doc.
commit ef20c8367b67071079963d63c35b2483003c82d3
Author: Holger Levsen <holger at layer-acht.org>
Date: Sat Jan 21 12:42:57 2017 +0100
updated from the wiki
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../debian-edu-stretch-manual.da.po | 92 ++++++++++---
.../debian-edu-stretch-manual.de.po | 100 +++++++++++---
.../debian-edu-stretch-manual.es.po | 90 ++++++++++---
.../debian-edu-stretch-manual.fr.po | 90 ++++++++++---
.../debian-edu-stretch-manual.it.po | 90 ++++++++++---
.../debian-edu-stretch-manual.ja.po | 104 +++++++++++----
.../debian-edu-stretch-manual.nb.po | 92 ++++++++++---
.../debian-edu-stretch-manual.nl.po | 148 +++++++++++----------
.../debian-edu-stretch-manual.pl.po | 44 +++---
.../debian-edu-stretch-manual.pot | 42 +++---
.../debian-edu-stretch-manual.xml | 30 ++---
.../debian-edu-stretch-manual.zh.po | 44 +++---
12 files changed, 673 insertions(+), 293 deletions(-)
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index 667b315..f2c58ae 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2016-10-06 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -586,9 +586,17 @@ msgstr ""
"på internettet. Fejlrapportering via e-post"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios og sideoversigt"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "Sitesummary"
+msgid "site-summary"
+msgstr "Sitesummary"
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -4424,8 +4432,8 @@ msgstr ""
"linpro.no/\"/>."
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
-msgstr "Nagios"
+msgid "Icinga"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -4439,8 +4447,8 @@ msgstr "Nagios"
#| "workstation, install the <computeroutput>nagios-nrpe-server</"
#| "computeroutput> package on the workstation."
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -4458,8 +4466,14 @@ msgstr ""
"arbejdsstationen."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
+#| "default password is <computeroutput>skolelinux</computeroutput>. For "
+#| "security reasons, avoid using the same password as root. To change the "
+#| "password you can run the following command as root:"
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -4470,17 +4484,26 @@ msgstr ""
"root. For at ændre adgangskoden kan du køre den følgende kommando som root:"
#. type: CDATA
-#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, fuzzy, no-wrap
+#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+#, fuzzy
+#| msgid ""
+#| "By default Nagios does not send email. This can be changed by replacing "
+#| "<computeroutput>notify-by-nothing</computeroutput> with "
+#| "<computeroutput>host-notify-by-email</computeroutput> and "
+#| "<computeroutput>notify-by-email</computeroutput> in the file "
+#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+#| "computeroutput>."
+msgid ""
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
"Som standard sender Nagios ikke e-post. Dette kan ændres ved at erstatte "
"<computeroutput>notify-by-nothing</computeroutput> med <computeroutput>host-"
@@ -4489,10 +4512,16 @@ msgstr ""
"contacts.cfg</computeroutput>."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+#| "sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
+#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+#| "computeroutput> with the list of hosts and services to monitor."
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
"Den brugte konfigurationsfil for Nagios er <computeroutput>/etc/nagios3/"
@@ -4501,9 +4530,14 @@ msgstr ""
"med listen over værter og tjenester at overvåge."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
+#| "included in the generated file."
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
"Ekstra Nagioskontroller kan placeres i filen <computeroutput>/var/lib/"
@@ -4511,19 +4545,28 @@ msgstr ""
"inkluderet i den oprettede fil."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
+#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
"Information om Nagios er tilgængelig fra pakken <ulink url=\"http://www."
"nagios.org/\"/> eller i <computeroutput>nagios3-doc</computeroutput>."
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+#, fuzzy
+#| msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr "Gængse Nagiosadvarsler og hvordan de skal håndteres"
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+#, fuzzy
+#| msgid ""
+#| "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
"Her er instruktioner på hvordan du håndterer de mest gængse Nagiosadvarsler."
@@ -9977,7 +10020,9 @@ msgid "Other changes compared to the previous release"
msgstr "Andre ændringer sammenlignet med den forrige udgivelse"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+#, fuzzy
+#| msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr "Icinga2 erstatter Nagios som overvågningsværktøj. Icinga2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12821,6 +12866,9 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Nagios"
+#~ msgstr "Nagios"
+
#~ msgid "Thin Client Server/s"
#~ msgstr "Servere for tynde klienter"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index 2758e6f..a7f1642 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2017-01-17 13:53+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -571,9 +571,17 @@ msgstr ""
"(Web-Schnittstelle). Benachrichtigung per E-Mail im Fehlerfall."
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios und sitesummary"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "Sitesummary"
+msgid "site-summary"
+msgstr "Sitesummary"
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -4160,13 +4168,23 @@ msgstr ""
"projects.linpro.no/\"/>."
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
-msgstr "Nagios"
+msgid "Icinga"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. 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 <computeroutput>nagios-nrpe-server</computeroutput> package "
+#| "on the workstation."
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -4184,8 +4202,14 @@ msgstr ""
"computeroutput>."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
+#| "default password is <computeroutput>skolelinux</computeroutput>. For "
+#| "security reasons, avoid using the same password as root. To change the "
+#| "password you can run the following command as root:"
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -4198,17 +4222,26 @@ msgstr ""
"Befehl als Root aus:"
#. type: CDATA
-#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, fuzzy, no-wrap
+#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default Nagios does not send email. This can be changed by replacing "
+#| "<computeroutput>notify-by-nothing</computeroutput> with "
+#| "<computeroutput>host-notify-by-email</computeroutput> and "
+#| "<computeroutput>notify-by-email</computeroutput> in the file "
+#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+#| "computeroutput>."
msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
"Nagios versendet voreingestellt keine E-Mails. Dies kann geändert werden, "
"indem in der Datei <computeroutput>/etc/nagios3/sitesummary-template-"
@@ -4217,10 +4250,16 @@ msgstr ""
"und <computeroutput>notify-by-email</computeroutput> ersetzt wird."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+#| "sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
+#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+#| "computeroutput> with the list of hosts and services to monitor."
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
"Die benutzte Nagios-Konfiguration ist <computeroutput>/etc/nagios3/"
@@ -4229,9 +4268,14 @@ msgstr ""
"mit einer Liste von zu überwachenden Rechnern und Diensten."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
+#| "included in the generated file."
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
"Zusätzliche Nagios-Kontrollen können in der Datei <computeroutput>/var/lib/"
@@ -4239,20 +4283,29 @@ msgstr ""
"Sie werden anschließend in der generierten Datei berücksichtigt."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
+#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
"Informationen über Nagios können unter <ulink url=\"http://www.nagios.org/\"/"
"> oder in dem Paket <computeroutput>nagios3-doc</computeroutput> gefunden "
"werden."
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+#, fuzzy
+#| msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr "Übliche Warnungen von Nagios und wie damit umzugehen ist"
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+#, fuzzy
+#| msgid ""
+#| "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
"Hier sind Anleitungen, wie mit den häufigsten Warnungen von Nagios umzugehen "
"ist."
@@ -9800,7 +9853,9 @@ msgid "Other changes compared to the previous release"
msgstr "Andere Änderungen im Vergleich zum vorhergehenden Release."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+#, fuzzy
+#| msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr "Icinga2 ersetzt Nagios als Monitoring-Tool. Icinga2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12631,3 +12686,6 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+
+#~ msgid "Nagios"
+#~ msgstr "Nagios"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index d60e877..a316b8d 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2015-03-30 22:30+0000\n"
"Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -624,9 +624,17 @@ msgstr ""
"Reportes de fallos vía correo."
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios y site-summary"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "Sitesummary"
+msgid "site-summary"
+msgstr "Sitesummary"
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -4288,8 +4296,8 @@ msgstr ""
"projects.linpro.no/\"/> ."
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
-msgstr "Nagios"
+msgid "Icinga"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -4303,8 +4311,8 @@ msgstr "Nagios"
#| "workstation, install the <computeroutput>nagios-nrpe-server</"
#| "computeroutput> package on the workstation."
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -4323,8 +4331,14 @@ msgstr ""
"de trabajo."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
+#| "default password is <computeroutput>skolelinux</computeroutput>. For "
+#| "security reasons, avoid using the same password as root. To change the "
+#| "password you can run the following command as root:"
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -4335,17 +4349,26 @@ msgstr ""
"la contraseña, usted puede ejecutar el siguiente comando como usuario root:"
#. type: CDATA
-#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, fuzzy, no-wrap
+#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+#, fuzzy
+#| msgid ""
+#| "By default Nagios does not send email. This can be changed by replacing "
+#| "<computeroutput>notify-by-nothing</computeroutput> with "
+#| "<computeroutput>host-notify-by-email</computeroutput> and "
+#| "<computeroutput>notify-by-email</computeroutput> in the file "
+#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+#| "computeroutput>."
+msgid ""
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
"Por defecto Nagios no envia correos electrónicos. Esto se puede cambiar "
"reemplazando <computeroutput>notify-by-nothing</computeroutput> por "
@@ -4355,10 +4378,16 @@ msgstr ""
"computeroutput>"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+#| "sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
+#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+#| "computeroutput> with the list of hosts and services to monitor."
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
"El archivo de configuración de Nagios usado es <computeroutput>/etc/nagios3/"
@@ -4367,9 +4396,14 @@ msgstr ""
"con la lista de equipos y servicios por monitorear."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
+#| "included in the generated file."
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
"Revisiones extras de Nagios pueden ser puestas en el archivo "
@@ -4377,19 +4411,28 @@ msgstr ""
"computeroutput> para que sean incluidas en el archivo generado."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
+#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
"Información sobre Nagios está disponible en <ulink url=\"http://www.nagios."
"org/\"/> o en el paquete <computeroutput>nagios3-doc</computeroutput>."
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+#, fuzzy
+#| msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr "Advertencias comunes de Nagios y como manejarlas"
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+#, fuzzy
+#| msgid ""
+#| "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
"Aquí hay instrucciones sobre como manejar las advertencias más comunes de "
"Nagios."
@@ -8842,7 +8885,7 @@ msgid "Other changes compared to the previous release"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -11038,6 +11081,9 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Nagios"
+#~ msgstr "Nagios"
+
#~ msgid "Thin Client Server/s"
#~ msgstr "Servidor(es) de clientes ligeros"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index ecafebe..bbd3bd2 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2015-06-22 10:34+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -608,9 +608,17 @@ msgstr ""
"qu'état et historique sur le web. Rapport d'erreur par courrier électronique"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios et site-summary"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "Sitesummary"
+msgid "site-summary"
+msgstr "Sitesummary"
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -4612,8 +4620,8 @@ msgstr ""
"\"http://munin.projects.linpro.no/\"/>."
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
-msgstr "Nagios"
+msgid "Icinga"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -4627,8 +4635,8 @@ msgstr "Nagios"
#| "workstation, install the <computeroutput>nagios-nrpe-server</"
#| "computeroutput> package on the workstation."
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -4646,8 +4654,14 @@ msgstr ""
"le paquet <computeroutput>nagios-nrpe-server</computeroutput>."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
+#| "default password is <computeroutput>skolelinux</computeroutput>. For "
+#| "security reasons, avoid using the same password as root. To change the "
+#| "password you can run the following command as root:"
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -4659,17 +4673,26 @@ msgstr ""
"commande suivante en tant que superutilisateur :"
#. type: CDATA
-#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, fuzzy, no-wrap
+#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+#, fuzzy
+#| msgid ""
+#| "By default Nagios does not send email. This can be changed by replacing "
+#| "<computeroutput>notify-by-nothing</computeroutput> with "
+#| "<computeroutput>host-notify-by-email</computeroutput> and "
+#| "<computeroutput>notify-by-email</computeroutput> in the file "
+#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+#| "computeroutput>."
+msgid ""
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
"Par défaut, Nagios n'envoie pas de courrier électronique. Ce comportement "
"peut être modifié en remplaçant <computeroutput>notify-by-nothing</"
@@ -4679,10 +4702,16 @@ msgstr ""
"computeroutput>."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+#| "sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
+#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+#| "computeroutput> with the list of hosts and services to monitor."
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
"Le fichier de configuration utilisé par Nagios est <computeroutput>/etc/"
@@ -4691,9 +4720,14 @@ msgstr ""
"computeroutput> contenant la liste des hôtes et services à surveiller."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
+#| "included in the generated file."
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
"Des validations supplémentaires pour Nagios peuvent être ajoutées au fichier "
@@ -4701,20 +4735,29 @@ msgstr ""
"computeroutput> afin de les inclure dans le fichier généré."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
+#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
"Davantage d'informations sur le système Nagios sont disponibles sur <ulink "
"url=\"http://www.nagios.org/\"/> ou dans le paquet <computeroutput>nagios3-"
"doc</computeroutput>."
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+#, fuzzy
+#| msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr "Avertissements courants de Nagios et comment les gérer"
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+#, fuzzy
+#| msgid ""
+#| "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
"Voici les instructions à suivre pour gérer les avertissements les plus "
"courants de Nagios."
@@ -10479,7 +10522,7 @@ msgid "Other changes compared to the previous release"
msgstr "Autres changements depuis la dernière publication"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -13420,6 +13463,9 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid "Nagios"
+#~ msgstr "Nagios"
+
#~ msgid "Thin Client Server/s"
#~ msgstr "Serveur de clients légers"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index 1ca22e7..d07b08e 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2015-05-04 19:34+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -604,9 +604,17 @@ msgstr ""
"elettronica"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios e site-summary"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "Sitesummary"
+msgid "site-summary"
+msgstr "Sitesummary"
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -4541,8 +4549,8 @@ msgstr ""
"\"http://munin.projects.linpro.no/\"/>."
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
-msgstr "Nagios"
+msgid "Icinga"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -4556,8 +4564,8 @@ msgstr "Nagios"
#| "workstation, install the <computeroutput>nagios-nrpe-server</"
#| "computeroutput> package on the workstation."
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -4575,8 +4583,14 @@ msgstr ""
"computeroutput> sulla workstation."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
+#| "default password is <computeroutput>skolelinux</computeroutput>. For "
+#| "security reasons, avoid using the same password as root. To change the "
+#| "password you can run the following command as root:"
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -4587,17 +4601,26 @@ msgstr ""
"la password occorre eseguire il seguente comando come root:"
#. type: CDATA
-#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, fuzzy, no-wrap
+#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+#, fuzzy
+#| msgid ""
+#| "By default Nagios does not send email. This can be changed by replacing "
+#| "<computeroutput>notify-by-nothing</computeroutput> with "
+#| "<computeroutput>host-notify-by-email</computeroutput> and "
+#| "<computeroutput>notify-by-email</computeroutput> in the file "
+#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+#| "computeroutput>."
+msgid ""
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
"In modo predefinito Nagios non invia email. Questo può essere corretto "
"sostituendo <computeroutput>notify-by-nothing</computeroutput> con "
@@ -4606,10 +4629,16 @@ msgstr ""
"etc/nagios3/sitesummary-template-contacts.cfg</computeroutput>."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+#| "sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
+#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+#| "computeroutput> with the list of hosts and services to monitor."
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
"Il file di configurazione di Nagios è <computeroutput>/etc/nagios3/"
@@ -4618,9 +4647,14 @@ msgstr ""
"con la lista delle macchine e dei servizi controllati."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
+#| "included in the generated file."
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
"Controlli extra di Nagios possono essere inseriti nel file <computeroutput>/"
@@ -4628,20 +4662,29 @@ msgstr ""
"includerli nel file prodotto. "
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
+#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
"Maggiori informazioni sul sistema Nagios sono disponibili al sito <ulink url="
"\"http://www.nagios.org/\"/> o nel pacchetto <computeroutput>nagios3-doc</"
"computeroutput>."
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+#, fuzzy
+#| msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr "Avvisi comuni di Nagios e come gestirli"
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+#, fuzzy
+#| msgid ""
+#| "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
"Ecco le istruzioni su come gestire le avvertimenti più comuni di Nagios."
@@ -10271,7 +10314,7 @@ msgid "Other changes compared to the previous release"
msgstr "Altre modifiche rispetto alla versione precedente"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -13163,6 +13206,9 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Nagios"
+#~ msgstr "Nagios"
+
#~ msgid "Thin Client Server/s"
#~ msgstr "Server di thin-client"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index 9b25fc1..bd4fa24 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2016-12-16 23:09+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -541,9 +541,17 @@ msgstr ""
"子メールでエラーを報告します。"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin、nagios、site-summary"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "Sitesummary"
+msgid "site-summary"
+msgstr "Sitesummary"
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -3982,13 +3990,23 @@ msgstr ""
"ります。"
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
-msgstr "Nagios"
+msgid "Icinga"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. 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 <computeroutput>nagios-nrpe-server</computeroutput> package "
+#| "on the workstation."
+msgid ""
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -4005,8 +4023,14 @@ msgstr ""
"nrpe-server</computeroutput> パッケージをインストールしてください。"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
+#| "default password is <computeroutput>skolelinux</computeroutput>. For "
+#| "security reasons, avoid using the same password as root. To change the "
+#| "password you can run the following command as root:"
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -4017,17 +4041,26 @@ msgstr ""
"ワードは root で以下のコマンドを実行することで変更できます:"
#. type: CDATA
-#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, fuzzy, no-wrap
+#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+#, fuzzy
+#| msgid ""
+#| "By default Nagios does not send email. This can be changed by replacing "
+#| "<computeroutput>notify-by-nothing</computeroutput> with "
+#| "<computeroutput>host-notify-by-email</computeroutput> and "
+#| "<computeroutput>notify-by-email</computeroutput> in the file "
+#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+#| "computeroutput>."
+msgid ""
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
"デフォルトでは Nagios はメールを送りません。これは <computeroutput>/etc/"
"nagios3/sitesummary-template-contacts.cfg</computeroutput> ファイルの "
@@ -4036,10 +4069,16 @@ msgstr ""
"computeroutput> 置き換えることで変更できます。"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+#| "sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
+#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+#| "computeroutput> with the list of hosts and services to monitor."
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
"利用される Nagios 設定ファイルは <computeroutput>/etc/nagios3/sitesummary."
@@ -4048,9 +4087,14 @@ msgstr ""
"cfg</computeroutput> を生成します。"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
+#| "included in the generated file."
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
"ファイル <computeroutput>/var/lib/sitesummary/nagios-generated.cfg.post</"
@@ -4058,19 +4102,28 @@ msgstr ""
"収録されてます。"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
+#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
"Nagios についての情報は <ulink url=\"http://www.nagios.org/\"/> や "
"<computeroutput>nagios3-doc</computeroutput> パッケージにあります。"
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+#, fuzzy
+#| msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr "Nagios の一般的な警告とその対処方法"
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+#, fuzzy
+#| msgid ""
+#| "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr "Nagios の最も一般的な警告とその対処手順を示します。"
#. type: Content of: <article><section><section><section><section><section><title>
@@ -9336,7 +9389,9 @@ msgid "Other changes compared to the previous release"
msgstr "前のリリースからの他の変更点"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+#, fuzzy
+#| msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr "監視ツールが Nagios から Icinga2 に替わりました"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -11836,3 +11891,6 @@ msgid ""
msgstr ""
"もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
"skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+
+#~ msgid "Nagios"
+#~ msgstr "Nagios"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 48df37f..f498e11 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2017-01-15 12:04+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -577,9 +577,17 @@ msgstr ""
"historie på web. Feilrapportering via e-post"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios og site-summary"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "Sitesummary"
+msgid "site-summary"
+msgstr "Site Summary)"
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -4208,8 +4216,8 @@ msgstr ""
"projects.linpro.no/\"/>."
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
-msgstr "Nagios"
+msgid "Icinga"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -4223,8 +4231,8 @@ msgstr "Nagios"
#| "workstation, install the <computeroutput>nagios-nrpe-server</"
#| "computeroutput> package on the workstation."
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -4242,8 +4250,14 @@ msgstr ""
"arbeidsstasjonen."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
+#| "default password is <computeroutput>skolelinux</computeroutput>. For "
+#| "security reasons, avoid using the same password as root. To change the "
+#| "password you can run the following command as root:"
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -4254,17 +4268,26 @@ msgstr ""
"følgende kommando som root:"
#. type: CDATA
-#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, fuzzy, no-wrap
+#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+#, fuzzy
+#| msgid ""
+#| "By default Nagios does not send email. This can be changed by replacing "
+#| "<computeroutput>notify-by-nothing</computeroutput> with "
+#| "<computeroutput>host-notify-by-email</computeroutput> and "
+#| "<computeroutput>notify-by-email</computeroutput> in the file "
+#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+#| "computeroutput>."
+msgid ""
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
"Som standard fra Debian-Edu 3.0r1 så sender ikke Nagios ut e-post. Dette kan "
"endres ved å bytte ut <computeroutput>notify-by-nothing</computeroutput> med "
@@ -4273,10 +4296,16 @@ msgstr ""
"nagios2/debian-edu/contacts.cfg</computeroutput>."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+#| "sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
+#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+#| "computeroutput> with the list of hosts and services to monitor."
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
"Nagiosoppsettsfilen - filen som brukes er <computeroutput>/etc/nagios3/"
@@ -4285,9 +4314,14 @@ msgstr ""
"med liste over verter og tjenester å overvåke."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
+#| "included in the generated file."
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
"Ekstra Nagios-kontroller kan legges inn i filen <computeroutput>/var/lib/"
@@ -4295,19 +4329,28 @@ msgstr ""
"inkludert i den genererte filen."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
+#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
"Informasjon om Nagios-systemet er tilgjengelig fra <ulink url=\"http://www."
"nagios.org/\"/>, eller i pakken <computeroutput>nagios3-doc</computeroutput>."
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+#, fuzzy
+#| msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr "Common (felles) Nagios-varsler, og hvordan de skal behandles"
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+#, fuzzy
+#| msgid ""
+#| "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
"Her er instruksjoner om hvordan du skal håndtere de mest vanlige Nagios-"
"advarsler."
@@ -9732,7 +9775,9 @@ msgid "Other changes compared to the previous release"
msgstr "Andre endringer sammenlignet med den forrige utgivelsen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+#, fuzzy
+#| msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr "Icinga2 erstatter Nagios som overvåkingsverktøy. Icinga2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12576,6 +12621,9 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid "Nagios"
+#~ msgstr "Nagios"
+
#~ msgid "Thin Client Server/s"
#~ msgstr "Tynnklienttjener(e)"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index 3fae1d0..fcf7308 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
"Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2017-01-17 17:31+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -565,9 +565,17 @@ msgstr ""
"geschiedenis op het web. Foutrapportage per e-mail"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios en site-summary"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "Sitesummary"
+msgid "site-summary"
+msgstr "Sitesummary"
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -4242,13 +4250,23 @@ msgstr ""
"projects.linpro.no/\"/>."
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
-msgstr "Nagios"
+msgid "Icinga"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. 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 <computeroutput>nagios-nrpe-server</computeroutput> package "
+#| "on the workstation."
+msgid ""
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -4266,8 +4284,14 @@ msgstr ""
"pakket <computeroutput>nagios-nrpe-server</computeroutput> op installeren."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
+#| "default password is <computeroutput>skolelinux</computeroutput>. For "
+#| "security reasons, avoid using the same password as root. To change the "
+#| "password you can run the following command as root:"
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -4279,17 +4303,26 @@ msgstr ""
"wachtwoord te wijzigen, geeft u als systeembeheerder de volgende opdracht:"
#. type: CDATA
-#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, fuzzy, no-wrap
+#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+#, fuzzy
+#| msgid ""
+#| "By default Nagios does not send email. This can be changed by replacing "
+#| "<computeroutput>notify-by-nothing</computeroutput> with "
+#| "<computeroutput>host-notify-by-email</computeroutput> and "
+#| "<computeroutput>notify-by-email</computeroutput> in the file "
+#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+#| "computeroutput>."
+msgid ""
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
"Standaard zal Nagios geen e-mailberichten versturen. Dit kan veranderd "
"worden door in het bestand <computeroutput>/etc/nagios3/sitesummary-template-"
@@ -4298,10 +4331,16 @@ msgstr ""
"computeroutput> en <computeroutput>notify-by-email</computeroutput>."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+#| "sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
+#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+#| "computeroutput> with the list of hosts and services to monitor."
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
"Het configuratiebestand van Nagios is <computeroutput>/etc/nagios3/"
@@ -4310,9 +4349,14 @@ msgstr ""
"computeroutput> dat een lijst bevat van op te volgen machines en diensten."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
+#| "included in the generated file."
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
"Bijkomende controles die moeten uitgevoerd worden door Nagios, kunt u "
@@ -4321,19 +4365,28 @@ msgstr ""
"gegenereerde bestand."
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
+#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
"Informatie over Nagios vindt u op <ulink url=\"http://www.nagios.org/\"/> of "
"in het pakket <computeroutput>nagios3-doc</computeroutput>."
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+#, fuzzy
+#| msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr "Gebruikelijke waarschuwingen door Nagios en hoe ermee om te gaan"
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+#, fuzzy
+#| msgid ""
+#| "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
"Hier volgen instructies voor de manier waarop u met de meest voorkomende "
"waarschuwingen van Nagios moet omgaan."
@@ -9981,7 +10034,9 @@ msgid "Other changes compared to the previous release"
msgstr "Andere veranderingen vergeleken met de vorige uitgave"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+#, fuzzy
+#| msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr "Icinga2 vervangt Nagios als controlegereedschap. Icinga2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9993,20 +10048,6 @@ msgid "Copyright and authors"
msgstr "Auteursrechten en auteurs"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016), Petter Reinholdtsen "
-#| "(2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß "
-#| "(2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter "
-#| "(2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne "
-#| "Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez "
-#| "(2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, "
-#| "2010, 2011, 2012, 2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), "
-#| "Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-#| "(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-#| "Wolfgang Schweer (2012, 2013, 2014, 2015, 2016), Bernhard Hammes (2012) "
-#| "and Joe Hansen (2015) and is released under the GPL2 or any later "
-#| "version. Enjoy!"
msgid ""
"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
"2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017), Petter Reinholdtsen (2001, "
@@ -10064,14 +10105,6 @@ msgstr ""
"v2 of een latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
-#| "Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid "
-#| "Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
-#| "(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and "
-#| "Ragnar Wisløff (2014) and is released under the GPL v2 or any later "
-#| "version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015, 2016, 2017), Håvard Korsvoll (2007-2009), Tore Skogly (2008), "
@@ -10090,14 +10123,6 @@ msgstr ""
"vrijgegeven onder de licentie GPL v2 of een latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
-#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
-#| "Wolfgang Schweer (2012, 2013, 2014, 2015, 2016) and is released under the "
-#| "GPL v2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -10159,9 +10184,6 @@ msgstr ""
"licentie GPL v2 of een latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Japanese translation is copyrighted by victory (2016) and is released "
-#| "under the GPL v2 or any later version."
msgid ""
"The Japanese translation is copyrighted by victory (2016, 2017) and is "
"released under the GPL v2 or any later version."
@@ -10171,9 +10193,6 @@ msgstr ""
"versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Japanese translation is copyrighted by victory (2016) and is released "
-#| "under the GPL v2 or any later version."
msgid ""
"The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
"and is released under the GPL v2 or any later version."
@@ -10183,9 +10202,6 @@ msgstr ""
"latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Japanese translation is copyrighted by victory (2016) and is released "
-#| "under the GPL v2 or any later version."
msgid ""
"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and is "
"released under the GPL v2 or any later version."
@@ -10397,11 +10413,6 @@ msgid "Note to translators: there is no need to translate the GPL license text.
msgstr "Opmerking ten behoeve van vertalers: het vertalen van de tekst van de GPL-licentie is niet nodig. Er zijn vertalingen te vinden op https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Copyright (C) 2007-2016 Holger Levsen < <ulink url=\"mailto:"
-#| "holger at layer-acht.org\">holger at layer-acht.org</ulink> > and others, "
-#| "see the <link linkend=\"CopyRight\">Copyright chapter</link> for the full "
-#| "list of copyright owners."
msgid ""
"Copyright (C) 2007-2017 Holger Levsen < <ulink url=\"mailto:holger at layer-"
"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
@@ -12924,6 +12935,9 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Nagios"
+#~ msgstr "Nagios"
+
#~ msgid "Thin Client Server/s"
#~ msgstr "Thin-clientserver/s"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index e2ef001..019fea6 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2017-01-16 18:28+0000\n"
"Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -596,9 +596,15 @@ msgstr ""
"Raportowanie błędów za pomocą e-mail"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios i podsumowanie witryny"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "site-summary"
+msgstr ""
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -3331,13 +3337,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
+msgid "Icinga"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -3348,7 +3354,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -3356,45 +3362,45 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
#. type: Content of: <article><section><section><section><section><section><title>
@@ -7390,7 +7396,7 @@ msgid "Other changes compared to the previous release"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index d769f0f..98ca258 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -454,7 +454,11 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "site-summary"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -3061,13 +3065,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
+msgid "Icinga"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -3078,7 +3082,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -3086,45 +3090,45 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
#. type: Content of: <article><section><section><section><section><section><title>
@@ -7120,7 +7124,7 @@ msgid "Other changes compared to the previous release"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 2ead975..5b9b8d4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -186,9 +186,9 @@
</para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
<para> Machine and Service Surveillance with Error Reporting, plus Status and History on the Web. Error Reporting by email
</para></entry><entry colsep="1" rowsep="1">
-<para>munin, nagios and site-summary
+<para>munin, icinga and site-summary
</para></entry><entry colsep="1" rowsep="1">
-<para> munin, nagios and site-summary
+<para> site-summary
</para></entry></row></tbody></tgroup></informaltable>
<para>Personal files for each user are stored in their home directories, which are made available by the server. Home directories are accessible from all machines, giving users access to the same files regardless of which machine they are using. The server is operating system agnostic, offering access via NFS for Unix clients, SMB for Windows and Macintosh clients.
</para>
@@ -1263,26 +1263,26 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
</para>
</section>
-<section id="Maintenance--Nagios">
-<title>Nagios
+<section id="Maintenance--Icinga">
+<title>Icinga
</title>
-<para>Nagios system and service monitoring is available from <ulink url="https://www/nagios3/"/>. 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 <computeroutput>nagios-nrpe-server</computeroutput> package o [...]
+<para>Icinga system and service monitoring is available from <ulink url="https://www/icinga/"/>. 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 <computeroutput>nagios-nrpe-server</computeroutput> package on [...]
</para>
-<para>The username is <computeroutput>nagiosadmin</computeroutput> and the default password is <computeroutput>skolelinux</computeroutput>. For security reasons, avoid using the same password as root. To change the password you can run the following command as root:
-</para><screen><![CDATA[htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]></screen>
-<para>By default Nagios does not send email. This can be changed by replacing <computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-notify-by-email</computeroutput> and <computeroutput>notify-by-email</computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</computeroutput>.
+<para>The username is <computeroutput>icingaadmin</computeroutput> and the default password is <computeroutput>skolelinux</computeroutput>. For security reasons, avoid using the same password as root. To change the password you can run the following command as root:
+</para><screen><![CDATA[htpasswd /etc/icinga/htpasswd.users icingaadmin]]></screen>
+<para>By default Icinga does not send email. This can be changed by replacing <computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-notify-by-email</computeroutput> and <computeroutput>notify-by-email</computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-contacts.cfg</computeroutput>.
</para>
-<para>The Nagios configuration file used is <computeroutput>/etc/nagios3/sitesummary.cfg</computeroutput>. The sitesummary cron job generates <computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> with the list of hosts and services to monitor.
+<para>The Icinga configuration file used is <computeroutput>/etc/icinga/sitesummary.cfg</computeroutput>. The sitesummary cron job generates <computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> with the list of hosts and services to monitor.
</para>
-<para>Extra Nagios checks can be put in the file <computeroutput>/var/lib/sitesummary/nagios-generated.cfg.post</computeroutput> to get them included in the generated file.
+<para>Extra Icinga checks can be put in the file <computeroutput>/var/lib/sitesummary/icinga-generated.cfg.post</computeroutput> to get them included in the generated file.
</para>
-<para>Information about Nagios is available from <ulink url="http://www.nagios.org/"/> or in the <computeroutput>nagios3-doc</computeroutput> package.
+<para>Information about Icinga is available from <ulink url="https://www.icinga.com/"/> or in the <computeroutput>icinga-doc</computeroutput> package.
</para>
-<section id="Maintenance--Common_Nagios_warnings_and_how_to_handle_them">
-<title>Common Nagios warnings and how to handle them
+<section id="Maintenance--Common_Icinga_warnings_and_how_to_handle_them">
+<title>Common Icinga warnings and how to handle them
</title>
-<para>Here are instructions on how to handle the most common Nagios warnings.
+<para>Here are instructions on how to handle the most common Icinga warnings.
</para>
<section id="Maintenance--DISK_CRITICAL_-_free_space:_.2BAC8usr_309_MB_.285.25_inode.3D47.25.29:">
@@ -3333,7 +3333,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
</title>
<itemizedlist>
<listitem>
-<para>Icinga2 replaces Nagios as monitoring tool. Icinga2
+<para>Icinga replaces Nagios as monitoring tool.
</para></listitem>
<listitem>
<para>kde-spectacle replaces ksnapshot as screenshot tool.
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
index 6c80c92..18137c2 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-01-17 13:34+0000\n"
+"POT-Creation-Date: 2017-01-20 12:40+0000\n"
"PO-Revision-Date: 2016-12-24 00:48+0800\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
@@ -548,9 +548,15 @@ msgid ""
msgstr "以错误报告监视机器和服务，和 Web 上的Status与历史。由电子邮件报告错误"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, nagios and site-summary"
+#, fuzzy
+#| msgid "munin, nagios and site-summary"
+msgid "munin, icinga and site-summary"
msgstr "munin, nagios 和 site-summary"
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "site-summary"
+msgstr ""
+
#. type: Content of: <article><section><section><section><para>
msgid ""
"Personal files for each user are stored in their home directories, which are "
@@ -3666,13 +3672,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Nagios"
+msgid "Icinga"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>. The set of machines and services being monitored is "
+"Icinga system and service monitoring is available from <ulink url=\"https://"
+"www/icinga/\"/>. 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 "
@@ -3683,7 +3689,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"The username is <computeroutput>icingaadmin</computeroutput> and the default "
"password is <computeroutput>skolelinux</computeroutput>. For security "
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
@@ -3691,45 +3697,45 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"By default Nagios does not send email. This can be changed by replacing "
+"By default Icinga does not send email. This can be changed by replacing "
"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
-"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
-"template-contacts.cfg</computeroutput>."
+"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
+"contacts.cfg</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"The Icinga configuration file used is <computeroutput>/etc/icinga/"
"sitesummary.cfg</computeroutput>. The sitesummary cron job generates "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
"in the generated file."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Information about Nagios is available from <ulink url=\"http://www.nagios."
-"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
+"Information about Icinga is available from <ulink url=\"https://www.icinga."
+"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
-msgid "Common Nagios warnings and how to handle them"
+msgid "Common Icinga warnings and how to handle them"
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
-msgid "Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Icinga warnings."
msgstr ""
#. type: Content of: <article><section><section><section><section><section><title>
@@ -7732,7 +7738,7 @@ msgid "Other changes compared to the previous release"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
+msgid "Icinga replaces Nagios as monitoring tool."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list