[debian-edu-commits] debian-edu/ 01/01: Update debian/copyright from the wiki.
Holger Levsen
holger at layer-acht.org
Sun Mar 5 14:01:06 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 92ce9bb2584332396dd7665aa7d8ef168fbaa503
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Mar 5 15:00:54 2017 +0100
Update debian/copyright from the wiki.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
debian/changelog | 1 +
debian/copyright | 3 +-
.../debian-edu-stretch-manual.da.po | 7 ++--
.../debian-edu-stretch-manual.de.po | 15 ++++---
.../debian-edu-stretch-manual.es.po | 7 ++--
.../debian-edu-stretch-manual.fr.po | 7 ++--
.../debian-edu-stretch-manual.it.po | 7 ++--
.../debian-edu-stretch-manual.ja.po | 7 ++--
.../debian-edu-stretch-manual.nb.po | 7 ++--
.../debian-edu-stretch-manual.nl.po | 11 ++++--
.../debian-edu-stretch-manual.pl.po | 46 +++++++++++-----------
.../debian-edu-stretch-manual.pot | 7 ++--
.../debian-edu-stretch-manual.xml | 2 +-
.../debian-edu-stretch-manual.zh.po | 35 +++++++++-------
14 files changed, 95 insertions(+), 67 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a782e90..a28b6c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ debian-edu-doc (1.918~20170319) UNRELEASED; urgency=medium
[ Holger Levsen ]
* Update Debian Edu Stretch manual from the wiki.
+ * Update debian/copyright from the wiki.
-- Holger Levsen <holger at debian.org> Mon, 27 Feb 2017 16:03:36 +0100
diff --git a/debian/copyright b/debian/copyright
index 4aa062e..444de14 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -290,8 +290,9 @@ Copyright: 2016, 2017 Stanisław Krukowski
License: GPL-2+
Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
-Copyright: 2016 Ma Yong
+Copyright: 2016, 2017 Ma Yong
2017 Boyuan Yang
+ 2017 Roy Zhang
License: GPL-2+
Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
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 dd1f914..3f7e6ba 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+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"
@@ -10807,8 +10807,9 @@ msgstr ""
#| "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 "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
"Den japanske oversættelse er underlagt ophavsretten af victory (2016) og er "
"udgivet under GPL version 2 eller enhver senere version."
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 aa2af25..2923ff1 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+0000\n"
"PO-Revision-Date: 2017-03-02 22:50+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9998,9 +9998,14 @@ msgstr ""
"2017) und ist unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
+#| "Boyuan Yang (2017) and is released under the GPL v2 or any later version."
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
"Die chinesische Übersetzung (vereinfachte Schriftzeichen) wurde verfasst von "
"Ma Yong (2016) und Boyuan Yang (2017); sie ist unter der GPL v2 oder einer "
@@ -10159,8 +10164,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 15299f8..a89bfd8 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+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"
@@ -9177,8 +9177,9 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
#. type: Content of: <article><section><title>
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 257bf72..4d522e3 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+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"
@@ -11223,8 +11223,9 @@ msgstr ""
#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
#| "and is released under the GPL v2 or any later version."
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
"La traduction danoise, dont les droits d'auteur appartiennent à Frans "
"Spiesschaert (2014, 2015) est distribuée sous GPL v2 ou toute version "
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 406ca79..bf99734 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+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"
@@ -11021,8 +11021,9 @@ msgstr ""
#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
#| "and is released under the GPL v2 or any later version."
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
"La traduzione in olandese è protetta da copyright da Frans Spiesschaert "
"(2014, 2015) e rilasciata sotto licenza GPL v2 o successiva."
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 0be7f7c..f04f205 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+0000\n"
"PO-Revision-Date: 2017-02-21 00:00+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -9496,8 +9496,9 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
#. type: Content of: <article><section><title>
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 9bf3ea7..a46a240 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-02-25 13:26+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+0000\n"
"PO-Revision-Date: 2017-03-02 20:18+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -10606,8 +10606,9 @@ msgstr ""
#| "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 "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
"Opphavsretten for den japanske oversettelsen tilhører victory (2016), og er "
"utgitt under GPL v2 eller en senere versjon."
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 d4b7855..f90f27c 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+0000\n"
"PO-Revision-Date: 2017-02-27 15:14+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"
@@ -10195,9 +10195,14 @@ msgstr ""
"latere versie."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
+#| "Boyuan Yang (2017) and is released under the GPL v2 or any later version."
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
"De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten "
"bij Ma Yong (2016) en Boyuan Yang (2017). De vertaling is vrijgegeven onder "
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 e5757ae..378f97a 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-02-25 13:26+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+0000\n"
"PO-Revision-Date: 2017-02-28 18:20+0000\n"
"Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -91,9 +91,9 @@ msgid ""
"PXE booting for diskless machines like traditional thin clients."
msgstr ""
"Bezpośrednio po instalacji serwera szkolnego wszystkie usługi, potrzebne do "
-"szkolnej sieci komputerowej, są skonfigurowane (zobacz następny rozdział <"
-"link linkend=\"Architecture\">szczegóły architektury tej konfiguracji</link>"
-", a system jest gotowy do użycia. Muszą być tylko dodane maszyny i "
+"szkolnej sieci komputerowej, są skonfigurowane (zobacz następny rozdział "
+"<link linkend=\"Architecture\">szczegóły architektury tej konfiguracji</"
+"link>, a system jest gotowy do użycia. Muszą być tylko dodane maszyny i "
"użytkownicy poprzez GOsa², wygodny interfejs użytkownika, oparty na stronach "
"WWW lub dowolny inny edytor LDAP. Przygotowane jest też środowisko rozruchu "
"sieciowego, używające PXE, tak aby po wstępnej instalacji z głównego "
@@ -627,7 +627,8 @@ msgstr "ltsp"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
msgid "Network Block Device Server"
-msgstr "Sieciowy serwer urządzenia blokowego (ang. Network Block Device Server)"
+msgstr ""
+"Sieciowy serwer urządzenia blokowego (ang. Network Block Device Server)"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
msgid "NBD"
@@ -746,10 +747,10 @@ msgid ""
"can use it as the main DNS Server."
msgstr ""
"Domyślnie, serwer DNS jest zainstalowany z domeną tylko do użytku lokalnego "
-"(*.intern) aż do czasu, gdy zainstalowana zostanie rzeczywista (\""
-"zewnętrzna\") domena DNS. Serwer DNS jest zainstalowany jako serwer DNS z "
-"pamięcią podręczną tak, aby wszystkie maszyny w sieci mogły go używać jako "
-"głównego serwera DNS."
+"(*.intern) aż do czasu, gdy zainstalowana zostanie rzeczywista (\"zewnętrzna"
+"\") domena DNS. Serwer DNS jest zainstalowany jako serwer DNS z pamięcią "
+"podręczną tak, aby wszystkie maszyny w sieci mogły go używać jako głównego "
+"serwera DNS."
# type: Content of: <article><section><section><section><para>
#. type: Content of: <article><section><section><section><para>
@@ -845,8 +846,8 @@ msgid ""
"client servers\" in releases before Stretch), which are installed by "
"selecting the LTSP Server profile."
msgstr ""
-"Sieć komputerowa Skolelinux może mieć wiele serwerów LTSP (zwanych ”"
-"serwerami cienkich klientów” w wydaniach poprzedzajacych Stretch), które są "
+"Sieć komputerowa Skolelinux może mieć wiele serwerów LTSP (zwanych "
+"”serwerami cienkich klientów” w wydaniach poprzedzajacych Stretch), które są "
"zainstalowane poprzez wybranie profilu Serwer LTSP."
#. type: Content of: <article><section><section><section><para>
@@ -871,10 +872,10 @@ msgstr ""
"serwerze. Bezdyskowe stacje robocze używają programów zainstalowanych na "
"chroot serwera LTSP (chroot = ang. change root. Jest to uniksowe polecenie "
"uruchamiające program ze zmienionym katalogiem głównym — root), klienckim "
-"systemie plików root dostarczonym przy użyciu NBD (ang. Network Block Device)"
-". Po każdej modyfikacji chroot LTSP odnośny obraz NBD musi być wygenerowany "
-"ponownie; uruchom <computeroutput>ltsp-update-image</computeroutput> na "
-"serwerze LTSP."
+"systemie plików root dostarczonym przy użyciu NBD (ang. Network Block "
+"Device). Po każdej modyfikacji chroot LTSP odnośny obraz NBD musi być "
+"wygenerowany ponownie; uruchom <computeroutput>ltsp-update-image</"
+"computeroutput> na serwerze LTSP."
# type: Content of: <article><section><section><section><title>
#. type: Content of: <article><section><section><section><title>
@@ -1097,11 +1098,11 @@ msgstr ""
"mają unikalne nazwy albo, że katalogi współdzielone posiadają również (na "
"wszystkich komputerach) tego rodzaju nazwy, katalogi można zamontować jako "
"<computeroutput> /skole/host/katalog</computeroutput>. Początkowo, utworzony "
-"jest jeden katalog na serwerze, "
-"<computeroutput>/skole/tjener/home0/</computeroutput>, w którym są utworzone "
-"wszystkie konta użytkowników. Następnie, można utworzyć (w razie potrzeby) "
-"więcej katalogów, aby dostosować poszczególne grupy użytkowników do "
-"określonych wzorców użytkowania."
+"jest jeden katalog na serwerze, <computeroutput>/skole/tjener/home0/</"
+"computeroutput>, w którym są utworzone wszystkie konta użytkowników. "
+"Następnie, można utworzyć (w razie potrzeby) więcej katalogów, aby "
+"dostosować poszczególne grupy użytkowników do określonych wzorców "
+"użytkowania."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -7669,8 +7670,9 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index ae951b1..24a8ec9 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+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"
@@ -7225,8 +7225,9 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 5c9d060..f2a117b 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -3316,7 +3316,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
</para>
<para>The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) and is released under the GPL v2 or any later version.
</para>
-<para>The Simplified Chinese translation is copyrighted by Ma Yong (2016) and Boyuan Yang (2017) and is released under the GPL v2 or any later version.
+<para>The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or any later version.
</para>
</section>
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 e93363d..9960514 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-03-02 19:55+0000\n"
+"POT-Creation-Date: 2017-03-05 13:57+0000\n"
"PO-Revision-Date: 2017-03-05 03:41+0000\n"
"Last-Translator: Ma Yong <c2edd3c2 at 163.com>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -149,9 +149,9 @@ msgid ""
"projects are united, but both names stayed. \"Skole\" and "
"(Debian-)\"Education\" are just two well understood terms in these regions."
msgstr ""
-"Skolelinux 项目在 2001 年 7 月 2 日启动于挪威而大约在同时 Raphaël Hertzog 在法国开始了 Debian-Edu。"
-"直到 2003 年两个项目合为一体，而维持了两者的名称。\"Skole\" 和 (Debian-)\"Education\" "
-"在这些范围中正是两个好领会的措辞。"
+"Skolelinux 项目在 2001 年 7 月 2 日启动于挪威而大约在同时 Raphaël Hertzog 在"
+"法国开始了 Debian-Edu。直到 2003 年两个项目合为一体，而维持了两者的名"
+"称。\"Skole\" 和 (Debian-)\"Education\" 在这些范围中正是两个好领会的措辞。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -2333,7 +2333,9 @@ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
msgid ""
"To install a desktop environment of your choice instead of the default one, "
"press TAB and edit the kernel boot options (like explained above)."
-msgstr "若要安装你所选择的桌面环境而不是默认的，按 tab 键并编辑内核引导选项 （像上文）。"
+msgstr ""
+"若要安装你所选择的桌面环境而不是默认的，按 tab 键并编辑内核引导选项 （像上"
+"文）。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2768,9 +2770,11 @@ msgid ""
"computeroutput> is needed to make personal web pages accessible), and the "
"first user can use <computeroutput>sudo</computeroutput> to become root."
msgstr ""
-"主服务器安装时已创建了第一个用户的帐号。在后续文字中这个帐号会作为“首用户”被提到。这个帐户是特殊的，因为没有 Samba 帐号（可以通过 GOsa² "
-"来添加），其主目录允许设置为 700（那样需要 <computeroutput>chmod o+x ~</computeroutput> "
-"来让个人网页可以被访问），而首用户可以使用 <computeroutput>sudo</computeroutput> 成为 root。"
+"主服务器安装时已创建了第一个用户的帐号。在后续文字中这个帐号会作为“首用户”被"
+"提到。这个帐户是特殊的，因为没有 Samba 帐号（可以通过 GOsa² 来添加），其主目"
+"录允许设置为 700（那样需要 <computeroutput>chmod o+x ~</computeroutput> 来让"
+"个人网页可以被访问），而首用户可以使用 <computeroutput>sudo</computeroutput> "
+"成为 root。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -2809,7 +2813,9 @@ msgid ""
"Adding users and workstations is described in detail below, so please read "
"this chapter completely. It covers how to perform these minimum steps "
"correctly as well as other stuff that everybody will probably need to do."
-msgstr "在下面详细讲述添加用户和工作站，请完整阅读这章。包括如何正确进行这些最少步骤以及，每个人大概会需要做的其他材料。"
+msgstr ""
+"在下面详细讲述添加用户和工作站，请完整阅读这章。包括如何正确进行这些最少步骤"
+"以及，每个人大概会需要做的其他材料。"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -2820,9 +2826,9 @@ msgid ""
"upgrading from a previous release, make sure to read the <link linkend="
"\"Upgrades\">Upgrades</link> chapter."
msgstr ""
-"在这一手册的其他部分可以获得另外的信息：熟悉先前发布版的每个人会阅读 <link linkend=\\\"Features\\\">Stretch "
-"中的新特性</link>这一章。而对于从先前的发布版更新，一定要阅读<link linkend=\\\"Upgrades\\\""
-">更新</link>这一章。"
+"在这一手册的其他部分可以获得另外的信息：熟悉先前发布版的每个人会阅读 <link "
+"linkend=\\\"Features\\\">Stretch 中的新特性</link>这一章。而对于从先前的发布"
+"版更新，一定要阅读<link linkend=\\\"Upgrades\\\">更新</link>这一章。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -7977,8 +7983,9 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-"Boyuan Yang (2017) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017), "
+"Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
+"any later version."
msgstr ""
#. type: Content of: <article><section><title>
--
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