[debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] Syncing some more weblate files that were still using outdated templates

[Frans Spiesschaert]

Frans Spiesschaert pushed to branch weblate at Debian Edu / debian-edu-doc


Commits:
b53f5dc0 by Frans Spiesschaert at 2020-04-04T00:31:17+02:00
Syncing some more weblate files that were still using outdated templates

- - - - -


8 changed files:

- documentation/audacity/audacity-manual.pl.po
- documentation/audacity/audacity-manual.pt_PT.po
- documentation/audacity/audacity-manual.zh.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po
- documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
- documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
- documentation/rosegarden/rosegarden-manual.pl.po
- documentation/rosegarden/rosegarden-manual.zh.po


Changes:

=====================================
documentation/audacity/audacity-manual.pl.po
=====================================
@@ -6,11 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-28 15:27+0000\n"
+"POT-Creation-Date: 2020-03-28 10:35+0000\n"
 "PO-Revision-Date: 2020-04-03 17:44+0000\n"
 "Last-Translator: Michal Biesiada <blade-14 at o2.pl>\n"
-"Language-Team: Polish <https://hosted.weblate.org/projects/"
-"debian-edu-documentation/audacity/pl/>\n"
+"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
+"documentation/audacity/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -493,8 +493,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
-"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any "
-"later version."
+"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released "
+"under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>


=====================================
documentation/audacity/audacity-manual.pt_PT.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-28 15:27+0000\n"
+"POT-Creation-Date: 2020-03-28 10:35+0000\n"
 "PO-Revision-Date: 2020-03-30 22:58+0000\n"
 "Last-Translator: José Vieira <jvieira33 at sapo.pt>\n"
 "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/"
@@ -94,9 +94,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/edittojack.png\"/></"
-#| "imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/edittojack.png'/></imageobject>"
 msgstr ""
@@ -118,9 +115,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/samplerate.png\"/></"
-#| "imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/samplerate.png'/></imageobject>"
 msgstr ""
@@ -186,8 +180,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/marking.png\"/></imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/recording.png'/></imageobject>"
 msgstr ""
@@ -206,8 +198,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/normalize.png\"/></imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/normalize.png'/></imageobject>"
 msgstr ""
@@ -223,9 +213,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/normalized.png\"/></"
-#| "imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/normalized.png'/></imageobject>"
 msgstr ""
@@ -255,8 +242,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/zoom.png\"/></imageobject>"
 msgid "<imageobject><imagedata fileref='./images/zoom.png'/></imageobject>"
 msgstr "<imageobject><imagedata fileref=\"./images/zoom.png\"/></imageobject>"
 
@@ -273,8 +258,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/marking.png\"/></imageobject>"
 msgid "<imageobject><imagedata fileref='./images/marking.png'/></imageobject>"
 msgstr ""
 "<imageobject><imagedata fileref=\"./images/marking.png\"/></imageobject>"
@@ -289,9 +272,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/noiseremoval.png\"/></"
-#| "imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/noiseremoval.png'/></imageobject>"
 msgstr ""
@@ -307,9 +287,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/getnoiseprofile.png\"/></"
-#| "imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/getnoiseprofile.png'/></"
 "imageobject>"
@@ -365,9 +342,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/mixingaudio.png\"/></"
-#| "imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/mixingaudio.png'/></imageobject>"
 msgstr ""
@@ -383,8 +357,6 @@ msgstr "Secção de ferramentas"
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/toolbox.png\"/></imageobject>"
 msgid "<imageobject><imagedata fileref='./images/toolbox.png'/></imageobject>"
 msgstr ""
 "<imageobject><imagedata fileref=\"./images/toolbox.png\"/></imageobject>"
@@ -416,9 +388,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/manipulating.png\"/></"
-#| "imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/manipulating.png'/></imageobject>"
 msgstr ""
@@ -440,9 +409,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject>
 #, fuzzy
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"./images/manipulating1.png\"/></"
-#| "imageobject>"
 msgid ""
 "<imageobject><imagedata fileref='./images/manipulating1.png'/></imageobject>"
 msgstr ""
@@ -515,8 +481,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
-"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any "
-"later version."
+"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released "
+"under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>


=====================================
documentation/audacity/audacity-manual.zh.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-28 15:27+0000\n"
+"POT-Creation-Date: 2020-03-28 10:35+0000\n"
 "PO-Revision-Date: 2020-04-01 19:47+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -494,8 +494,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
-"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any "
-"later version."
+"Yong (2018, 2020), zlffcn (2019) and EldersJavas (2020) and is released "
+"under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -583,9 +583,9 @@ msgid ""
 "using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
 "debian-edu-doc.git</computeroutput>"
 msgstr ""
-"然后签出 <computeroutput>debian-edu-doc</computeroutput> 源代码使用 ssh "
-"访问：<computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-"
-"doc.git</computeroutput>"
+"然后签出 <computeroutput>debian-edu-doc</computeroutput> 源代码使用 ssh 访"
+"问：<computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2020-02-28 15:25+0000\n"
+"POT-Creation-Date: 2020-03-28 10:44+0000\n"
 "PO-Revision-Date: 2020-04-01 19:46+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -36,7 +36,6 @@ msgstr "Debian Edu 11 别名 Bullseye 的手册"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
 msgid "{{attachment:23-Tjener-Login.png}}"
 msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
@@ -46,9 +45,6 @@ msgstr "这是 Debian Edu 11 Bullseye 发行版的手册。"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The version at <ulink url=\"https:/wiki.debian.org/DebianEdu/"
-#| "Documentation/Bullseye\"/> is a wiki and updated frequently."
 msgid ""
 "The version at <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/"
 "Bullseye\"/> is a wiki and updated frequently."
@@ -123,12 +119,6 @@ msgstr "部分历史及为何使用两个名称"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> is a Linux "
-#| "distribution created by the Debian Edu project. As a <ulink url=\"http://"
-#| "wiki.debian.org/DebianPureBlends\">Debian Pure Blends</ulink> "
-#| "distribution it is an official <ulink url=\"http://www.debian.org"
-#| "\">Debian</ulink> subproject."
 msgid ""
 "<ulink url=\"https://blends.debian.org/edu\">Debian Edu / Skolelinux</ulink> "
 "is a Linux distribution created by the Debian Edu project. As a <ulink url="
@@ -268,7 +258,6 @@ msgstr "在 LDAP 中所含有的所有子网配置。"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Main server (tjener)"
 msgid "Main server"
 msgstr "主服务器 (tjener)"
 
@@ -695,10 +684,6 @@ msgstr "LTSP 服务器"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (which we called \"thin "
-#| "client servers\" in releases before Stretch), which are installed by "
-#| "selecting the LTSP Server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers, which are installed by "
 "selecting the LTSP Server profile."
@@ -720,9 +705,6 @@ msgstr "请留意："
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Diskless workstations are using the programs installed in the server's "
-#| "LTSP chroot."
 msgid ""
 "LTSP diskless workstations are now using the programs installed on the "
 "server."
@@ -730,11 +712,6 @@ msgstr "无盘工作站所使用的程序已安装在服务器的 LTSP chroot 
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The client root filesystem is provided using NBD (Network Block Device). "
-#| "After each modification to the LTSP chroot the related NBD image has to "
-#| "be re-generated; run <computeroutput>ltsp-update-image</computeroutput> "
-#| "on the LTSP server."
 msgid ""
 "The client root filesystem is provided using NFS. After each modification to "
 "the LTSP server the related image has to be re-generated; run "
@@ -750,11 +727,6 @@ msgstr "瘦客户端"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
-#| "This means that the machine boots directly from the server using PXE "
-#| "without using the local client hard drive. The thin client setup used is "
-#| "that of the Linux Terminal Server Project (LTSP)."
 msgid ""
 "A thin client setup enables ordinary PCs to function as (X-)terminals. This "
 "means that the machine boots directly from the server using PXE without "
@@ -767,14 +739,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP server. This works as follows: "
-#| "the service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted from the LTSP server using "
-#| "NBD, and finally the X Window System is started. The display manager "
-#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
-#| "data is encrypted on the network."
 msgid ""
 "Thin clients are a good way to still make use of very old (mostly 32-bit) "
 "machines as they effectively run all programs on the LTSP server. This works "
@@ -794,11 +758,6 @@ msgstr "无盘工作站"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A diskless workstation runs all software on the PC without a locally "
-#| "installed operating system. This means that client machines boot directly "
-#| "from the server's hard drive without running software installed on a "
-#| "local hard drive."
 msgid ""
 "A diskless workstation runs all software on the PC without a locally "
 "installed operating system. This means that client machines boot via PXE "
@@ -809,12 +768,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Diskless workstations are an excellent way of reusing older (but "
-#| "powerful) hardware with the same low maintenance cost as with thin "
-#| "clients. Software is administered and maintained on the server with no "
-#| "need for local installed software on the clients. Home directories and "
-#| "system settings are stored on the server too."
 msgid ""
 "Diskless workstations are an excellent way of using powerful hardware with "
 "the same low maintenance cost as with thin clients. Software is administered "
@@ -1057,9 +1010,6 @@ msgstr "最低限度的磁盘空间需求取决于所安装的profile："
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "combined main server + LTSP server: 70 GiB (plus additional space for "
-#| "user accounts)."
 msgid ""
 "combined main server + LTSP server: 60 GiB (plus additional space for user "
 "accounts)."
@@ -1067,7 +1017,6 @@ msgstr "组合主服务器 + LTSP 服务器：70 GiB（加上用户帐户的额
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "LTSP server: 50 GiB."
 msgid "LTSP server: 40 GiB."
 msgstr "LTSP 服务器：50 GiB。"
 
@@ -1101,9 +1050,6 @@ msgstr "所知工作的硬件"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A list of tested hardware is provided at <ulink url=\"https:/wiki.debian."
-#| "org/DebianEdu/Hardware/\"/> . This list is not nearly complete"
 msgid ""
 "A list of tested hardware is provided at <ulink url=\"https://wiki.debian."
 "org/DebianEdu/Hardware/\"/> . This list is not nearly complete"
@@ -1121,11 +1067,6 @@ msgstr ":)"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"https:/wiki.debian.org/InstallingDebianOn\"/> is an effort "
-#| "to document how to install, configure and use Debian on some specific "
-#| "hardware, allowing potential buyers to know if that hardware is supported "
-#| "and existing owners to know how get the best out of that hardware."
 msgid ""
 "<ulink url=\"https://wiki.debian.org/InstallingDebianOn\"/> is an effort to "
 "document how to install, configure and use Debian on some specific hardware, "
@@ -1284,13 +1225,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you need something for an embedded router or accesspoint we recommend "
-#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
-#| "you can also use the original firmware. Using the original firmware is "
-#| "easier; using OpenWRT gives you more choices and control. Check the "
-#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/"
-#| "start\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"https://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1306,13 +1240,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "It is possible to use a different network setup (there is a <ulink url="
-#| "\"https:/wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
-#| "procedure</ulink> to do this), but if you are not forced to do this by an "
-#| "existing network infrastructure, we recommend against doing so and "
-#| "recommend you stay with the default <link linkend=\"Architecture"
-#| "\">network architecture</link>."
 msgid ""
 "It is possible to use a different network setup (there is a <ulink url="
 "\"https://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
@@ -1336,13 +1263,6 @@ msgstr "在哪里找到另外的信息"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "We recommend that you read or at least take a look at the <ulink url="
-#| "\"http://www.debian.org/releases/bullseye/releasenotes\">release notes "
-#| "for Debian Bullseye</ulink> before you start installing a system for "
-#| "production use. There is more information about the Debian Bullseye "
-#| "release available in its <ulink url=\"http://www.debian.org/releases/"
-#| "bullseye/installmanual\">installation manual</ulink>."
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
 "\"https://www.debian.org/releases/bullseye/releasenotes\">release notes for "
@@ -1438,9 +1358,6 @@ msgstr "在 Bullseye 发布后这些映像将可以下载自："
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-cd/"
-#| "\"/>"
 msgid ""
 "<ulink url=\"https://get.debian.org/cdimage/release/current/amd64/iso-cd/\"/>"
 msgstr ""
@@ -1448,9 +1365,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-cd/\"/"
-#| ">"
 msgid ""
 "<ulink url=\"https://get.debian.org/cdimage/release/current/i386/iso-cd/\"/>"
 msgstr ""
@@ -1472,9 +1386,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-bd/"
-#| "\"/>"
 msgid ""
 "<ulink url=\"https://get.debian.org/cdimage/release/current/amd64/iso-bd/\"/>"
 msgstr ""
@@ -1482,9 +1393,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-bd/\"/"
-#| ">"
 msgid ""
 "<ulink url=\"https://get.debian.org/cdimage/release/current/i386/iso-bd/\"/>"
 msgstr ""
@@ -1508,10 +1416,6 @@ msgstr "源代码"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Sources are available from the Debian archive at the usual locations, "
-#| "several media are linked on <ulink url=\"http://get.debian.org/cdimage/"
-#| "release/current/source/\"/>"
 msgid ""
 "Sources are available from the Debian archive at the usual locations, "
 "several media are linked on <ulink url=\"https://get.debian.org/cdimage/"
@@ -1775,7 +1679,6 @@ msgstr "<emphasis>在 64 位硬件上的安装程序引导菜单</emphasis>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "01-Installer_64bit_boot_menu.png"
 msgid "{{attachment:01-Installer_64bit_boot_menu.png}}"
 msgstr "01-Installer_64bit_boot_menu.png"
 
@@ -1809,7 +1712,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "{{attachment:Installer_advanced_options_b.png}}"
 msgid "{{attachment:01a-Installer_64bit_advanced_options.png}}"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
@@ -1872,7 +1774,6 @@ msgstr "<emphasis>Help screen</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "{{attachment:Installer_help.png}}"
 msgid "{{attachment:01c-Installer_help.png}}"
 msgstr "{{attachment:Installer_help.png}}"
 
@@ -1898,7 +1799,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "01-Installer_64bit_boot_menu.png"
 msgid "{{attachment:01b-Installer_64bit_command_line.png}}"
 msgstr "01-Installer_64bit_boot_menu.png"
 
@@ -1973,11 +1873,6 @@ msgstr "安装过程"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Remember the <ulink url=\"https:/wiki.debian.org/DebianEdu/Documentation/"
-#| "Bullseye/Requirements\">system requirements</ulink> and make sure you "
-#| "have at least two network cards (NICs) if you plan on setting up an LTSP "
-#| "server."
 msgid ""
 "Remember the <link linkend=\"Requirements\">system requirements</link> and "
 "make sure you have at least two network cards (NICs) if you plan on setting "
@@ -2097,19 +1992,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
-#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP "
-#| "Server</emphasis> profiles are preselected. These profiles can be "
-#| "installed on one machine together if you want to install a so called "
-#| "<emphasis>combined main server</emphasis>. This means the main server "
-#| "will be an LTSP server and also be used as a workstation. This is the "
-#| "default choice, since we assume most people will install <link linkend="
-#| "\"Installation--"
-#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
-#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
-#| "cards installed in a machine which is going to be installed as a combined "
-#| "main server or as an LTSP server to become useful after the installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
 "\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP Server</"
@@ -2226,9 +2108,6 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://deb.debian.org/debian/ bullseye main \n"
-#| "deb http://security.debian.org/ bullseye/updates main"
 msgid ""
 "deb http://deb.debian.org/debian/ bullseye main \n"
 "deb http://security.debian.org/ bullseye-security/updates main"
@@ -2273,8 +2152,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>sudo cp debian-edu-amd64-XXX.iso /dev/sdX</computeroutput>"
 msgid ""
 "<computeroutput>sudo cat debian-edu-amd64-XXX.iso > /dev/sdX</"
 "computeroutput>"
@@ -2307,15 +2184,6 @@ msgstr "通过 PXE 在网络上安装和引导"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "For this installation method it is required that you have a running main "
-#| "server. When clients boot via the main network, a new PXE menu with "
-#| "installer and boot selection options is displayed. If PXE installation "
-#| "fails with an error message claiming a XXX.bin file is missing, then most "
-#| "probably the client's network card requires nonfree firmware. In this "
-#| "case the Debian Installer's initrd must be modified. This can be achieved "
-#| "by executing the command: <computeroutput>/usr/share/debian-edu-config/"
-#| "tools/pxe-addfirmware </computeroutput> on the server."
 msgid ""
 "For this installation method it is required that you have a running main "
 "server. When clients boot via the main network, a PXE menu with installer "
@@ -2342,7 +2210,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "{{attachment:30-Main-Server-GRUB_Boot_menu-PXE.png}}"
 msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
@@ -2357,7 +2224,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
@@ -2371,11 +2237,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This setup also allows diskless workstations and thin clients to be "
-#| "booted on the main network. Unlike workstations, diskless workstations "
-#| "don't have to be added to LDAP with GOsa², but can be, for example if you "
-#| "want to force the hostname."
 msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations and separate LTSP servers, diskless "
@@ -2440,10 +2301,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Further information can be found in the <ulink url=\"http://www.debian."
-#| "org/releases/bullseye/installmanual\">manual of the Debian Installer</"
-#| "ulink>."
 msgid ""
 "Further information can be found in the <ulink url=\"https://www.debian.org/"
 "releases/Bullseye/installmanual\">manual of the Debian Installer</ulink>."
@@ -2473,12 +2330,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Some settings can not be preseeded because they are needed before the "
-#| "preseeding file is downloaded.  These are configured in the PXElinux-"
-#| "based boot arguments available from <computeroutput>/var/lib/tftproot/"
-#| "debian-edu/install.cfg</computeroutput>.  Language, keyboard layout and "
-#| "desktop are examples of such settings."
 msgid ""
 "Some settings can not be preseeded because they are needed before the "
 "preseeding file is downloaded.  These are configured in the PXElinux-based "
@@ -2496,12 +2347,6 @@ msgstr "定制镜像"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
-#| "the <ulink url=\"https:/wiki.debian.org/DebianInstaller/\">Debian "
-#| "Installer</ulink>, which has a modular design and other nice features. "
-#| "<ulink url=\"https:/wiki.debian.org/DebianInstaller/Preseed\">Preseeding</"
-#| "ulink> allows you to define answers to the questions normally asked."
 msgid ""
 "Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"https://wiki.debian.org/DebianInstaller/\">Debian "
@@ -2516,11 +2361,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "So all you need to do is to create a preseeding file with your answers "
-#| "(this is described in the appendix of the Debian Installer manual) and "
-#| "<ulink url=\"https:/wiki.debian.org/DebianInstaller/Modify/CD\">remaster "
-#| "the CD/DVD</ulink>."
 msgid ""
 "So all you need to do is to create a preseeding file with your answers (this "
 "is described in the appendix of the Debian Installer manual) and <ulink url="
@@ -2559,127 +2399,106 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "02-select_a_language.png"
 msgid "{{attachment:02-select_a_language.png}}"
 msgstr "02-select_a_language.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "03-select_your_location.png"
 msgid "{{attachment:03-select_your_location.png}}"
 msgstr "03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "04-Configure_the_keyboard.png"
 msgid "{{attachment:04-Configure_the_keyboard.png}}"
 msgstr "04-Configure_the_keyboard.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "07-Detect_network_hardware.png"
 msgid "{{attachment:07-Detect_network_hardware.png}}"
 msgstr "07-Detect_network_hardware.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "08-Choose_Debian_Edu_profile.png"
 msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
 msgstr "08-Choose_Debian_Edu_profile.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "11-Participate_in_the_package_usage_survey.png"
 msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
 msgstr "11-Participate_in_the_package_usage_survey.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
 msgstr "12-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "12a-Set_up_users_and_passwords.png"
 msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
 msgstr "12a-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "12b-Set_up_users_and_passwords.png"
 msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
 msgstr "12b-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "12c-Set_up_users_and_passwords.png"
 msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
 msgstr "12c-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "12d-Setting-up-the-partitioner.png"
 msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
 msgstr "12d-Setting-up-the-partitioner.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "13-Install the base system.png"
 msgid "{{attachment:13-Install the base system.png}}"
 msgstr "13-Install the base system.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "14-Select_and_install_software.png"
 msgid "{{attachment:14-Select_and_install_software.png}}"
 msgstr "14-Select_and_install_software.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
 msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "20-Finish_the_Installation.png"
 msgid "{{attachment:20-Finish_the_Installation.png}}"
 msgstr "20-Finish_the_Installation.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "21-Finish_the_Installation-Installation_complete.png"
 msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
 msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgid "{{attachment:26-Tjener-Xfce_Desktop_Browser.png}}"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
 msgid "{{attachment:27-Tjener-Xfce_Desktop.png}}"
 msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
@@ -2817,15 +2636,6 @@ msgstr "DHCP 管理"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "For GOsa² access you need the Skolelinux main server and a (client) "
-#| "system with a web browser installed which can be the main server itself "
-#| "if it was installed as a so called combined server (Main Server + LTSP "
-#| "Server + Workstation profiles). If all of the mentioned before is not "
-#| "available, see: <link linkend=\"Administration--"
-#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
-#| "\">Installing a graphical environment on the main-server to use GOsa²</"
-#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
@@ -2939,17 +2749,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A default Debian Edu main server installation currently provides two "
-#| "\"departments\": Teachers and Students, plus the base level of the LDAP "
-#| "tree. Student accounts are intended to be added to the \"Students\" "
-#| "department, teachers to the \"Teachers\" department; systems (servers, "
-#| "Skolelinux workstations, Windows machines, printers etc.) are currently "
-#| "added to the base level. Find your own scheme for customising this "
-#| "structure. (You can find an example how to create users in year groups, "
-#| "with common home directories for each group in the <link linkend="
-#| "\"AdvancedAdministration--User_Customisations_with_GOsa.2BALI-\">HowTo/"
-#| "AdvancedAdministration</link> chapter of this manual.)"
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
@@ -3683,15 +3482,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Another important part of machine configuration is the 'Samba host' flag "
-#| "(in the 'Host information' area). If you plan to add existing Windows "
-#| "systems to the Skolelinux Samba domain, you need to add the Windows host "
-#| "to the LDAP tree and set this flag to be able to join the Windows host to "
-#| "the domain. For more information about adding Windows hosts to the "
-#| "Skolelinux network see the <link linkend=\"NetworkClients--"
-#| "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-#| "\">HowTo/NetworkClients</link> chapter of this manual."
 msgid ""
 "Another important part of machine configuration is the 'Samba host' flag (in "
 "the 'Host information' area). If you plan to add existing Windows systems to "
@@ -3823,13 +3613,6 @@ msgstr "扩展占满的分区"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "Because of a possible bug with automatic partitioning, some partitions "
-#| "might be too full after installation.  To extend these partitions, run "
-#| "<computeroutput>debian-edu-fsautoresize -n</computeroutput> as root.  See "
-#| "the \"Resizing Partitions\" HowTo in the <link linkend=\"Administration--"
-#| "Resizing_Partitions\">administration HowTo chapter</link> for more "
-#| "information."
 msgid ""
 "Because of a possible bug with automatic partitioning, some partitions might "
 "be too full after installation.  To extend these partitions, run "
@@ -3852,9 +3635,6 @@ msgstr "更新软件"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This section explains how to use <computeroutput>apt-get upgrade</"
-#| "computeroutput>."
 msgid ""
 "This section explains how to use <computeroutput>apt full-upgrade</"
 "computeroutput>."
@@ -3862,13 +3642,6 @@ msgstr "本节介绍如何使用 <computeroutput>apt-get upgrade</computeroutput
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Using <computeroutput>apt-get</computeroutput> is really simply. To "
-#| "update a system you need to execute two commands on the command line as "
-#| "root: <computeroutput>apt-get update</computeroutput> (which updates the "
-#| "lists of available packages) and <computeroutput>apt-get upgrade</"
-#| "computeroutput> (which upgrades the packages for which an upgrade is "
-#| "available)."
 msgid ""
 "Using <computeroutput>apt</computeroutput> is really simply. To update a "
 "system you need to execute two commands on the command line as root: "
@@ -3915,8 +3688,8 @@ msgid ""
 "It is important to run <computeroutput>ltsp image /</computeroutput> after "
 "LTSP server upgrades to keep the SquashFS image for diskless clients in sync."
 msgstr ""
-"在LTSP 服务器升级之后运行 <computeroutput>ltsp image /</computeroutput> 来保留无盘客户端同步中的 "
-"SquashFS 映像是重要的。"
+"在LTSP 服务器升级之后运行 <computeroutput>ltsp image /</computeroutput> 来保"
+"留无盘客户端同步中的 SquashFS 映像是重要的。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3930,12 +3703,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
-#| "email about any packages that can be upgraded. It does not install these "
-#| "upgrades, but does download them (usually in the night), so you don't "
-#| "have to wait for the download when you do <computeroutput>apt-get "
-#| "upgrade</computeroutput>."
 msgid ""
 "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
 "email about any packages that can be upgraded. It does not install these "
@@ -3961,11 +3728,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
-#| "entries to you via email, or alternatively display them in the terminal "
-#| "when running <computeroutput>apt</computeroutput> or <computeroutput>apt-"
-#| "get</computeroutput>."
 msgid ""
 "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
 "entries to you via email, or alternatively display them in the terminal when "
@@ -4246,16 +4008,6 @@ msgstr "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
 
 #. type: Content of: <article><section><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The partition (/usr/ in the example) is too full.  There are in general "
-#| "two ways to handle this: (1) remove some files or (2) increase the size "
-#| "of the partition.  If the partition is /var/, purging the APT cache by "
-#| "calling <computeroutput>apt-get clean</computeroutput> might remove some "
-#| "files.  If there is more room available in the LVM volume group, running "
-#| "the program <computeroutput>debian-edu-fsautoresize</computeroutput> to "
-#| "extend the partitions might help.  To run this program automatically "
-#| "every hour, the host in question can be added to the "
-#| "<computeroutput>fsautoresize-hosts</computeroutput> netgroup."
 msgid ""
 "The partition (/usr/ in the example) is too full.  There are in general two "
 "ways to handle this: (1) remove some files or (2) increase the size of the "
@@ -4280,13 +4032,6 @@ msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "New package are available for upgrades.  The critical ones are normally "
-#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-#| "upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
-#| "servers, remember to also update the LTSP chroot using "
-#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt upgrade && apt full-upgrade' "
@@ -4455,10 +4200,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Make sure to also read the information about the current Debian Stable "
-#| "release in its <ulink url=\"http://www.debian.org/releases/stable/"
-#| "installmanual\">installation manual</ulink>."
 msgid ""
 "Make sure to also read the information about the current Debian Stable "
 "release in its <ulink url=\"https://www.debian.org/releases/stable/"
@@ -4469,14 +4210,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "It may also be wise to wait a bit and keep running Oldstable for a few "
-#| "weeks longer, so that others can test the upgrade and document any "
-#| "problems they experience. The Oldstable release of Debian Edu will "
-#| "receive continued support for some time after the next Stable release, "
-#| "but when Debian <ulink url=\"http://www.debian.org/security/faq#lifespan"
-#| "\">ceases support for Oldstable</ulink>, Debian Edu will necessarily do "
-#| "the same."
 msgid ""
 "It may also be wise to wait a bit and keep running Oldstable for a few weeks "
 "longer, so that others can test the upgrade and document any problems they "
@@ -4492,15 +4225,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Upgrades from Debian Edu Stretch"
 msgid "Upgrades from Debian Edu Buster"
 msgstr "从 Debian Edu Stretch 升级"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Be prepared: make sure you have tested the upgrade from Stretch in a test "
-#| "environment or have backups ready to be able to go back."
 msgid ""
 "Be prepared: make sure you have tested the upgrade from Buster in a test "
 "environment or have backups ready to be able to go back."
@@ -4509,12 +4238,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Please note that the following recipe applies to a default Debian Edu "
-#| "main server installation (desktop=xfce, profiles Main Server, "
-#| "Workstation, LTSP Server). (For a general overview concerning stretch to "
-#| "bullseye upgrade, see: <ulink url=\"https://www.debian.org/releases/"
-#| "bullseye/releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
 "server installation (desktop=xfce, profiles Main Server, Workstation, LTSP "
@@ -4567,11 +4290,6 @@ msgstr "apt clean"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Make sure you have enough disk space. On both <emphasis>/usr</emphasis> "
-#| "and <emphasis>/var</emphasis> about 5 GiB free space will be needed "
-#| "temporarily. See the related <link linkend=\"Administration--"
-#| "Resizing_Partitions\">manual chapter</link> for more information."
 msgid ""
 "Make sure you have enough disk space. On both <emphasis>/usr</emphasis> and "
 "<emphasis>/var</emphasis> about 5 GiB free space will be needed temporarily. "
@@ -4693,22 +4411,12 @@ msgstr "像在主服务器上做所有基本的事情而不用做不需要的事
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid ""
-#| "Upgrades from older Debian Edu / Skolelinux installations (before Stretch)"
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Buster)"
 msgstr "从较旧的 Debian Edu / Skolelinux 安装（Stretch 之前）升级"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To upgrade from any older release, you will need to upgrade to the "
-#| "Stretch based Debian Edu release first, before you can follow the "
-#| "instructions provided above. Instructions are given in the <ulink url="
-#| "\"https://wiki.debian.org/DebianEdu/Documentation/Stretch#\">Manual for "
-#| "Debian Edu Stretch</ulink> about how to upgrade to Stretch from the "
-#| "previous release, Jessie. Likewise the Jessie manual describes how to "
-#| "upgrade from Wheezy."
 msgid ""
 "To upgrade from any older release, you will need to upgrade to the Buster "
 "based Debian Edu release first, before you can follow the instructions "
@@ -4780,12 +4488,6 @@ msgstr "配置的历史：使用 git 版本控制系统跟踪 /etc/"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "With the introduction of <computeroutput>etckeeper</computeroutput> in "
-#| "Debian Edu Squeeze (previous versions used <computeroutput>etcinsvk</"
-#| "computeroutput> which was removed from Debian), all files in "
-#| "<computeroutput>/etc/</computeroutput> are tracked using <ulink url="
-#| "\"http://www.git-scm.com/\">git</ulink> as a version control system."
 msgid ""
 "Using <computeroutput>etckeeper</computeroutput>, all files in "
 "<computeroutput>/etc/</computeroutput> are tracked using <ulink url="
@@ -4962,10 +4664,6 @@ msgstr "逻辑卷管理"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Logical Volume Management (LVM) enables resizing the partitions while "
-#| "they are mounted and in use. You can learn more about LVM from the <ulink "
-#| "url=\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo</ulink>."
 msgid ""
 "Logical Volume Management (LVM) enables resizing the partitions while they "
 "are mounted and in use. You can learn more about LVM from the <ulink url="
@@ -5102,10 +4800,6 @@ msgstr "作为 root 登录"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "run <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput>, search for "
-#| "<emphasis>sec=sys</emphasis> and replace it with <emphasis>sec=krb5i</"
-#| "emphasis>"
 msgid ""
 "run <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput>, search for "
 "<emphasis>sec=krb5i</emphasis> and replace it with <emphasis>sec=krb5</"
@@ -5116,9 +4810,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "edit <computeroutput>/etc/exports</computeroutput>: uncomment/adjust/"
-#| "comment existing entries for /srv/*; make sure they look like this:"
 msgid ""
 "edit <computeroutput>/etc/exports</computeroutput>: adjust these existing "
 "entries for /srv/* accordingly:"
@@ -5139,10 +4830,6 @@ msgstr "运行 <computeroutput>exportfs -r</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
-#| "Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
-#| "profiles:"
 msgid ""
 "<emphasis role=\"strong\">Workstation</emphasis>, esp. any separate or "
 "additional <emphasis role=\"strong\">LTSP server</emphasis>"
@@ -5231,10 +4918,6 @@ msgstr "使用 stable-updates"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Since the Squeeze release in 2011, Debian has included packages formerly "
-#| "maintained in volatile.debian.org in the <ulink url=\"https:/wiki.debian."
-#| "org/StableUpdates\">stable-updates suite</ulink>."
 msgid ""
 "Since the Squeeze release in 2011, Debian has included packages formerly "
 "maintained in volatile.debian.org in the <ulink url=\"https://wiki.debian."
@@ -5250,7 +4933,8 @@ msgid ""
 "are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
-"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。"
+"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-"
+"updates 定期推送到稳定版套件，这大约发生在每两个月。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using backports to install newer software"
@@ -5286,9 +4970,6 @@ msgstr "使用 backports 是简单的："
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "echo \"deb http://deb.debian.org/debian/ bullseye-backports main\" >> /etc/apt/sources.list\n"
-#| "apt-get update"
 msgid ""
 "echo \"deb http://deb.debian.org/debian/ buster-backports main\" >> /etc/apt/sources.list\n"
 "apt-get update"
@@ -5306,7 +4987,6 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "apt-get install -t bullseye-backports tuxtype"
 msgid "apt install -t buster-backports tuxtype"
 msgstr "apt-get install -t bullseye-backports tuxtype"
 
@@ -5325,10 +5005,6 @@ msgstr "用 CD 或类似的映像升级"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Bullseye 10.1+edu0 to 10.3+edu1) but you do not have Internet "
-#| "connectivity, only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from "
 "Bullseye 11.1 to 11.2) but you do not have Internet connectivity, only "
@@ -5385,8 +5061,9 @@ msgid ""
 "users who are not currently logged into the machine. It's run by cron job "
 "once an hour."
 msgstr ""
-"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl "
-"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。"
+"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl 脚本。后台"
+"作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作"
+"业。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic installation of security upgrades"
@@ -5455,9 +5132,10 @@ msgid ""
 "computeroutput>; the other requires clients to have support for wake-on-lan, "
 "and the server to know about all the clients that need to be woken up."
 msgstr ""
-"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-"
-"wakeup</computeroutput> 支持的主板和 BIOS "
-"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。"
+"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，"
+"而且是由 <computeroutput>nvram-wakeup</computeroutput> 支持的主板和 BIOS 版"
+"本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客"
+"户端。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "How to set up shutdown-at-night"
@@ -5477,12 +5155,14 @@ msgid ""
 "fail to pass on packets to clients that are missing in the ARP table on the "
 "switch, and this blocks the WOL packets."
 msgstr ""
-"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-"
-"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname "
-"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 "
-"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS "
-"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 "
-"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。"
+"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-"
+"at-night</computeroutput> 相关，或添加主机名（那，是从客户端 "
+"‘<computeroutput>uname -n</computeroutput>’ 输出的）到网络组 “shutdown-at-"
+"night-hosts”。可以使用 <computeroutput>GOsa²</computeroutput> web 工具完成向 "
+"LDAP 中的网络组添加主机。客户端可能需要 BIOS 中有网络唤醒的配置。还重要的是即"
+"使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户"
+"端传送 WOL 包。一些交换机向交换机上 ARP 表中缺失的客户端传递包失败，而这阻塞 "
+"WOL 包。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5609,12 +5289,6 @@ msgstr "源自 wiki.debian.org 的 HowTo 文档"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "FIXME: The HowTos from <ulink url=\"https:/wiki.debian.org/DebianEdu/"
-#| "HowTo/\"/> are either user- or developer-specific. Let's move the user-"
-#| "specific HowTos over here (and delete them over there)! (But first ask "
-#| "the authors (see the history of those pages to find them) if they are "
-#| "fine with moving the howto and putting it under the GPL.)"
 msgid ""
 "FIXME: The HowTos from <ulink url=\"https://wiki.debian.org/DebianEdu/HowTo/"
 "\"/> are either user- or developer-specific. Let's move the user-specific "
@@ -5630,35 +5304,26 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
 msgid "<ulink url=\"https://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
 msgstr "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
 msgid "<ulink url=\"https://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
 msgstr "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
 msgid "<ulink url=\"https://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
 msgstr "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
 msgid "<ulink url=\"https://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
 msgstr "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/"
-#| "Squid_LDAP_Authentication\"/>"
 msgid ""
 "<ulink url=\"https://wiki.debian.org/DebianEdu/HowTo/"
 "Squid_LDAP_Authentication\"/>"
@@ -5720,10 +5385,11 @@ msgid ""
 "Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
 "up below /Students. Click it."
 msgstr ""
-"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 "
-"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students "
-"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）"
-"应该在 /Students 之下显示。点击它。"
+"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/"
+"Students’。从下拉框 ‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）"
+"和 Description 字段（students graduating in 2014）的值，忽略 Base 字段像是"
+"（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）应该在 /Students 之"
+"下显示。点击它。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Group"
@@ -5735,8 +5401,8 @@ msgid ""
 "(leave 'Base' as is, should be /Students/2014) and click the check box left "
 "of 'Samba group'. 'Ok' to save it."
 msgstr ""
-"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）"
-"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。"
+"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，"
+"应该是 /Students/2014）并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Template"
@@ -5753,9 +5419,10 @@ msgid ""
 "template."
 msgstr ""
 "从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 "
-"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ "
-"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba "
-"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。"
+"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ 模"
+"板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自"
+"己的结构），留意显示在 Generic，POSIX 和 Samba 选项卡内所有条目，可能需要准备"
+"有关新模板信息的屏幕快照。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5763,8 +5430,9 @@ msgid ""
 "start to fill in your desired values, first the Generic tab (add your new "
 "2014 group under Group Membership, too), then add POSIX and Samba account."
 msgstr ""
-"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（"
-"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。"
+"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的"
+"值，首先 Generic 选项卡（还要在 Group Membership 下面添加新的 2014 组），然后"
+"添加 POSIX 和 Samba 帐户。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
@@ -5797,8 +5465,8 @@ msgid ""
 "can hand in an assignment by saving the file to the folder \"assignments\" "
 "where teachers are given write access to be able to make comments."
 msgstr ""
-"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 "
-"“assignments” 文件夹保存该文件来提交一个指定任务。"
+"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向"
+"给予教师写权限而能作注释的 “assignments” 文件夹保存该文件来提交一个指定任务。"
 
 #. type: CDATA
 #, no-wrap
@@ -5834,7 +5502,9 @@ msgid ""
 "When users insert a USB drive or a DVD / CD-ROM into a (diskless) "
 "workstation, a popup window appears asking what to do with it, just like in "
 "any other normal installation."
-msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。"
+msgstr ""
+"当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何"
+"使用它，就像在任何其他标准安装上的一样。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5859,7 +5529,9 @@ msgstr ""
 msgid ""
 "If remote users acknowledge the popup or use pmount from the console, they "
 "can even mount the removable devices and access the files."
-msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。"
+msgstr ""
+"如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问"
+"其文件。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
@@ -5884,8 +5556,8 @@ msgid ""
 "intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
-"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS "
-"导出点是否被导出到相关子网或机器："
+"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之"
+"后，检查新存储服务器上的 NFS 导出点是否被导出到相关子网或机器："
 
 #. type: CDATA
 #, no-wrap
@@ -5954,7 +5626,8 @@ msgid ""
 "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
 "does not use automount to avoid mounting loops:"
 msgstr ""
-"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环："
+"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 "
+"automount 来避免挂载循环："
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -6042,8 +5715,8 @@ msgid ""
 "alice, jane, bob and john from everywhere and for all other users only from "
 "the internal networks by adding these lines:"
 msgstr ""
-"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john "
-"从各处以及所有用户从内网连接："
+"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob "
+"和 john 从各处以及所有用户从内网连接："
 
 #. type: CDATA
 #, no-wrap
@@ -6061,8 +5734,9 @@ msgid ""
 "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
 "server(s) as well."
 msgstr ""
-"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP "
-"客户端网络也会获得 ssh 访问 LTSP 服务器。"
+"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访"
+"问。注意：有人连接着他的分隔区域到专用 LTSP 客户端网络也会获得 ssh 访问 LTSP "
+"服务器。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "A note for more complex setups"
@@ -6118,10 +5792,11 @@ msgid ""
 "language chooser. Run <computeroutput>apt purge arctica-greeter</"
 "computeroutput> to get the stock Lightdm greeter."
 msgstr ""
-"然后用户会在登录之前能够通过 LightDM 显示管理器选择语言；这应用到 Xfce，LXDE 和 LXQt。GNOME 和 KDE "
-"两者有自己内部的地区和语言配置工具，使用这些。MATE 在 Lightdm 的上方使用没有语言选择项的 Arctica 欢迎界面。运行 "
-"<computeroutput>apt purge arctica-greeter</computeroutput> 得到常用的 Lightdm "
-"欢迎界面。"
+"然后用户会在登录之前能够通过 LightDM 显示管理器选择语言；这应用到 Xfce，LXDE "
+"和 LXQt。GNOME 和 KDE 两者有自己内部的地区和语言配置工具，使用这些。MATE 在 "
+"Lightdm 的上方使用没有语言选择项的 Arctica 欢迎界面。运行 "
+"<computeroutput>apt purge arctica-greeter</computeroutput> 得到常用的 "
+"Lightdm 欢迎界面。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6129,8 +5804,8 @@ msgid ""
 "LTSP chroot as well. LDM supports all desktop environments. First use "
 "<emphasis>Preferences</emphasis> to choose the language, then login."
 msgstr ""
-"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 "
-"<emphasis>Preferences</emphasis> 选择语言，然后登录。"
+"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所"
+"有桌面环境。首先使用 <emphasis>Preferences</emphasis> 选择语言，然后登录。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
@@ -6190,10 +5865,6 @@ msgstr "瘦客户机和无盘工作站介绍"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "One generic term for both thin clients and diskless workstations is "
-#| "<emphasis>LTSP client</emphasis>. <ulink url=\"http://ltsp.org\">LTSP is "
-#| "the Linux Terminal Server Project</ulink>."
 msgid ""
 "One generic term for both thin clients and diskless workstations is "
 "<emphasis>LTSP client</emphasis>."
@@ -6233,14 +5904,6 @@ msgstr "<emphasis role=\"strong\">无盘工作站</emphasis>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A diskless workstation runs all software locally. The client machines "
-#| "boot directly from the LTSP server without a local hard drive. Software "
-#| "is administered and maintained on the LTSP server (inside of the LTSP "
-#| "chroot), but it runs on the diskless workstation. Home directories and "
-#| "system settings are stored on the server too. Diskless workstations are "
-#| "an excellent way of reusing older (but powerful) hardware with the same "
-#| "low maintenance cost as with thin clients."
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
 "directly from the LTSP server without a local hard drive. Software is "
@@ -6266,12 +5929,6 @@ msgstr "<emphasis role=\"strong\">LTSP 客户端固件</emphasis>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "LTSP client boot will fail if the client's network interface requires a "
-#| "non-free firmware. A PXE installation can be used for troubleshooting "
-#| "problems with netbooting a machine; if the Debian Installer complains "
-#| "about a missing XXX.bin file then non-free firmware has to be added to "
-#| "the initrd used by LTSP clients."
 msgid ""
 "LTSP client boot will fail if the client's network interface requires a non-"
 "free firmware. A PXE installation can be used for troubleshooting problems "
@@ -6285,7 +5942,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "In this case execute the following commands on an LTSP server."
 msgid "In this case execute the following commands on the LTSP server."
 msgstr "这个情况在 LTSP 服务器上执行以下命令。"
 
@@ -6309,11 +5965,6 @@ msgstr "LTSP 客户机类型选择"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Each LTSP server has two ethernet interfaces: one configured in the main "
-#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
-#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
-#| "server)."
 msgid ""
 "Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
@@ -6524,7 +6175,6 @@ msgstr "LTSP 细节"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "LTSP client configuration in LDAP (and lts.conf)"
 msgid "LTSP client configuration"
 msgstr "LDAP（和 lts.conf）中的 LTSP 客户机配置"
 
@@ -7255,9 +6905,6 @@ msgstr "世界贡献"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Internationally we are organised into various <ulink url=\"http://wiki."
-#| "debian.org/DebianEdu/Teams/\">teams</ulink> working on different subjects."
 msgid ""
 "Internationally we are organised into various <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Teams/\">teams</ulink> working on different subjects."
@@ -7267,14 +6914,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Most of the time, the <ulink url=\"http://lists.debian.org/debian-edu"
-#| "\">developer mailing list</ulink> is our main medium for communication, "
-#| "though we have monthly IRC meetings on #debian-edu on irc.debian.org and "
-#| "even, less frequently, real gatherings, where we meet each other in "
-#| "person. <ulink url=\"https:/wiki.debian.org/DebianEdu/NewContributor"
-#| "\">New contributors</ulink> should read our <ulink url=\"https:/wiki."
-#| "debian.org/DebianEdu/ArchivePolicy\"/>."
 msgid ""
 "Most of the time, the <ulink url=\"https://lists.debian.org/debian-edu"
 "\">developer mailing list</ulink> is our main medium for communication, "
@@ -7315,12 +6954,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The source of the text is a wiki and can be edited with a simple "
-#| "webbrowser. Just go to <ulink url=\"https:/wiki.debian.org/DebianEdu/"
-#| "Documentation/Bullseye/\"/> and you can contribute easily. Note: a user "
-#| "account is needed to edit the pages; you need to <ulink url=\"https:/wiki."
-#| "debian.org/UserPreferences\">create a wiki user</ulink> first."
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/"
@@ -7359,7 +6992,6 @@ msgstr "英语方面"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
 msgid "<ulink url=\"https://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
 
@@ -7408,9 +7040,6 @@ msgstr "德语方面"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://lists.debian.org/debian-edu-german\"/> - support "
-#| "mailing list"
 msgid ""
 "<ulink url=\"https://lists.debian.org/debian-edu-german\"/> - support "
 "mailing list"
@@ -7443,9 +7072,6 @@ msgstr "专业支持"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Lists of companies providing professional support are available from "
-#| "<ulink url=\"https:/wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/>."
 msgid ""
 "Lists of companies providing professional support are available from <ulink "
 "url=\"https://wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/>."
@@ -7467,10 +7093,6 @@ msgstr "安装变化"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "New version of debian-installer from Debian Bullseye, see its <ulink url="
-#| "\"http://www.debian.org/releases/bullseye/installmanual\">installation "
-#| "manual</ulink> for more details."
 msgid ""
 "New version of debian-installer from Debian Bullseye, see its <ulink url="
 "\"https://www.debian.org/releases/bullseye/installmanual\">installation "
@@ -7500,7 +7122,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Get the new Debian Edu Bullseye artwork:"
 msgid "Everything which is new in Debian 11 Bullseye, eg:"
 msgstr "获得新的 Debian Edu Bullseye 插图："
 
@@ -7536,7 +7157,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "LTSP 5.18"
 msgid "LTSP 21"
 msgstr "LTSP 5.18"
 
@@ -7547,11 +7167,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "More information about Debian 10 Bullseye is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/bullseye/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/bullseye/"
-#| "installmanual\">installation manual</ulink>."
 msgid ""
 "More information about Debian 11 Bullseye is provided in the <ulink url="
 "\"https://www.debian.org/releases/bullseye/releasenotes\">release notes</"
@@ -7716,8 +7331,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), "
-"Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any "
-"later version."
+"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released "
+"under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -7759,15 +7374,6 @@ msgstr "翻译所使用的 PO 文件"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "As in many free software projects, translations of this document are kept "
-#| "in PO files. More information about the process can be found in "
-#| "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-bullseye-"
-#| "manual-translations</computeroutput>. The Git repository (see below) "
-#| "contains this file too. Take a look there and at the <ulink url=\"https://"
-#| "wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-#| "specific conventions</ulink> if you want to help translating this "
-#| "document."
 msgid ""
 "As in many free software projects, translations of this document are kept in "
 "PO files. More information about the process can be found in "
@@ -7798,19 +7404,12 @@ msgid ""
 "using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
 "debian-edu-doc.git</computeroutput>"
 msgstr ""
-"然后签出 <computeroutput>debian-edu-doc</computeroutput> 源代码使用 ssh "
-"访问：<computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-"
-"doc.git</computeroutput>"
+"然后签出 <computeroutput>debian-edu-doc</computeroutput> 源代码使用 ssh 访"
+"问：<computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you only want to translate, you need to check out only a few files "
-#| "from Git (which can be done anonymously). Please file a bug against the "
-#| "debian-edu-doc package and attach the PO file to the <ulink url=\"http://"
-#| "bugs.debian.org/debian-edu-doc\">bugreport</ulink>. See <ulink url="
-#| "\"http://bugs.debian.org\">instructions on how to submit bugs</ulink> for "
-#| "more information."
 msgid ""
 "If you only want to translate, you need to check out only a few files from "
 "Git (which can be done anonymously). Please file a bug against the debian-"
@@ -7840,11 +7439,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Then edit the file <computeroutput>documentation/debian-edu-bullseye/"
-#| "debian-edu-bullseye-manual.$CC.po</computeroutput> (replacing $CC with "
-#| "your language code). There are many tools for translating available; we "
-#| "suggest using <computeroutput>lokalize</computeroutput>."
 msgid ""
 "Then edit the file <computeroutput>documentation/debian-edu-buster/debian-"
 "edu-buster-manual.$CC.po</computeroutput> (replacing $CC with your language "
@@ -7877,10 +7471,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Read /usr/share/doc/debian-edu-doc/README.debian-edu-bullseye-manual-"
-#| "translations to find information how to create a new PO file for your "
-#| "language if there isn't one yet, and how to update translations."
 msgid ""
 "Read /usr/share/doc/debian-edu-doc/README.debian-edu-buster-manual-"
 "translations to find information how to create a new PO file for your "
@@ -7907,13 +7497,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
-#| "\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-"
-#| "scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository"
-#| "\">recording changes to the repository</ulink>. Also you might want to "
-#| "look at the <computeroutput>gitk</computeroutput> package that provides a "
-#| "GUI for Git."
 msgid ""
 "If you are new to Git, look at the <ulink url=\"https://git-scm.com/book"
 "\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"https://git-"
@@ -7932,10 +7515,6 @@ msgstr "使用 web 浏览器在线翻译"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Some language teams have decided to translate via Weblate. See <ulink url="
-#| "\"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
-#| "bullseye/\"/> for more information."
 msgid ""
 "Some language teams have decided to translate via Weblate. See <ulink url="
 "\"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
@@ -8503,8 +8082,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid ""
-#| "New features for Debian Edu 8+edu0 Codename Jessie released 2016-07-02"
 msgid "New features for Debian Edu 10+edu0 Codename Buster released 2019-07-06"
 msgstr "2016 年 7 月 2 日发行的 Debian Edu 8+edu0 代号 Jessie 的新面貌"
 
@@ -8517,10 +8094,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "New version of debian-installer from Debian Bullseye, see its <ulink url="
-#| "\"http://www.debian.org/releases/bullseye/installmanual\">installation "
-#| "manual</ulink> for more details."
 msgid ""
 "New version of debian-installer from Debian Buster, see its <ulink url="
 "\"http://www.debian.org/releases/buster/installmanual\">installation manual</"
@@ -8593,11 +8166,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "More information about Debian 10 Bullseye is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/bullseye/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/bullseye/"
-#| "installmanual\">installation manual</ulink>."
 msgid ""
 "More information about Debian 10 Buster is provided in the <ulink url="
 "\"http://www.debian.org/releases/buster/releasenotes\">release notes</ulink> "
@@ -8653,10 +8221,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Site specific multi-language support. See the <link linkend=\"Desktop--"
-#| "Set_up_a_multi-language_desktop_environment\">Desktop</link> chapter for "
-#| "more information."
 msgid ""
 "Site specific multi-language support. See the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Buster/HowTo/Desktop#Set_up_a_multi-"
@@ -8948,14 +8512,11 @@ msgstr "以下是从前所做的更多 Debian Edu 发行版："
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "New features for Debian Edu 8+edu0 Codename Jessie released 2016-07-02"
 msgid "Debian Edu 8+edu0 Codename Jessie released 2016-07-02."
 msgstr "2016 年 7 月 2 日发行的 Debian Edu 8+edu0 代号 Jessie 的新面貌"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Debian Edu 5.0.4+edu0 Codename \"Lenny\", released 2010-02-08."
 msgid "Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28."
 msgstr "Debian Edu 5.0.4+edu0 代号 \"Lenny\"，发布于 2010-02-08。"
 


=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2020-02-25 17:50+0000\n"
+"POT-Creation-Date: 2020-03-28 10:51+0000\n"
 "PO-Revision-Date: 2020-04-01 19:47+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -5239,11 +5239,11 @@ msgid ""
 "server and workstation increases with the security level, <emphasis>krb5i</"
 "emphasis> might be a good choice."
 msgstr ""
-"使用 Kerberos 对于 NFS 挂载主目录是一个安全特性。支持 "
-"<emphasis>krb5</emphasis>，<emphasis>krb5i</emphasis> 和 "
-"<emphasis>krb5p</emphasis> 级别（<emphasis>krb5</emphasis> 是指 Kerberos "
-"验证，<emphasis>i</emphasis> 是完整检查的缩略而 <emphasis>p</emphasis> "
-"是关于私人权利，即隐私）；服务器和工作站两者负载的增加与其安全级别一致，<emphasis>krb5i</emphasis> 可能是一个好选择。"
+"使用 Kerberos 对于 NFS 挂载主目录是一个安全特性。支持 <emphasis>krb5</"
+"emphasis>，<emphasis>krb5i</emphasis> 和 <emphasis>krb5p</emphasis> 级别"
+"（<emphasis>krb5</emphasis> 是指 Kerberos 验证，<emphasis>i</emphasis> 是完整"
+"检查的缩略而 <emphasis>p</emphasis> 是关于私人权利，即隐私）；服务器和工作站"
+"两者负载的增加与其安全级别一致，<emphasis>krb5i</emphasis> 可能是一个好选择。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5271,9 +5271,11 @@ msgid ""
 "<emphasis>sshfs</emphasis> to mount home directories, so there's nothing to "
 "do for diskless workstations."
 msgstr ""
-"<emphasis role=\"strong\">请注意：</emphasis> 主机密钥表的创建适合于<emphasis>工作站</emphasis>"
-"，<emphasis>服务器</emphasis>和<emphasis>终端</emphasis>类型的系统但不是那些<emphasis>网络设备</em"
-"phasis>的类型。还有，LTSP 客户端使用 <emphasis>sshfs</emphasis> 挂载主目录，所以那对于无盘工作站没什么要做的。"
+"<emphasis role=\"strong\">请注意：</emphasis> 主机密钥表的创建适合于"
+"<emphasis>工作站</emphasis>，<emphasis>服务器</emphasis>和<emphasis>终端</"
+"emphasis>类型的系统但不是那些<emphasis>网络设备</emphasis>的类型。还有，LTSP "
+"客户端使用 <emphasis>sshfs</emphasis> 挂载主目录，所以那对于无盘工作站没什么"
+"要做的。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "How to enable it"
@@ -5418,7 +5420,8 @@ msgid ""
 "are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
-"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-updates 定期推送到稳定版套件，这大约发生在每两个月。"
+"虽然可以直接使用 stable-updates，但不需要：当稳定版点发布完成时 stable-"
+"updates 定期推送到稳定版套件，这大约发生在每两个月。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Using backports to install newer software"
@@ -5553,8 +5556,9 @@ msgid ""
 "users who are not currently logged into the machine. It's run by cron job "
 "once an hour."
 msgstr ""
-"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl "
-"脚本。后台作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作业。"
+"<computeroutput>killer</computeroutput> 是一个结束后台作业的 perl 脚本。后台"
+"作业被定义为属于当前未登录到机器用户的进程。这是每个小时运行一次的 cron 作"
+"业。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic installation of security upgrades"
@@ -5623,9 +5627,10 @@ msgid ""
 "computeroutput>; the other requires clients to have support for wake-on-lan, "
 "and the server to know about all the clients that need to be woken up."
 msgstr ""
-"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，而且是由 <computeroutput>nvram-"
-"wakeup</computeroutput> 支持的主板和 BIOS "
-"版本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客户端。"
+"有两个不同的方法唤醒客户端。一个是使用 BIOS 功能而依赖工作着的准确硬件时钟，"
+"而且是由 <computeroutput>nvram-wakeup</computeroutput> 支持的主板和 BIOS 版"
+"本；另一个依赖客户端对局域网唤醒有所支持，而服务器知道有关所有需要被唤醒的客"
+"户端。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "How to set up shutdown-at-night"
@@ -5645,12 +5650,14 @@ msgid ""
 "fail to pass on packets to clients that are missing in the ARP table on the "
 "switch, and this blocks the WOL packets."
 msgstr ""
-"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-at-"
-"night</computeroutput> 相关，或添加主机名（那，是从客户端 ‘<computeroutput>uname "
-"-n</computeroutput>’ 输出的）到网络组 “shutdown-at-night-hosts”。可以使用 "
-"<computeroutput>GOsa²</computeroutput> web 工具完成向 LDAP 中的网络组添加主机。客户端可能需要 BIOS "
-"中有网络唤醒的配置。还重要的是即使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户端传送 WOL 包。一些交换机向交换机上 "
-"ARP 表中缺失的客户端传递包失败，而这阻塞 WOL 包。"
+"在夜晚应该关闭的客户端，与 <computeroutput>/etc/shutdown-at-night/shutdown-"
+"at-night</computeroutput> 相关，或添加主机名（那，是从客户端 "
+"‘<computeroutput>uname -n</computeroutput>’ 输出的）到网络组 “shutdown-at-"
+"night-hosts”。可以使用 <computeroutput>GOsa²</computeroutput> web 工具完成向 "
+"LDAP 中的网络组添加主机。客户端可能需要 BIOS 中有网络唤醒的配置。还重要的是即"
+"使客户端已被关闭局域网唤醒服务器和客户端之间所使用的交换机和路由器还会向客户"
+"端传送 WOL 包。一些交换机向交换机上 ARP 表中缺失的客户端传递包失败，而这阻塞 "
+"WOL 包。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5867,10 +5874,11 @@ msgid ""
 "Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
 "up below /Students. Click it."
 msgstr ""
-"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/Students’。从下拉框 "
-"‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）和 Description 字段（students "
-"graduating in 2014）的值，忽略 Base 字段像是（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）"
-"应该在 /Students 之下显示。点击它。"
+"主菜单：往 ‘Directory structure’ 点 ‘Students’ 部门。‘Base’ 字段应显示 ‘/"
+"Students’。从下拉框 ‘Actions’ 选择 ‘Create’/‘Department’。填入 Name（2014）"
+"和 Description 字段（students graduating in 2014）的值，忽略 Base 字段像是"
+"（应该是 ‘/Students’）。点 ‘Ok’ 保存。现在新的部门（2014）应该在 /Students 之"
+"下显示。点击它。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Group"
@@ -5882,8 +5890,8 @@ msgid ""
 "(leave 'Base' as is, should be /Students/2014) and click the check box left "
 "of 'Samba group'. 'Ok' to save it."
 msgstr ""
-"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，应该是 /Students/2014）"
-"并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。"
+"从主菜单选择 ‘Groups’；‘Actions’/Create/Group。输入组名称（‘Base’ 原样保留，"
+"应该是 /Students/2014）并点击 ‘Samba group’ 左侧的复选框。‘Ok’ 保存。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Template"
@@ -5900,9 +5908,10 @@ msgid ""
 "template."
 msgstr ""
 "从主菜单选择 ‘users’。在 Base 字段改为 ‘Students’。应该出现一个 "
-"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ "
-"模板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自己的结构），留意显示在 Generic，POSIX 和 Samba "
-"选项卡内所有条目，可能需要准备有关新模板信息的屏幕快照。"
+"<computeroutput>NewStudent</computeroutput> 条目，点击它。这是 ‘students’ 模"
+"板，不是真正的用户。因为需要基于这一个来创建这一类的模板（能够使用 csv 导入自"
+"己的结构），留意显示在 Generic，POSIX 和 Samba 选项卡内所有条目，可能需要准备"
+"有关新模板信息的屏幕快照。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5910,8 +5919,9 @@ msgid ""
 "start to fill in your desired values, first the Generic tab (add your new "
 "2014 group under Group Membership, too), then add POSIX and Samba account."
 msgstr ""
-"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的值，首先 Generic 选项卡（"
-"还要在 Group Membership 下面添加新的 2014 组），然后添加 POSIX 和 Samba 帐户。"
+"现在更改 Base 字段内为 /Students/2014；选择 Create/Template 并开始填写想要的"
+"值，首先 Generic 选项卡（还要在 Group Membership 下面添加新的 2014 组），然后"
+"添加 POSIX 和 Samba 帐户。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
@@ -5944,8 +5954,8 @@ msgid ""
 "can hand in an assignment by saving the file to the folder \"assignments\" "
 "where teachers are given write access to be able to make comments."
 msgstr ""
-"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向给予教师写权限而能作注释的 "
-"“assignments” 文件夹保存该文件来提交一个指定任务。"
+"在下面显示带有 group=teachers 和 permissions=2770 的范例中一个用户可以通过向"
+"给予教师写权限而能作注释的 “assignments” 文件夹保存该文件来提交一个指定任务。"
 
 #. type: CDATA
 #, no-wrap
@@ -5981,7 +5991,9 @@ msgid ""
 "When users insert a USB drive or a DVD / CD-ROM into a (diskless) "
 "workstation, a popup window appears asking what to do with it, just like in "
 "any other normal installation."
-msgstr "当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何使用它，就像在任何其他标准安装上的一样。"
+msgstr ""
+"当用户插入 USB 驱动器或者 DVD / CD-ROM 到（无盘）工作站时，出现的弹窗询问如何"
+"使用它，就像在任何其他标准安装上的一样。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5990,8 +6002,9 @@ msgid ""
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
 msgstr ""
-"当用户插入 USB 驱动器或者 DVD / CD-ROM 到瘦客户机时只显示一个通知窗口几秒钟。该媒体被自动挂载并且能够浏览 /media/$user "
-"文件夹来访问它。这对于很多没有经验的用户不很困难。"
+"当用户插入 USB 驱动器或者 DVD / CD-ROM 到瘦客户机时只显示一个通知窗口几秒钟。"
+"该媒体被自动挂载并且能够浏览 /media/$user 文件夹来访问它。这对于很多没有经验"
+"的用户不很困难。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6002,10 +6015,11 @@ msgid ""
 "enable</computeroutput> on the terminal server. (When using GNOME, device "
 "icons will be placed on the desktop allowing easy access)."
 msgstr ""
-"如果 KDE “Plasma”（或者，并行安装到 KDE “Plasma” 的 LDXE）是作为桌面环境使用则能有默认的 KDE “Plasma” "
-"文件管理器 Dolphin 出现。要配置这个，在终端服务器上简单地执行 <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput>。（当使用 GNOME "
-"时，设备图标会放在桌面上使之易于访问）。"
+"如果 KDE “Plasma”（或者，并行安装到 KDE “Plasma” 的 LDXE）是作为桌面环境使用"
+"则能有默认的 KDE “Plasma” 文件管理器 Dolphin 出现。要配置这个，在终端服务器上"
+"简单地执行 <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde "
+"enable</computeroutput>。（当使用 GNOME 时，设备图标会放在桌面上使之易于访"
+"问）。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6014,8 +6028,9 @@ msgid ""
 "ROM / DVD or whatever media is connected to the thin client. This might come "
 "in handy if users want to edit files directly on their plugged in media."
 msgstr ""
-"另外为了易于访问连到瘦客户机的 USB 驱动器，CD-ROM / DVD 或其他类似媒体将使用下面的脚本对所有用户在他们的主文件夹中创建 “media” "
-"的符号链接。这可以对方便用户需要直接在插入的媒体中编辑文件起作用。"
+"另外为了易于访问连到瘦客户机的 USB 驱动器，CD-ROM / DVD 或其他类似媒体将使用"
+"下面的脚本对所有用户在他们的主文件夹中创建 “media” 的符号链接。这可以对方便用"
+"户需要直接在插入的媒体中编辑文件起作用。"
 
 #. type: CDATA
 #, no-wrap
@@ -6052,7 +6067,9 @@ msgstr ""
 msgid ""
 "If remote users acknowledge the popup or use pmount from the console, they "
 "can even mount the removable devices and access the files."
-msgstr "如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问其文件。"
+msgstr ""
+"如果远程用户收到弹窗通知或者从控制台使用 pmount，甚至可以挂载可移动设备并访问"
+"其文件。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
@@ -6071,8 +6088,9 @@ msgid ""
 "Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
 "manual."
 msgstr ""
-"作为使用 GOsa² 添加 <computeroutput>server</computeroutput> 类型新系统的要点在本手册的<link "
-"linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">起步</link>一章中。"
+"作为使用 GOsa² 添加 <computeroutput>server</computeroutput> 类型新系统的要点"
+"在本手册的<link linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-"
+"\">起步</link>一章中。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -6080,8 +6098,8 @@ msgid ""
 "intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
-"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之后，检查新存储服务器上的 NFS "
-"导出点是否被导出到相关子网或机器："
+"这个示例使用 ‘nas-server.intern’ 作为服务器名称。配置 ‘nas-server.intern’ 之"
+"后，检查新存储服务器上的 NFS 导出点是否被导出到相关子网或机器："
 
 #. type: CDATA
 #, no-wrap
@@ -6150,7 +6168,8 @@ msgid ""
 "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
 "does not use automount to avoid mounting loops:"
 msgstr ""
-"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 automount 来避免挂载循环："
+"在 tjener.intern:/etc/fstab 中添加相关条目，因为 tjener.intern 不能用 "
+"automount 来避免挂载循环："
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -6165,28 +6184,33 @@ msgstr ""
 msgid ""
 "Enable access in case diskless workstations are used. This is a special "
 "case, because sshfs is used instead of NFS and automount:"
-msgstr "在使用无盘工作站的情况下启用访问。这是特殊情况，因为使用 sshfs 取代 NFS 和 automount："
+msgstr ""
+"在使用无盘工作站的情况下启用访问。这是特殊情况，因为使用 sshfs 取代 NFS 和 "
+"automount："
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Create the mount point directories in the LTSP diskless client's root "
 "(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
 msgstr ""
-"而且在 LTSP 无盘客户端的根（默认 <computeroutput>/opt/ltsp/i386/</computeroutput>）创建挂载点目录。"
+"而且在 LTSP 无盘客户端的根（默认 <computeroutput>/opt/ltsp/i386/</"
+"computeroutput>）创建挂载点目录。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
 "opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
 msgstr ""
-"添加内容为 ‘LOCAL_APPS_EXTRAMOUNTS=/storage’ 的一行到 <computeroutput>/opt/ltsp/i386/"
-"etc/lts.conf</computeroutput>（示例）。"
+"添加内容为 ‘LOCAL_APPS_EXTRAMOUNTS=/storage’ 的一行到 <computeroutput>/opt/"
+"ltsp/i386/etc/lts.conf</computeroutput>（示例）。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Create a link in each user's home dir like 'ln -s /storage Storage' to help "
 "users find the resources."
-msgstr "在每个用户的主目录创建类似 ‘ln -s /storage Storage’ 的链接来帮助用户找到该资源。"
+msgstr ""
+"在每个用户的主目录创建类似 ‘ln -s /storage Storage’ 的链接来帮助用户找到该资"
+"源。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6195,8 +6219,9 @@ msgid ""
 "application on any workstation, LTSP thin client or LTSP server, and "
 "visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
-"现在用户应该能够在任何工作站，LTSP 瘦客户机或 LTSP 服务器上使用任何应用程序只通过浏览 ‘/tjener/nas-server/storage/"
-"’ 目录直接访问 ‘nas-server.intern’ 上的文件，而在使用 LTSP 无盘客户机的情况下浏览 ~/Storage。"
+"现在用户应该能够在任何工作站，LTSP 瘦客户机或 LTSP 服务器上使用任何应用程序只"
+"通过浏览 ‘/tjener/nas-server/storage/’ 目录直接访问 ‘nas-server.intern’ 上的"
+"文件，而在使用 LTSP 无盘客户机的情况下浏览 ~/Storage。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Restrict ssh login access"
@@ -6268,8 +6293,8 @@ msgid ""
 "alice, jane, bob and john from everywhere and for all other users only from "
 "the internal networks by adding these lines:"
 msgstr ""
-"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob 和 john "
-"从各处以及所有用户从内网连接："
+"配置 /etc/security/access.conf 添加这几行允许（示范）用户 alice，jane，bob "
+"和 john 从各处以及所有用户从内网连接："
 
 #. type: CDATA
 #, no-wrap
@@ -6287,8 +6312,9 @@ msgid ""
 "box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
 "server(s) as well."
 msgstr ""
-"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访问。注意：有人连接着他的分隔区域到专用 LTSP "
-"客户端网络也会获得 ssh 访问 LTSP 服务器。"
+"如果只使用专用的 LTSP 服务器，可以脱离 10.0.0.0/8 网络来禁用内部 ssh 登录访"
+"问。注意：有人连接着他的分隔区域到专用 LTSP 客户端网络也会获得 ssh 访问 LTSP "
+"服务器。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "A note for more complex setups"
@@ -6344,10 +6370,11 @@ msgid ""
 "language chooser. Run <computeroutput>apt purge arctica-greeter</"
 "computeroutput> to get the stock Lightdm greeter."
 msgstr ""
-"然后用户会在登录之前能够通过 LightDM 显示管理器选择语言；这应用到 Xfce，LXDE 和 LXQt。GNOME 和 KDE "
-"两者有自己内部的地区和语言配置工具，使用这些。MATE 在 Lightdm 的上方使用没有语言选择项的 Arctica 欢迎界面。运行 "
-"<computeroutput>apt purge arctica-greeter</computeroutput> 得到常用的 Lightdm "
-"欢迎界面。"
+"然后用户会在登录之前能够通过 LightDM 显示管理器选择语言；这应用到 Xfce，LXDE "
+"和 LXQt。GNOME 和 KDE 两者有自己内部的地区和语言配置工具，使用这些。MATE 在 "
+"Lightdm 的上方使用没有语言选择项的 Arctica 欢迎界面。运行 "
+"<computeroutput>apt purge arctica-greeter</computeroutput> 得到常用的 "
+"Lightdm 欢迎界面。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6355,8 +6382,8 @@ msgid ""
 "LTSP chroot as well. LDM supports all desktop environments. First use "
 "<emphasis>Preferences</emphasis> to choose the language, then login."
 msgstr ""
-"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所有桌面环境。首先使用 "
-"<emphasis>Preferences</emphasis> 选择语言，然后登录。"
+"如果使用 LTSP 无盘客户端则上述步骤还需要在该 LTSP chroot 内部完成。LDM 支持所"
+"有桌面环境。首先使用 <emphasis>Preferences</emphasis> 选择语言，然后登录。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
@@ -8726,15 +8753,14 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016, 2017, 2018, 2019) and is released under the GPL v2 or any later "
-"version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014-2020) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Japanese translation is copyrighted by victory (2016, 2017) and hoxp18 "
-"(2019) and is released under the GPL v2 or any later version."
+"(2019-2020) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -8746,8 +8772,8 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018, 2019, 2020), Boyuan Yang (2017), Roy Zhang (2017) and is released "
+"The Simplified Chinese translation is copyrighted by Ma Yong (2016-2020), "
+"Boyuan Yang (2017), Roy Zhang (2017) and EldersJavas (2020) and is released "
 "under the GPL v2 or any later version."
 msgstr ""
 
@@ -8819,9 +8845,9 @@ msgid ""
 "using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
 "debian-edu-doc.git</computeroutput>"
 msgstr ""
-"然后签出 <computeroutput>debian-edu-doc</computeroutput> 源代码使用 ssh "
-"访问：<computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-"
-"doc.git</computeroutput>"
+"然后签出 <computeroutput>debian-edu-doc</computeroutput> 源代码使用 ssh 访"
+"问：<computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""


=====================================
documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-09 00:13+0100\n"
+"POT-Creation-Date: 2020-03-28 10:48+0000\n"
 "PO-Revision-Date: 2020-04-03 17:44+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -10034,13 +10034,13 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Liang Guo (2017) and Ma "
-"Yong (2018, 2019) and is released under the GPL v3 or any later version."
+"Yong (2018-2020) and is released under the GPL v3 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2017, 2018, "
-"2019) and is released under the GPL v3 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2017-2020) and "
+"is released under the GPL v3 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>


=====================================
documentation/rosegarden/rosegarden-manual.pl.po
=====================================
@@ -6,11 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-28 15:27+0000\n"
+"POT-Creation-Date: 2020-03-28 10:40+0000\n"
 "PO-Revision-Date: 2020-04-03 17:44+0000\n"
 "Last-Translator: Michal Biesiada <blade-14 at o2.pl>\n"
-"Language-Team: Polish <https://hosted.weblate.org/projects/"
-"debian-edu-documentation/rosegarden/pl/>\n"
+"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
+"documentation/rosegarden/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2950,8 +2950,9 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma "
-"Yong (2019, 2020) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong "
+"(2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any "
+"later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>


=====================================
documentation/rosegarden/rosegarden-manual.zh.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-02-28 15:27+0000\n"
+"POT-Creation-Date: 2020-03-28 10:40+0000\n"
 "PO-Revision-Date: 2020-04-03 17:44+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -38,7 +38,9 @@ msgstr "Rosegarden 手册"
 msgid ""
 "This is a manual for rosegarden, based on the 1:1.4.0-1 version from the "
 "Debian Edu Etch 3.0 release."
-msgstr "这是 rosegarden 的手册，所基于的 1:1.4.0-1 版本源自 Debian Edu Etch 3.0 发行。"
+msgstr ""
+"这是 rosegarden 的手册，所基于的 1:1.4.0-1 版本源自 Debian Edu Etch 3.0 发"
+"行。"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -2942,8 +2944,9 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma "
-"Yong (2019, 2020) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by 杨玉印 (2018), Ma Yong "
+"(2019, 2020) and EldersJavas (2020) and is released under the GPL v2 or any "
+"later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -2993,9 +2996,9 @@ msgid ""
 "using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
 "debian-edu-doc.git</computeroutput>"
 msgstr ""
-"然后签出 <computeroutput>debian-edu-doc</computeroutput> 源代码使用 ssh "
-"访问：<computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-"
-"doc.git</computeroutput>"
+"然后签出 <computeroutput>debian-edu-doc</computeroutput> 源代码使用 ssh 访"
+"问：<computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""



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

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/b53f5dc030ac8d138c3ed0da44b14ddd9215f21d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20200403/ab48d449/attachment-0001.html>