[debian-edu-commits] debian-edu/ 01/01: Updated from the wiki
Holger Levsen
holger at layer-acht.org
Wed Aug 9 00:17:26 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 831310f2b192d3e70b8a48cc3c123e275eaa94eb
Author: Holger Levsen <holger at layer-acht.org>
Date: Tue Aug 8 20:17:14 2017 -0400
Updated from the wiki
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../debian-edu-stretch-manual.da.po | 21 ++--
.../debian-edu-stretch-manual.de.po | 25 ++---
.../debian-edu-stretch-manual.es.po | 21 ++--
.../debian-edu-stretch-manual.fi.po | 9 +-
.../debian-edu-stretch-manual.fr.po | 21 ++--
.../debian-edu-stretch-manual.it.po | 42 ++-----
.../debian-edu-stretch-manual.ja.po | 21 ++--
.../debian-edu-stretch-manual.nb.po | 21 ++--
.../debian-edu-stretch-manual.nl.po | 21 ++--
.../debian-edu-stretch-manual.pl.po | 9 +-
.../debian-edu-stretch-manual.pot | 9 +-
.../debian-edu-stretch-manual.xml | 2 +-
.../debian-edu-stretch-manual.zh.po | 121 +++++++++++----------
13 files changed, 150 insertions(+), 193 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 13c7d31..34dcf17 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00: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"
@@ -9780,16 +9780,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "på siden for Systemegenskaber, klik på »Ændr ...«"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Efter genstarten, når du logger ind første gang, så klik på knappen for "
-"»Indstillinger >>« og vælg domænet SKOLELINUX i stedet for det lokale "
-"domæne (»denne computer«)"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Første domænelogind"
@@ -12562,6 +12552,15 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Efter genstarten, når du logger ind første gang, så klik på knappen for "
+#~ "»Indstillinger >>« og vælg domænet SKOLELINUX i stedet for det "
+#~ "lokale domæne (»denne computer«)"
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "For at installere disse pakker så kør den følgende kommando som "
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 a086436..017c543 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00:14+0000\n"
"PO-Revision-Date: 2017-07-26 22:57+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9061,16 +9061,6 @@ msgid "on the System Properties page, click on \"Change...\""
msgstr ""
"klicken Sie auf der Seite mit den Systemeigenschaften auf »Ändern...«. "
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Wenn Sie sich nach dem Neustart erstmals anmelden, klicken Sie auf den "
-"Button »Optionen >>« und wählen Sie die Domäne SKOLELINUX statt der lokalen "
-"Domäne (»dieser Computer«)"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Erste Anmeldung an der Domäne"
@@ -10431,8 +10421,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 "
@@ -11697,6 +11687,15 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Wenn Sie sich nach dem Neustart erstmals anmelden, klicken Sie auf den "
+#~ "Button »Optionen >>« und wählen Sie die Domäne SKOLELINUX statt der "
+#~ "lokalen Domäne (»dieser Computer«)"
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Um diese Pakete zu installieren, führen Sie folgendes Kommando als Root "
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 7aa5eee..94b1d9d 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00: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"
@@ -8417,16 +8417,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Después del reinicio, cuando ingresa por primera vez, haga clic en el botón "
-"\"Opciones >>\" y seleccione el dominio SKOLELINUX en lugar del "
-"dominio local (\"esta computadora\"). "
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
@@ -10521,6 +10511,15 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Después del reinicio, cuando ingresa por primera vez, haga clic en el "
+#~ "botón \"Opciones >>\" y seleccione el dominio SKOLELINUX en lugar "
+#~ "del dominio local (\"esta computadora\"). "
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Para instalar estos paquetes, ejecute el siguiente comando como root:"
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 c5f764c..fdbfb80 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00: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-"
@@ -6536,13 +6536,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
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 b5a0213..9650715 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00: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"
@@ -10133,16 +10133,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "Sur la page « Propriétés système », cliquez sur « Modifier... »."
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Après le redémarrage, lorsque vous vous connectez pour la première fois, "
-"cliquez sur le bouton « Options >> » et sélectionnez le domaine "
-"SKOLELINUX au lieu du domaine local (« cet ordinateur »)."
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Première connexion au domaine"
@@ -13006,6 +12996,15 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Après le redémarrage, lorsque vous vous connectez pour la première fois, "
+#~ "cliquez sur le bouton « Options >> » et sélectionnez le domaine "
+#~ "SKOLELINUX au lieu du domaine local (« cet ordinateur »)."
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Pour l'installer, exécutez la commande suivante en tant que "
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 10a36aa..18c8e64 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00:14+0000\n"
"PO-Revision-Date: 2017-07-26 19:38+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -4689,11 +4689,6 @@ msgstr ""
"<return> per scorrere verso il basso, <q> per lasciare."
#. 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 "
@@ -4806,13 +4801,6 @@ msgstr "Applicare e regolare la configurazione:"
#. 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"
@@ -4872,11 +4860,6 @@ msgstr "Dopo il riavvio, fare un po' di pulizia:"
#. 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"
@@ -8945,16 +8928,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "nella pagina delle Proprietà del sistema, fare clic su \"Cambia...\""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Dopo il riavvio, quando si fa il login per la prima volta, fare clic sul "
-"pulsante \"Opzioni >>\" e selezionare il dominio SKOLELINUX al posto "
-"del dominio locale (\"questo computer\")"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Primo accesso al dominio"
@@ -9823,7 +9796,6 @@ msgstr ""
"sceglierne un altro."
#. 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 e Chromium 59"
@@ -10295,7 +10267,7 @@ msgstr ""
"lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
#. <remark>
-#. status ignore</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 "
@@ -10353,7 +10325,6 @@ msgstr "Appendix A - La GNU Public Licence"
#. 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."
@@ -11567,6 +11538,15 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Dopo il riavvio, quando si fa il login per la prima volta, fare clic sul "
+#~ "pulsante \"Opzioni >>\" e selezionare il dominio SKOLELINUX al "
+#~ "posto del dominio locale (\"questo computer\")"
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Per installare questi pacchetti eseguire il seguente comando come root:"
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 b66f1d2..5f09959 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00:14+0000\n"
"PO-Revision-Date: 2017-07-24 00:01+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -8610,16 +8610,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "「システムのプロパティ」のページで「変更(C)...」をクリックします"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"再起動後の初回ログイン時に「オプション >>」ボタンをクリックし、「ログオ"
-"ン先」にローカルドメイン (「このコンピュータ」) ではなく SKOLELINUX ドメイン"
-"を選択します"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "ドメインへの最初のログオン"
@@ -11039,3 +11029,12 @@ msgid ""
msgstr ""
"もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
"skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "再起動後の初回ログイン時に「オプション >>」ボタンをクリックし、「ロ"
+#~ "グオン先」にローカルドメイン (「このコンピュータ」) ではなく SKOLELINUX ド"
+#~ "メインを選択します"
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 3ad1468..4c36476 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00: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-"
@@ -8840,16 +8840,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "På siden Systemegenskaper, klikk på «Endre ...»"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Etter omstart, når du har logget inn første gang, klikk på «Alternativer>"
-">»-knappen, og velg domenet SKOLELINUX i stedet for det lokale domenet "
-"(«denne datamaskinen»)."
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Første Domenepålogging"
@@ -11433,6 +11423,15 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Etter omstart, når du har logget inn første gang, klikk på "
+#~ "«Alternativer>>»-knappen, og velg domenet SKOLELINUX i stedet for "
+#~ "det lokale domenet («denne datamaskinen»)."
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr "For å installere, kjør følgende som rot:"
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 feabc8d..eec2ce1 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00: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"
@@ -9245,16 +9245,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "op de pagina Systeemeigenschappen, klikt u op \"Wijzigen...\""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Nadat de computer opnieuw opgestart werd, klikt u bij de eerstvolgende "
-"aanmelding op de knop \"Opties >>\" en vervolgens kiest u het domein "
-"SKOLELINUX in plaats van het lokale domein (\"deze computer\")"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "De eerste aanmelding op het domein"
@@ -11913,6 +11903,15 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Nadat de computer opnieuw opgestart werd, klikt u bij de eerstvolgende "
+#~ "aanmelding op de knop \"Opties >>\" en vervolgens kiest u het "
+#~ "domein SKOLELINUX in plaats van het lokale domein (\"deze computer\")"
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Om deze pakketten te installeren geeft u als systeembeheerder de volgende "
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 55876b6..0348abc 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00: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-"
@@ -7056,13 +7056,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 966a476..c41855c 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-07-23 15:01+0000\n"
+"POT-Creation-Date: 2017-08-09 00: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"
@@ -6534,13 +6534,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 4f76222..e3cba57 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -2920,7 +2920,7 @@ logon home = ""]]></screen>
<listitem>
<para>a confirmation pop up box will welcome you to the SKOLELINUX domain. Clicking on "OK", will result in having another message informing that a reboot for the machine is required to apply the changes. Click on "OK"
</para></listitem></orderedlist>
-<para>After the reboot, when you login the first time, click on the "Options >>" button and select the domain SKOLELINUX instead of the local domain ("this computer")
+<para>After the reboot, when you login the first time, click on the "Options >>" button and select the domain SKOLELINUX instead of the local domain ("this computer").
</para>
<para>If joining the domain has been successful you should then be able to view the host details within GOsa² (under the menu section "Systems").
</para>
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 42be14c..a8ddc9d 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-08-09 00:14+0000\n"
"PO-Revision-Date: 2017-07-30 09:25+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -4132,25 +4132,26 @@ msgid ""
"<computeroutput>/usr/lib/sitesummary/</computeroutput> are available to "
"generate reports."
msgstr ""
-"Sitesummary 用于从每台计算机收集信息并将其提交给中央服务器。这一汇集的信息可从 "
-"<computeroutput>/var/lib/sitesummary/entries/</computeroutput> "
-"中获得。<computeroutput>/usr/lib/sitesummary/</computeroutput> 中的脚本可以得到生成的报告。"
+"Sitesummary 用于从每台计算机收集信息并将其提交给中央服务器。这一汇集的信息可"
+"从 <computeroutput>/var/lib/sitesummary/entries/</computeroutput> 中获得。"
+"<computeroutput>/usr/lib/sitesummary/</computeroutput> 中的脚本可以得到生成的"
+"报告。"
#. type: Content of: <article><section><section><section><para>
msgid ""
"A simple report from sitesummary without any details is available from "
"<ulink url=\"https://www/sitesummary/\"/>."
msgstr ""
-"一个来自 sitesummary 的没有任何细节的简单报告可以从 <ulink url=\"https://www/sitesummary/\"/> "
-"获得。"
+"一个来自 sitesummary 的没有任何细节的简单报告可以从 <ulink url=\"https://www/"
+"sitesummary/\"/> 获得。"
#. type: Content of: <article><section><section><section><para>
msgid ""
"Some documentation on sitesummary is available from <ulink url=\"http://wiki."
"debian.org/DebianEdu/HowTo/SiteSummary\"/>"
msgstr ""
-"一些关于 sitesummary 的文档可从 <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/"
-"SiteSummary\"/> 获得"
+"一些关于 sitesummary 的文档可从 <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/HowTo/SiteSummary\"/> 获得"
#. type: Content of: <article><section><section><title>
msgid "More information about Debian Edu customisations"
@@ -4163,8 +4164,9 @@ msgid ""
"\">Administration Howto chapter</link> and in the <link linkend="
"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
msgstr ""
-"更多有关 Debian Edu 定制的信息可以在<link linkend=\"Administration\">如何管理章节</link>和<link "
-"linkend=\"AdvancedAdministration\">高级管理如何做章节</link>中找到"
+"更多有关 Debian Edu 定制的信息可以在<link linkend=\"Administration\">如何管理"
+"章节</link>和<link linkend=\"AdvancedAdministration\">高级管理如何做章节</"
+"link>中找到"
#. type: Content of: <article><section><title>
msgid "Upgrades"
@@ -4183,7 +4185,9 @@ msgid ""
"Please read this chapter and the <link linkend=\"Features\">New features in "
"Stretch</link> chapter of this manual completely before attempting to "
"upgrade."
-msgstr "在试图升级之前请完整阅读本手册的这一章和 <link linkend=\"Features\">Stretch 的新特性</link>一章。"
+msgstr ""
+"在试图升级之前请完整阅读本手册的这一章和 <link linkend=\"Features\">Stretch "
+"的新特性</link>一章。"
#. type: Content of: <article><section><section><title>
msgid "General notes on upgrading"
@@ -4206,7 +4210,8 @@ msgid ""
"haven't modified it. If you have, the chroot is basically a workstation "
"chroot anyway, so rather easy to upgrade."
msgstr ""
-"一般来说，升级服务器比工作站更加困难，主服务器是最难升级的。无盘机器是容易的，如果未修改过作为它们的 chroot 环境，可以删除并重建它。如果有，这个 "
+"一般来说，升级服务器比工作站更加困难，主服务器是最难升级的。无盘机器是容易"
+"的，如果未修改过作为它们的 chroot 环境，可以删除并重建它。如果有，这个 "
"chroot 基本上相当工作站 chroot，如此也相当容易升级。"
#. type: Content of: <article><section><section><para>
@@ -4235,10 +4240,10 @@ msgid ""
"url=\"http://www.debian.org/security/faq#lifespan\">ceases support for "
"Oldstable</ulink>, Debian Edu will necessarily do the same."
msgstr ""
-"保持运行旧的稳定版数周长而等待一段时间也是明智的，那样其他人可以测试升级并提供他们测验的任何问题的文档。Debian Edu "
-"旧稳定版在接下来的稳定版发布之后会受到继续支持一段时间，但当 Debian <ulink url=\""
-"http://www.debian.org/security/faq#lifespan\">终止对旧稳定版的支持</ulink>时，Debian Edu "
-"必然会同样做。"
+"保持运行旧的稳定版数周长而等待一段时间也是明智的，那样其他人可以测试升级并提"
+"供他们测验的任何问题的文档。Debian Edu 旧稳定版在接下来的稳定版发布之后会受到"
+"继续支持一段时间，但当 Debian <ulink url=\"http://www.debian.org/security/"
+"faq#lifespan\">终止对旧稳定版的支持</ulink>时，Debian Edu 必然会同样做。"
#. type: Content of: <article><section><section><title>
msgid "Upgrades from Debian Edu Jessie"
@@ -4248,7 +4253,8 @@ msgstr "从 Debian Edu Jessie 升级"
msgid ""
"Be prepared: make sure you have tested the upgrade from Jessie in a test "
"environment or have backups ready to be able to go back."
-msgstr "准备：确保已在测试环境中测试了从 Jessie 升级或者准备好了可以恢复的备份。"
+msgstr ""
+"准备：确保已在测试环境中测试了从 Jessie 升级或者准备好了可以恢复的备份。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4270,9 +4276,10 @@ msgid ""
"<computeroutput>apt</computeroutput> removes them from the cache (after "
"successful installation)."
msgstr ""
-"请注意在 Stretch 中 <computeroutput>apt</computeroutput> 和 <computeroutput>apt-"
-"get</computeroutput> 之间的一个区别：默认下 <computeroutput>apt-get</computeroutput> "
-"保留下载的软件包，<computeroutput>apt</computeroutput> 从仓库移除它们（在成功安装之后）。"
+"请注意在 Stretch 中 <computeroutput>apt</computeroutput> 和 "
+"<computeroutput>apt-get</computeroutput> 之间的一个区别：默认下 "
+"<computeroutput>apt-get</computeroutput> 保留下载的软件包，"
+"<computeroutput>apt</computeroutput> 从仓库移除它们（在成功安装之后）。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4280,9 +4287,9 @@ msgid ""
"it and/or run <computeroutput>apt -f install</computeroutput> and then "
"<computeroutput>apt -y full-upgrade</computeroutput> once again."
msgstr ""
-"如果 <computeroutput>apt</computeroutput> 有错误而结束，尝试修正和/或运行 <computeroutput>apt "
-"-f install</computeroutput> 然后再一次 <computeroutput>apt -y full-"
-"upgrade</computeroutput>。"
+"如果 <computeroutput>apt</computeroutput> 有错误而结束，尝试修正和/或运行 "
+"<computeroutput>apt -f install</computeroutput> 然后再一次 "
+"<computeroutput>apt -y full-upgrade</computeroutput>。"
#. type: Content of: <article><section><section><section><title>
#, fuzzy
@@ -4341,7 +4348,9 @@ msgstr ""
msgid ""
"apt-list-changes: be prepared for a lot of NEWS to read; press <"
"return> to scroll down, <q> to leave the pager."
-msgstr "apt-list-changes：准备好阅读大量的消息；按 < 返回 > 向下滚动，<q> 离开这一页面。"
+msgstr ""
+"apt-list-changes：准备好阅读大量的消息；按 < 返回 > 向下滚动，<"
+"q> 离开这一页面。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4382,8 +4391,8 @@ msgid ""
"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
"\"https://bugs.debian.org/789667#\">789667</ulink>)"
msgstr ""
-"tftp (etc/inetd.conf)：选择 <Yes>。（参看 atftpd bug <ulink url=\""
-"https://bugs.debian.org/789667#\">789667</ulink>）"
+"tftp (etc/inetd.conf)：选择 <Yes>。（参看 atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>）"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "/etc/default/ldap2zone: Choose Y."
@@ -4456,8 +4465,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"
@@ -4476,8 +4484,7 @@ msgid ""
msgstr ""
"apt update\n"
"apt install education-networked-common\n"
-"apt install education-ltsp-server # Only if profile 'LTSP-Server' is "
-"installed."
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Get the new Debian Edu Stretch artwork:"
@@ -4508,10 +4515,8 @@ msgid ""
"rm -rf /etc/php5"
msgstr ""
"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 # Package might not be installed in "
-"all cases.\n"
+"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4596,8 +4601,8 @@ msgid ""
"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
"image is updated, another 4 GiB for a temporary file are needed."
msgstr ""
-"确保有充足的磁盘空间。LTSP 现在使用网络块设备（NBD）。NBD 镜像文件大小大约是 4 GiB（默认安装）。如果更新该镜像，需要为临时文件再多一个 "
-"4 GiB。"
+"确保有充足的磁盘空间。LTSP 现在使用网络块设备（NBD）。NBD 镜像文件大小大约是 "
+"4 GiB（默认安装）。如果更新该镜像，需要为临时文件再多一个 4 GiB。"
#. type: CDATA
#, no-wrap
@@ -4648,8 +4653,9 @@ msgid ""
"could be used instead; see <computeroutput>man ltsp-update-image</"
"computeroutput>."
msgstr ""
-"为节省磁盘空间，可改为使用 <computeroutput>ltsp-update-image -n</computeroutput>；参阅 "
-"<computeroutput>man ltsp-update-image</computeroutput>。"
+"为节省磁盘空间，可改为使用 <computeroutput>ltsp-update-image -n</"
+"computeroutput>；参阅 <computeroutput>man ltsp-update-image</"
+"computeroutput>。"
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
@@ -4659,7 +4665,9 @@ msgstr "重建 LTSP chroot"
msgid ""
"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
"chroot will still support both thin-clients and diskless workstations."
-msgstr "在 LTSP 服务器上还可以重新创建 LTSP chroot。新的 chroot 仍将支持瘦客户端和无盘工作站二者。"
+msgstr ""
+"在 LTSP 服务器上还可以重新创建 LTSP chroot。新的 chroot 仍将支持瘦客户端和无"
+"盘工作站二者。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4667,8 +4675,9 @@ msgid ""
"opt/ltsp/amd64</computeroutput>, depending on your setup). If you have "
"enough diskspace, consider backing it up."
msgstr ""
-"移除 <computeroutput>/opt/ltsp/i386</computeroutput>（或 "
-"<computeroutput>/opt/ltsp/amd64</computeroutput>，取决于你的设置）。如果有充裕的磁盘空间，考虑备份它。"
+"移除 <computeroutput>/opt/ltsp/i386</computeroutput>（或 <computeroutput>/"
+"opt/ltsp/amd64</computeroutput>，取决于你的设置）。如果有充裕的磁盘空间，考虑"
+"备份它。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4676,8 +4685,9 @@ msgid ""
"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
"computeroutput>) as root."
msgstr ""
-"以 root 运行 <computeroutput>debian-edu-ltsp --arch i386</computeroutput>（或 "
-"<computeroutput>debian-edu-ltsp --arch amd64</computeroutput>）重新创建 chroot。"
+"以 root 运行 <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput>（或 <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>）重新创建 chroot。"
#. type: Content of: <article><section><section><title>
msgid ""
@@ -4693,9 +4703,10 @@ msgid ""
"ulink> about how to upgrade to Jessie from the previous release, Wheezy. "
"Likewise the Wheezy manual describes how to upgrade from Squeeze."
msgstr ""
-"要从任何旧版本升级，需要首先升级到基于 Jessie 的 Debian Edu 版本，然后才能按照上述说明进行操作。在 <ulink url=\""
-"https://wiki.debian.org/DebianEdu/Documentation/Jessie#\">Debian Edu Jessie "
-"手册</ulink>中给出了有关如何从先前的发布版，Wheezy 升级到 Jessie 的说明。同样 Wheezy 手册叙述了如何从 Squeeze "
+"要从任何旧版本升级，需要首先升级到基于 Jessie 的 Debian Edu 版本，然后才能按"
+"照上述说明进行操作。在 <ulink url=\"https://wiki.debian.org/DebianEdu/"
+"Documentation/Jessie#\">Debian Edu Jessie 手册</ulink>中给出了有关如何从先前"
+"的发布版，Wheezy 升级到 Jessie 的说明。同样 Wheezy 手册叙述了如何从 Squeeze "
"升级。"
#. type: Content of: <article><section><title>
@@ -4744,8 +4755,9 @@ msgid ""
"started with Debian Edu and how to do the basic maintenance work. The howtos "
"in this chapter have some more \"advanced\" tips and tricks."
msgstr ""
-"<link linkend=\"GettingStarted\">起步</link>和<link linkend=\"Maintenance\""
-">维护</link>章节讲述 Debian Edu 如何开始以及如何做基本的维护工作。在这一章的叙述中有更多“进一步”的提示和技巧。"
+"<link linkend=\"GettingStarted\">起步</link>和<link linkend=\"Maintenance\">"
+"维护</link>章节讲述 Debian Edu 如何开始以及如何做基本的维护工作。在这一章的叙"
+"述中有更多“进一步”的提示和技巧。"
#. type: Content of: <article><section><section><title>
msgid ""
@@ -4781,9 +4793,9 @@ msgid ""
"time, a command like <computeroutput>etckeeper vcs diff </computeroutput> "
"can be used."
msgstr ""
-"在该历史中查看，使用 <computeroutput>etckeeper vcs log</computeroutput> "
-"命令。检查两个时间点之间的差异，可以使用如 <computeroutput>etckeeper vcs diff</computeroutput> "
-"的命令。"
+"在该历史中查看，使用 <computeroutput>etckeeper vcs log</computeroutput> 命"
+"令。检查两个时间点之间的差异，可以使用如 <computeroutput>etckeeper vcs diff</"
+"computeroutput> 的命令。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -7486,13 +7498,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
--
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