[debian-edu-commits] debian-edu/ 01/03: Updated from the wiki
Holger Levsen
holger at layer-acht.org
Sat Jul 15 13:45:37 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 8ad01e940495a980eed3cb1780d8c5e3d0f57fea
Author: Holger Levsen <holger at layer-acht.org>
Date: Sat Jul 15 15:15:11 2017 +0200
Updated from the wiki
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../debian-edu-stretch-manual.da.po | 2 +-
.../debian-edu-stretch-manual.de.po | 13 +--
.../debian-edu-stretch-manual.es.po | 2 +-
.../debian-edu-stretch-manual.fi.po | 2 +-
.../debian-edu-stretch-manual.fr.po | 2 +-
.../debian-edu-stretch-manual.it.po | 2 +-
.../debian-edu-stretch-manual.ja.po | 2 +-
.../debian-edu-stretch-manual.nb.po | 32 ++++----
.../debian-edu-stretch-manual.nl.po | 21 +----
.../debian-edu-stretch-manual.pl.po | 2 +-
.../debian-edu-stretch-manual.pot | 2 +-
.../debian-edu-stretch-manual.zh.po | 90 ++++++++++++---------
.../debian-edu-stretch/images/de/worldmap.png | Bin 383426 -> 383411 bytes
.../debian-edu-stretch/images/es/worldmap.png | Bin 383589 -> 383574 bytes
.../debian-edu-stretch/images/fr/worldmap.png | Bin 383503 -> 383489 bytes
.../debian-edu-stretch/images/worldmap.png | Bin 383501 -> 383489 bytes
16 files changed, 80 insertions(+), 92 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 ef8faa0..a3a94c2 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+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"
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 8414537..912b410 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-06-28 18:44+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4868,13 +4868,6 @@ msgstr "Die Konfiguration anwenden und anpassen:"
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "cfengine-debian-edu -D installation\n"
-#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
-#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
-#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
-#| "service squid start\n"
-#| "service apache2 restart"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
@@ -10438,8 +10431,8 @@ msgstr ""
"translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
"Sprache anlegen und wie Übersetzungen aktualisiert werden."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
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 cec44cf..661df7b 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+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"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
index 7ce7821..4b543b6 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-04-17 06:21+0000\n"
"Last-Translator: ekeimaja <ekeimaja at gmail.com>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/debian-edu-"
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 861b56a..4659cf1 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+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"
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 c0247c6..5e317b5 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-06-22 19:51+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
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 6f2ac78..abd142f 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-02-24 06:55+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
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 b5a97f2..b26f657 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-07-11 11:47+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -4320,9 +4320,10 @@ msgid ""
"night. This will not upgrade the LTSP chroots."
msgstr ""
"Hvis du ikke ønsker å oppgradere pakker manuelt, og stoler på at Debian gjør "
-"en god jobb med nye versjoner, kan du sette opp pakken <computeroutput"
-">unattended-upgrades</computeroutput>, til å automatisk oppgradere alle nye "
-"pakker hver natt. Dette vil ikke oppgradere LTSP-chrooter."
+"en god jobb med nye versjoner, kan du sette opp pakken "
+"<computeroutput>unattended-upgrades</computeroutput>, til å automatisk "
+"oppgradere alle nye pakker hver natt. Dette vil ikke oppgradere LTSP-"
+"chrooter."
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4763,8 +4764,7 @@ msgstr ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available"
-"/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -4817,10 +4817,8 @@ msgid ""
"rm -rf /etc/php5"
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
-"apt purge debian-edu-artwork-lines # Bare hvis den ikke ønskes som "
-"alternativt tema..\n"
-"dpkg -P php5-imagick # Pakken er kanskje ikke alltid "
-"installert.\n"
+"apt purge debian-edu-artwork-lines # Bare hvis den ikke ønskes som alternativt tema..\n"
+"dpkg -P php5-imagick # Pakken er kanskje ikke alltid installert.\n"
"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5643,10 +5641,10 @@ msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> er en Debian-pakke som "
"automatisk vil installere sikkerhets- (og andre) oppdateringer. Pakker er "
"installert ut av boksen og forhåndsoppsatt til å installere "
-"sikkerhetsoppdateringer. Loggene er tilgjengelig i <computeroutput>/var/log"
-"/unattended-upgrades/</computeroutput>. I tillegg er en sjekke "
-"<computeroutput>/var/log/dpkg.log</computeroutput> og "
-"<computeroutput>/var/log/apt/</computeroutput>."
+"sikkerhetsoppdateringer. Loggene er tilgjengelig i <computeroutput>/var/log/"
+"unattended-upgrades/</computeroutput>. I tillegg er en sjekke "
+"<computeroutput>/var/log/dpkg.log</computeroutput> og <computeroutput>/var/"
+"log/apt/</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
@@ -10232,10 +10230,8 @@ msgid ""
"Note to translators: there is no need to translate the GPL license text.\n"
"Translations are available at https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
msgstr ""
-"Merknad til oversettere: Det er ikke nødvendig å oversette GPLs lisenstekst."
-"\n"
-"Oversettelser er tilgjengelige på https://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0-translations.html."
+"Merknad til oversettere: Det er ikke nødvendig å oversette GPLs lisenstekst.\n"
+"Oversettelser er tilgjengelige på https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
#. type: Content of: <article><section><section><para>
msgid ""
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 fdc4647..2626ffc 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-07-12 14:57+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -4844,11 +4844,6 @@ msgstr ""
"(de pager) te verlaten."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep your currently-installed version' "
-#| "unless stated differently below; in most cases hitting return will be "
-#| "fine."
msgid ""
"Read all debconf information carefully, choose 'keep your currently-"
"installed version' unless stated differently below; in most cases hitting "
@@ -4962,13 +4957,6 @@ msgstr "Pas de configuratie aan en pas ze toe:"
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "cfengine-debian-edu -D installation\n"
-#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
-#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
-#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
-#| "service squid start\n"
-#| "service apache2 restart"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
@@ -5029,11 +5017,6 @@ msgstr "Na het heropstarten heeft u nog wat extra opruimwerk:"
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "apt purge linux-image-3.16.0-4-amd64 \n"
-#| "apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-#| "dpkg -P php5-imagick\n"
-#| "rm -rf /etc/php5"
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
@@ -10156,7 +10139,6 @@ msgstr ""
"handleiding om een van de andere te kiezen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Firefox 45.8 ESR and Chromium 57"
msgid "Firefox 45.9 ESR and Chromium 59"
msgstr "Firefox 45.9 ESR en Chromium 59"
@@ -10701,7 +10683,6 @@ msgstr "Bijlage A - De GNU Algemene Gebruikerslicentie"
#. type: CDATA
#, no-wrap
-#| msgid "Note to translators: there is no need to translate the GPL license text. Translations are available at https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
msgid ""
"Note to translators: there is no need to translate the GPL license text.\n"
"Translations are available at https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
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 fa6e533..de9df8f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-06-05 08:57+0000\n"
"Last-Translator: Stanisław Krukowski <stdf021 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 52acc55..328f8f2 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-06-28 13:25+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+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"
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 520beb6..b370755 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-06-22 10:32+0200\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-07-10 09:41+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -3542,7 +3542,9 @@ msgid ""
"Debian Edu machines in this group will be allowed to connect to machines "
"only on the local network. Combined with web proxy restrictions this might "
"be used during exams."
-msgstr "这组中的 Debian Edu 机器将只被允许连接到本地网络上的机器。结合 web 代理限制应被用在考试期间。"
+msgstr ""
+"这组中的 Debian Edu 机器将只被允许连接到本地网络上的机器。结合 web 代理限制应"
+"被用在考试期间。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3581,13 +3583,15 @@ msgid ""
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
-"针对打印机管理，将您的网络浏览器指向 <ulink url=\"https://www:631\"/> ，并接受自签名证书。此处为常规 CUPS "
-"管理界面，在这里您可以添加/删除/修改您的打印机，且能够清理打印队列。默认情况下，仅有root允许操作，但可以更改：在编辑器中打开 /etc/cups"
-"/cups-files.conf，并添加一个或多个有效的组名至包含<computeroutput>SystemGroup "
-"lpadmin</computeroutput>的行中，组名匹配您的网站策略。可能用到的已有 GOsa² 组有 <computeroutput>gosa-"
-"admins</computeroutput> 、<computeroutput>printer-admins</computeroutput> "
-"(二者皆以第一个用户作为成员)、<computeroutput>teachers</computeroutput> "
-"、computeroutput>jradmins</computeroutput> （安装后无成员）。"
+"针对打印机管理，将您的网络浏览器指向 <ulink url=\"https://www:631\"/> ，并接"
+"受自签名证书。此处为常规 CUPS 管理界面，在这里您可以添加/删除/修改您的打印"
+"机，且能够清理打印队列。默认情况下，仅有root允许操作，但可以更改：在编辑器中"
+"打开 /etc/cups/cups-files.conf，并添加一个或多个有效的组名至包含"
+"<computeroutput>SystemGroup lpadmin</computeroutput>的行中，组名匹配您的网站"
+"策略。可能用到的已有 GOsa² 组有 <computeroutput>gosa-admins</"
+"computeroutput> 、<computeroutput>printer-admins</computeroutput> (二者皆以第"
+"一个用户作为成员)、<computeroutput>teachers</computeroutput> 、"
+"computeroutput>jradmins</computeroutput> （安装后无成员）。"
#. type: Content of: <article><section><title>
msgid "Clock synchronisation"
@@ -3601,8 +3605,9 @@ msgid ""
"This can cause machines to keep the external Internet connection open if it "
"is created when used."
msgstr ""
-"Debian Edu 中的默认配置为保持所有机器上的时钟同步，但时钟未必准确。NTP "
-"用于更新时间。默认情况下，时钟将与外部源进行同步。如果在使用时创建，这会使机器保持外网连接打开。"
+"Debian Edu 中的默认配置为保持所有机器上的时钟同步，但时钟未必准确。NTP 用于更"
+"新时间。默认情况下，时钟将与外部源进行同步。如果在使用时创建，这会使机器保持"
+"外网连接打开。"
#. type: Content of: <article><section><para>
msgid ""
@@ -3729,9 +3734,9 @@ msgid ""
"to wait for the download when you do <computeroutput>apt-get upgrade</"
"computeroutput>."
msgstr ""
-"<computeroutput>cron-apt</computeroutput> "
-"每天通过电子邮件通知你有关可升级的任何软件包。它不安装这些升级，但下载它们（通常在夜间），那么当你执行 <computeroutput>apt-get "
-"upgrade</computeroutput> 时不必等待下载。"
+"<computeroutput>cron-apt</computeroutput> 每天通过电子邮件通知你有关可升级的"
+"任何软件包。它不安装这些升级，但下载它们（通常在夜间），那么当你执行 "
+"<computeroutput>apt-get upgrade</computeroutput> 时不必等待下载。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3772,10 +3777,11 @@ msgid ""
"(compared to <computeroutput>cron-apt</computeroutput>) is that it also "
"includes information about updates for packages which aren't installed."
msgstr ""
-"作为上文所述运行 <computeroutput>cron-apt</computeroutput> 是获知已安装软件包安全更新的一个好方法。"
-"另一个保留相关安全更新通知的方法是订阅 <ulink url=\"http://lists.debian.org/debian-security-"
-"announce/\">Debian 安全通告邮件列表</ulink>，那也有益于告诉你有关的安全更新。其缺点（对照 <computeroutput"
-">cron-apt</computeroutput>）是也包含未安装软件包的相关更新信息。"
+"作为上文所述运行 <computeroutput>cron-apt</computeroutput> 是获知已安装软件包"
+"安全更新的一个好方法。另一个保留相关安全更新通知的方法是订阅 <ulink url="
+"\"http://lists.debian.org/debian-security-announce/\">Debian 安全通告邮件列表"
+"</ulink>，那也有益于告诉你有关的安全更新。其缺点（对照 <computeroutput>cron-"
+"apt</computeroutput>）是也包含未安装软件包的相关更新信息。"
#. type: Content of: <article><section><section><title>
msgid "Backup Management"
@@ -3790,9 +3796,10 @@ msgid ""
"temporarily allow ssh root login on the backup server (main server 'tjener' "
"by default)."
msgstr ""
-"在浏览器指向 <ulink url=\"https://www/slbackup-php\"/> 是备份管理。请注意那需要通过 SSL 访问该站点，"
-"因为你需要在那里输入 root 密码。如果你尝试不使用 SSL 来访问这个站点将会失败。注意：如果你临时允许 root 在备份服务器（默认是主服务器 "
-"'tjener'）上登录该站点将只工作。"
+"在浏览器指向 <ulink url=\"https://www/slbackup-php\"/> 是备份管理。请注意那需"
+"要通过 SSL 访问该站点，因为你需要在那里输入 root 密码。如果你尝试不使用 SSL "
+"来访问这个站点将会失败。注意：如果你临时允许 root 在备份服务器（默认是主服务"
+"器 'tjener'）上登录该站点将只工作。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3802,9 +3809,10 @@ msgid ""
"If you only want to have spare copies of things (in case you delete them) "
"this setup should be fine for you."
msgstr ""
-"默认情况下 tjener 将备份 <computeroutput>/skole/tjener/home0</computeroutput>，<comput"
-"eroutput>/etc/</computeroutput>，<computeroutput>/root/.svk</computeroutput> "
-"和 LDAP 到 LVM 下的 /skole/backup。如果你仅想要有事物的备用复本（以防万一你删除它们）这个设置会很适合你。"
+"默认情况下 tjener 将备份 <computeroutput>/skole/tjener/home0</"
+"computeroutput>，<computeroutput>/etc/</computeroutput>，<computeroutput>/"
+"root/.svk</computeroutput> 和 LDAP 到 LVM 下的 /skole/backup。如果你仅想要有"
+"事物的备用复本（以防万一你删除它们）这个设置会很适合你。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3816,7 +3824,9 @@ msgstr "要意识到这一备份方案不能从失灵的硬盘保护你。"
msgid ""
"If you want to back up your data to an external server, a tape device or "
"another hard drive you'll have to modify the existing configuration a bit."
-msgstr "如果你想要备份你的数据到外部服务器，磁带设备或者另一个硬盘你将需要修改这个存在的配置一点点。"
+msgstr ""
+"如果你想要备份你的数据到外部服务器，磁带设备或者另一个硬盘你将需要修改这个存"
+"在的配置一点点。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3841,21 +3851,24 @@ msgid ""
"computeroutput> for <computeroutput><date></computeroutput> in the "
"folder <computeroutput>/skole/tjener/home0/user_<date></computeroutput>"
msgstr ""
-"这将在 <computeroutput>/skole/tjener/home0/user_<date></computeroutput> "
-"文件夹中留下来自 <computeroutput>/skole/tjener/home0/user</computeroutput> 对于 "
-"<computeroutput><date></computeroutput> 的内容"
+"这将在 <computeroutput>/skole/tjener/home0/user_<date></"
+"computeroutput> 文件夹中留下来自 <computeroutput>/skole/tjener/home0/user</"
+"computeroutput> 对于 <computeroutput><date></computeroutput> 的内容"
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to restore a single file, then you should be able to select the "
"file (and the version) from the web interface, and download only that file."
-msgstr "如果您想恢复单个文件，您可以从网络界面上选择该文件（以及版本），并下载该文件。"
+msgstr ""
+"如果您想恢复单个文件，您可以从网络界面上选择该文件（以及版本），并下载该文"
+"件。"
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to get rid of older backups, choose \"Maintenance\" in the menu "
"on the backup page and select the oldest snapshot to keep:"
-msgstr "如果要清除较旧的备份，在备份页面的菜单中选择“维护”并选择要保留的最早的快照："
+msgstr ""
+"如果要清除较旧的备份，在备份页面的菜单中选择“维护”并选择要保留的最早的快照："
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/slbackup-php_maintenance.png"
@@ -3881,8 +3894,9 @@ msgid ""
"weekly, monthly and yearly basis, and provides the system administrator with "
"help when looking for bottlenecks and the source of system problems."
msgstr ""
-"从 <ulink url=\"https://www/munin/\"/> 可得到 Munin "
-"趋势报告系统。它提供基于一天，星期，月和每年的系统监测曲线图，并且当系统管理员在查找瓶颈及系统问题根源时给以帮助。"
+"从 <ulink url=\"https://www/munin/\"/> 可得到 Munin 趋势报告系统。它提供基于"
+"一天，星期，月和每年的系统监测曲线图，并且当系统管理员在查找瓶颈及系统问题根"
+"源时给以帮助。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3909,7 +3923,8 @@ msgstr ""
msgid ""
"Information about Munin is available from <ulink url=\"http://munin-"
"monitoring.org/\"/>."
-msgstr "Munin 的相关信息，可参见<ulink url=\"http://munin-monitoring.org/\"/>。"
+msgstr ""
+"Munin 的相关信息，可参见<ulink url=\"http://munin-monitoring.org/\"/>。"
#. type: Content of: <article><section><section><section><title>
msgid "Icinga"
@@ -9233,20 +9248,23 @@ msgid ""
"Debian Edu \"3.0r0 Terra\" released 2007-07-22. Based on Debian 4.0 Etch "
"released 2007-04-08."
msgstr ""
-"Debian Edu \"3.0r0 Terra\" 发布于 2007-07-22。基于发布于 2007-04-08 的 Debian 4.0 Etch。"
+"Debian Edu \"3.0r0 Terra\" 发布于 2007-07-22。基于发布于 2007-04-08 的 "
+"Debian 4.0 Etch。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"Debian Edu 2.0, released 2006-03-14. Based on Debian 3.1 Sarge released "
"2005-06-06."
-msgstr "Debian Edu 2.0，发布于2006-03-14。基于 2005-06-06 发布的 Debian 3.1 Sarge。"
+msgstr ""
+"Debian Edu 2.0，发布于2006-03-14。基于 2005-06-06 发布的 Debian 3.1 Sarge。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"Debian Edu \"1.0 Venus\" release 2004-06-20. Based on Debian 3.0 Woody "
"released 2002-07-19."
msgstr ""
-"Debian Edu \"1.0 Venus\" 发布于 2004-06-20。基于 2002-07-19 发布的 Debian 3.0 Woody。"
+"Debian Edu \"1.0 Venus\" 发布于 2004-06-20。基于 2002-07-19 发布的 Debian "
+"3.0 Woody。"
#. type: Content of: <article><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-stretch/images/de/worldmap.png b/documentation/debian-edu-stretch/images/de/worldmap.png
index d5481ae..f1e6791 100644
Binary files a/documentation/debian-edu-stretch/images/de/worldmap.png and b/documentation/debian-edu-stretch/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/es/worldmap.png b/documentation/debian-edu-stretch/images/es/worldmap.png
index 7b42ef8..98b8d8a 100644
Binary files a/documentation/debian-edu-stretch/images/es/worldmap.png and b/documentation/debian-edu-stretch/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/fr/worldmap.png b/documentation/debian-edu-stretch/images/fr/worldmap.png
index f20b070..a7e4625 100644
Binary files a/documentation/debian-edu-stretch/images/fr/worldmap.png and b/documentation/debian-edu-stretch/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/worldmap.png b/documentation/debian-edu-stretch/images/worldmap.png
index d52ee2a..0832887 100644
Binary files a/documentation/debian-edu-stretch/images/worldmap.png and b/documentation/debian-edu-stretch/images/worldmap.png differ
--
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