[debian-edu-commits] [Git][debian-edu/debian-edu-doc][weblate] 6 commits: Translation: Debian Edu Documentation/Bullseye manual

Frans Spiesschaert gitlab at salsa.debian.org
Tue Oct 20 19:44:23 BST 2020



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


Commits:
e9c2cc47 by Allan Nordhøy at 2020-10-16T04:26:44+02:00
Translation: Debian Edu Documentation/Bullseye manual
Translated using Weblate (Norwegian Bokmål)
Currently translated at 85.1% (935 of 1098 strings)
Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/nb_NO/

- - - - -
18d01e64 by tao wang at 2020-10-16T04:26:45+02:00
Translation: Debian Edu Documentation/Bullseye manual
Translated using Weblate (Chinese (Simplified))
Currently translated at 94.1% (1034 of 1098 strings)
Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/

- - - - -
c51731c8 by Allan Nordhøy at 2020-10-16T04:26:46+02:00
Translation: Debian Edu Documentation/Buster manual
Translated using Weblate (Norwegian Bokmål)
Currently translated at 94.9% (1212 of 1276 strings)
Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/nb_NO/

- - - - -
4a0f66a5 by tao wang at 2020-10-16T04:26:46+02:00
Translation: Debian Edu Documentation/Buster manual
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1276 of 1276 strings)
Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/

- - - - -
9b87be89 by tao wang at 2020-10-17T13:27:04+02:00
Translation: Debian Edu Documentation/Bullseye manual
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1098 of 1098 strings)
Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-bullseye/zh_Hans/

- - - - -
3fc3a3a1 by tao wang at 2020-10-17T13:27:05+02:00
Translation: Debian Edu Documentation/Buster manual
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1276 of 1276 strings)
Translate-URL: https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-buster/zh_Hans/

- - - - -


4 changed files:

- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nb-no.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-cn.po
- documentation/debian-edu-buster/debian-edu-buster-manual.nb-no.po
- documentation/debian-edu-buster/debian-edu-buster-manual.zh-cn.po


Changes:

=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nb-no.po
=====================================
@@ -22,11 +22,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "POT-Creation-Date: 2020-09-09 13:14+0200\n"
-"PO-Revision-Date: 2020-09-20 09:58+0000\n"
-"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
+"PO-Revision-Date: 2020-10-16 02:26+0000\n"
+"Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
 "debian-edu-documentation/debian-edu-bullseye/nb_NO/>\n"
-"Language: nb\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3983,6 +3983,11 @@ msgid ""
 "if this is the case. To apply the changes, run <computeroutput>cf-agent -D "
 "installation</computeroutput>."
 msgstr ""
+"Etter å ha oppgradert <computeroutput>debian-edu-config</computeroutput>-"
+"pakke, kan det hende endrede Cfengine-oppsettsfiler er tilgjengelige. Kjør "
+"<computeroutput>ls -ltr /etc/cfengine3/debian-edu/</computeroutput> for å "
+"sjekke at dette er tilfelle. For å utføre endringene, kjør <computeroutput"
+">cf-agent -D installation</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-cn.po
=====================================
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "POT-Creation-Date: 2020-09-09 13:14+0200\n"
-"PO-Revision-Date: 2020-10-05 14:27+0000\n"
+"PO-Revision-Date: 2020-10-17 11:27+0000\n"
 "Last-Translator: tao wang <tonywang5 at 163.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "debian-edu-documentation/debian-edu-bullseye/zh_Hans/>\n"
-"Language: zh\n"
+"Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.3.1-dev\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
@@ -740,17 +740,13 @@ msgid "Diskless workstations"
 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 via PXE "
 "without running software installed on a local hard drive."
-msgstr ""
-"无盘工作站在个人计算机上运行所有软件而没有在本地安装操作系统。这意味客户端机"
-"器直接从服务器的硬盘驱动器引导而运行的软件没有安装在本地硬盘驱动器上。"
+msgstr "无盘工作站在个人计算机上运行所有软件而没有在本地安装操作系统。这意味客户端机器直接通过 PXE 引导,而运行的软件没有安装在本地硬盘驱动器上。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "Diskless workstations are an excellent way of using powerful hardware with "
 "the same low maintenance cost as with thin clients. Software is administered "
@@ -758,9 +754,8 @@ msgid ""
 "the clients. Home directories and system settings are stored on the server "
 "too."
 msgstr ""
-"无盘工作站是以与瘦客户端一样的低维护成本再利用较旧(但有能力)的硬件的极佳方"
-"法。在服务器上管理和维护软件而不需要在客户端本地安装软件。主目录和系统设置也"
-"保存在服务器上。"
+"在费与瘦客户端一样低的维护成本来使用强大的硬件方面,无盘工作站是极佳的方法。软件在服务器上管理和维护,而不需要在客户端本地安装软件。主目录和系统设置也保存"
+"在服务器上。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Networked clients"
@@ -1025,29 +1020,26 @@ msgid "Hardware known to work"
 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"
 msgstr ""
-"在 <ulink url=\"https:/wiki.debian.org/DebianEdu/Hardware/\"/> 提供一个硬件测"
-"试列表。这个列表远不完整"
+"测试的硬件的列表提供在 <ulink url=\"https:/wiki.debian.org/DebianEdu/Hardware/\""
+"/>。这个列表远不完整"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid ":)"
 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."
 msgstr ""
-"<ulink url=\"https:/wiki.debian.org/InstallingDebianOn\"/> 是一个写作如何在一"
-"些具体硬件上安装,配置和使用 Debian 文档的一个结果,让可能的购买者知道所支持"
-"的硬件和存在所有者知道如果从硬件中获得最合适的。"
+"<ulink url=\"https:/wiki.debian.org/InstallingDebianOn\"/> 努力将如何在一些特定硬件上安装、"
+"配置和使用 Debian 记入文档,,让可能的购买者知道硬件是否被支持,并且让现有的所有者知道如何让硬件达到最佳性能。"
 
 #. type: Content of: <article><section><title>
 msgid "Requirements for network setup"
@@ -1216,7 +1208,6 @@ msgstr ""
 " #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"https://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1225,13 +1216,11 @@ msgid ""
 "webpages for a list of <ulink url=\"https://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
-"如果你需要嵌入式路由器或访问点的设备我们建议使用 <ulink url=\"http://openwrt."
-"org\">OpenWRT</ulink>,当然你也可以使用原先的固件。使用原先的固件很容易;使"
-"用 OpenWRT 给你更多选择和控制权。检索 OpenWRT 网页的<ulink url=\"http://wiki."
-"openwrt.org/toh/start\">支持的硬件</ulink>列表。"
+"如果需要嵌入式路由器或访问点设备的话,推荐使用 <ulink url=\"http://openwrt.org\""
+">OpenWRT</ulink>,当然也可以使用原先的固件。使用原先的固件更容易;使用 OpenWRT 会给你更多选择和控制权。请查看 OpenWRT "
+"网页来找到<ulink url=\"http://wiki.openwrt.org/toh/start\">支持的硬件</ulink>的列表。"
 
 #. 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 "
@@ -1240,10 +1229,9 @@ msgid ""
 "you stay with the default <link linkend=\"Architecture\">network "
 "architecture</link>."
 msgstr ""
-"能够使用不同的网络设置(是 <ulink url=\"https:/wiki.debian.org/DebianEdu/"
-"HowTo/ChangeIpSubnet\">documented procedure</ulink> 所做),但如果你不以一个"
-"存在的网络基础结构勉强去做,我们建议预防那么做并建议你维持缺省状态的 <link "
-"linkend=\"Architecture\">网络结构</link>。"
+"能够使用不同的网络设置(有个 <ulink url=\"https:/wiki.debian.org/DebianEdu/HowTo/"
+"ChangeIpSubnet\">归档的过程</ulink> 来做这件事),但如果不以现有的网络基础结构勉强去做,那么推荐不要那么做,"
+"并推荐维持缺省状态的 <link linkend=\"Architecture\">网络结构</link>。"
 
 #. type: Content of: <article><section><title>
 msgid "Installation and download options"
@@ -1254,7 +1242,6 @@ msgid "Where to find additional information"
 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="
 "\"https://www.debian.org/releases/bullseye/releasenotes\">release notes for "
@@ -1263,10 +1250,10 @@ msgid ""
 "in its <ulink url=\"https://www.debian.org/releases/bullseye/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"我们建议在开始安装一个用于生产的系统之前阅读或至少要看 <ulink url=\"http://"
-"www.debian.org/releases/bullseye/releasenotes\">Debian Bullseye 发行说明</"
-"ulink>。有更多有关 Debian Bullseye 发行版的信息可以在其<ulink url=\"http://"
-"www.debian.org/releases/bullseye/installmanual\">安装手册</ulink>中获得。"
+"在开始安装一个用于生产的系统之前,推荐阅读,或至少要看看 <ulink url=\"http://www.debian.org/releases/"
+"bullseye/releasenotes\">Debian Bullseye 发行说明</ulink>。有关 Debian Bullseye "
+"发行版的更多信息可以在其<ulink url=\"http://www.debian.org/releases/bullseye/"
+"installmanual\">安装手册</ulink>中获得。"
 
 #. type: Content of: <article><section><section><para>
 msgid "Please give Debian Edu/Skolelinux a try, it should just work."
@@ -1375,14 +1362,13 @@ msgid "Sources"
 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=\"https://get.debian.org/cdimage/"
 "release/current/source/\"/>"
 msgstr ""
-"源代码是从通常位置的 Debian 归档获得,系列媒介链接于 <ulink url=\"http://get."
-"debian.org/cdimage/release/current/source/\"/>"
+"源代码从通常位置的 Debian 档案来获得,系列媒介链接在 <ulink url=\"http://get.debian.org/cdimage/"
+"release/current/source/\"/>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
@@ -1816,13 +1802,12 @@ msgstr ""
 "<computeroutput>desktop=kde</computeroutput>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "To install the <emphasis role=\"strong\">Cinnamon</emphasis> desktop "
 "instead, use <computeroutput>desktop=cinnamon</computeroutput>."
 msgstr ""
-"要改为安装 <emphasis role=\"strong\">LXDE</emphasis> 桌面,使用 "
-"<computeroutput>desktop=lxde</computeroutput>。"
+"要改为安装 <emphasis role=\"strong\">Cinnamon</emphasis> 桌面的话,请使用 "
+"<computeroutput>desktop=cinnamon</computeroutput>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1837,15 +1822,13 @@ msgid "The installation process"
 msgstr "安装过程"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 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 "
 "up an LTSP server."
 msgstr ""
-"如果计划设置一个 LTSP 服务器记着<ulink url=\"https:/wiki.debian.org/"
-"DebianEdu/Documentation/Bullseye/Requirements\">系统需求</ulink>保证至少有两"
-"块网卡(NIC)。"
+"如果计划设置一个 LTSP 服务器的话,请记住<link linkend=\"Requirements\""
+">系统要求</link>确保有至少有两块网卡(NIC)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a language (for the installation and the installed system)."
@@ -1956,7 +1939,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</"
@@ -1968,14 +1950,11 @@ msgid ""
 "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."
 msgstr ""
-"预先选择了<emphasis role=\"strong\">主服务器</emphasis>,<emphasis role="
-"\"strong\">工作站</emphasis>和 <emphasis role=\"strong\">LTSP 服务器</"
-"emphasis>配置。如果想要这些配置能一起安装在一台机器里那就称作<emphasis>组合主"
-"服务器</emphasis>。这意味着这台主服务器会是 LTSP 服务器并且也用作工作站。这是"
-"默认选择,因为我们设想大多数人以后会<link linkend=\"Installation--"
-"Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">通过 "
-"PXE</link> 安装。请注意必须安装了两块网卡的机器作为组合主服务器或者作为 LTSP "
-"服务器被安装之后变为实用。"
+"预先选择<emphasis role=\"strong\">主服务器</emphasis>、<emphasis role=\"strong\">工作站</"
+"emphasis>和<emphasis role=\"strong\">LTSP 服务器</emphasis>配置文件。如果想要安装一台所谓的<empha"
+"sis>组合主服务器</emphasis>上的话,那么把这些配置文件可以一起安装在一台机器上。这意味着这台主服务器会是 LTSP "
+"服务器,并且也用作工作站。这是默认选择,因为我们设想大多数人以后会想要它。请注意,必须将两块网卡安装在以后作为组合主服务器或者作为 LTSP "
+"服务器使用的机器上。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2026,10 +2005,9 @@ msgid ""
 "though a shorter password and also a password matching the username will be "
 "accepted by the installer)."
 msgstr ""
-"用户的密码<emphasis role=\"strong\">必须</emphasis>具有<emphasis role="
-"\"strong\">至少 5 个字符</emphasis>的长度并且和<emphasis role=\"strong\">用户"
-"名</emphasis><emphasis role=\"strong\">必须不相似</emphasis> -- 否则登录不会"
-"被认可(尽管安装器会接受较短的密码还有和用户名相似的密码)。"
+"用户的密码<emphasis role=\"strong\">必须</emphasis>具有<emphasis role=\"strong\">至少 5 "
+"个字符</emphasis>的长度并且和<emphasis role=\"strong\">用户名</emphasis><emphasis role="
+"\"strong\">必须不相似</emphasis> -- 否则登录不会被认可(尽管安装程序会接受较短的密码还有和用户名相似的密码)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
@@ -2148,7 +2126,6 @@ msgid "Installation and booting over the network via PXE"
 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, an iPXE menu with installer "
@@ -2159,34 +2136,29 @@ msgid ""
 "command: <computeroutput>/usr/share/debian-edu-config/tools/pxe-addfirmware "
 "</computeroutput> on the server."
 msgstr ""
-"对于这个安装方法依赖于你要运行主服务器。当客户端通过主网引导时,显示一个有安"
-"装程序和引导选项的新 PXE 菜单。如果有一个错误信息要求 XXX.bin 文件未见而 PXE "
-"安装失败,那最可能的是客户端网卡依赖非自由固件。在这种情况中 Debian 安装程序"
-"的 initrd 必需被修改。这可以在服务器上执行命令: <computeroutput>/usr/share/"
-"debian-edu-config/tools/pxe-addfirmware </computeroutput> 来完成。"
+"对于这个安装方法,需要你运行主服务器。当客户端通过主网引导时,显示一个有安装程序和引导选项的新 iPXE 菜单。如果 PXE 安装失败,错误信息声明 "
+"XXX.bin 文件丢失,那么最可能的是,客户端网卡需要非自由固件。在这种情况下,Debian 安装程序的 initrd "
+"必需被修改。这可以在服务器上执行命令: <computeroutput>/usr/share/debian-edu-config/tools/pxe-"
+"addfirmware </computeroutput> 来完成。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "This is how the iPXE menu looks with the <emphasis role=\"strong\">Main-"
 "Server</emphasis> profile only:"
-msgstr ""
-"这是仅有<emphasis role=\"strong\">主服务器</emphasis> profile PXE 菜单看到的"
-"样子:"
+msgstr "这是只有<emphasis role=\"strong\">主服务器</emphasis> 配置文件的 iPXE 菜单的样子:"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "This is how the iPXE menu looks with the <emphasis role=\"strong\">Main "
 "Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
-"具有<emphasis role=\"strong\">主服务器</emphasis>和 <emphasis role=\"strong"
-"\">LTSP 服务器</emphasis>配置的 PXE 菜单看上去是这样的:"
+"这是具有<emphasis role=\"strong\">主服务器</emphasis>和 <emphasis role=\"strong\""
+">LTSP 服务器</emphasis>配置文件的 iPXE 菜单的样子:"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2197,14 +2169,11 @@ 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 and separate LTSP servers, diskless "
 "workstations don't have to be added to LDAP with GOsa²."
-msgstr ""
-"这个设置也允许无盘工作站和瘦客户端在主网上被引导。不像工作站,无盘工作站没有"
-"用 GOsa² 被添加到 LDAP,但可以,为示例如果你想要强行主机名。"
+msgstr "这个设置也允许无盘工作站和瘦客户端在主网络上引导。不像工作站和独立的 LTSP 服务器,无盘工作站不必添加到具有 GOsa² 的LDAP中。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2240,7 +2209,6 @@ msgid "d-i    pkgsel/include string my-extra-package(s)"
 msgstr "d-i    pkgsel/include string my-extra-package(s)"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "The PXE installation uses <computeroutput>/srv/tftp/debian-edu/install.cfg</"
 "computeroutput> and the preseeding file in <computeroutput>/etc/debian-edu/"
@@ -2252,17 +2220,14 @@ msgid ""
 "computeroutput> and to run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
 "computeroutput> to update the generated files."
 msgstr ""
-"PXE 安装使用 <computeroutput>/var/lib/tftpboot/debian-edu/install.cfg</"
-"computeroutput> 和在 <computeroutput>/etc/debian-edu/www/debian-edu-install."
-"dat</computeroutput> 中的 presseeding 文件。这些文件可以被改变来安排用在安装"
-"时的 presseding,来避免在通过网络安装时更多的提问。另一个方法是在 "
-"<computeroutput>/etc/debian-edu/pxeinstall.conf</computeroutput> 和 "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</"
-"computeroutput> 提供附加设置并运行 <computeroutput>/usr/sbin/debian-edu-"
-"pxeinstall</computeroutput> 来更新已生成的文件。"
+"PXE 安装使用 <computeroutput>/srv/tftp/debian-edu/install.cfg</computeroutput>和在 "
+"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput> "
+"中的预置文件。这些文件可以更改,在安装过程中调整使用的预置,来避免在通过网络安装时更多的问题。另一个实现的方法是在 <computeroutput>/"
+"etc/debian-edu/pxeinstall.conf</computeroutput> 和 <computeroutput>/etc/"
+"debian-edu/www/debian-edu-install.dat.local</computeroutput> 中提供附加的设置,并运行 "
+"<computeroutput>/usr/sbin/debian-edu-pxeinstall</computeroutput> 来更新已生成的文件。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "Further information can be found in the <ulink url=\"https://www.debian.org/"
 "releases/Bullseye/installmanual\">manual of the Debian Installer</ulink>."
@@ -2291,7 +2256,6 @@ msgstr ""
 "webcache:3128\"; </computeroutput>\" 部分。"
 
 #. 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 "
@@ -2299,16 +2263,14 @@ msgid ""
 "cfg</computeroutput>.  Language, keyboard layout and desktop are examples of "
 "such settings."
 msgstr ""
-"由于 preseeding 文件被下载之前已需要一些设置可以不被preseeded。这些被配置的 "
-"PXElinux 基本中的引导主题可从 <computeroutput>/var/lib/tftproot/debian-edu/"
-"install.cfg</computeroutput> 得到。语言,键盘布局和桌面是上述设置的实例。"
+"一些设置不能预置,因为预置文件被下载之前就已需要这些设置了。这些在来自 <computeroutput>/srv/tftp/debian-edu/"
+"install.cfg</computeroutput>的基于 PXElinux 的引导参数中配置。语言,键盘布局和桌面是上述设置的实例。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Custom images"
 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 "
@@ -2316,22 +2278,19 @@ msgid ""
 "<ulink url=\"https://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</"
 "ulink> allows you to define answers to the questions normally asked."
 msgstr ""
-"创建定制 CD,DVD 或蓝光光盘因我们使用 <ulink url=\"https:/wiki.debian.org/"
-"DebianInstaller/\">Debian 安装器</ulink>而相当容易,有模块化设计及其他宜人特"
-"性。<ulink url=\"https:/wiki.debian.org/DebianInstaller/Preseed"
-"\">Preseeding</ulink> 允许你定义回答正常提问的问题。"
+"创建定制的 CD,DVD 或蓝光光盘会因为使用了 <ulink url=\"https:/wiki.debian.org/DebianInstaller/"
+"\">Debian 安装程序</ulink>而相当容易,它有模块化设计及其它很好的特性。<ulink url=\"https:/wiki.debian."
+"org/DebianInstaller/Preseed\">预置</ulink> 对通常提出的问题允许确定答案。"
 
 #. 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>."
 msgstr ""
-"那样你所有需要做的是以你的回答(这个在 Debian 安装程序手册的附录里叙述)和 "
-"<ulink url=\"https:/wiki.debian.org/DebianInstaller/Modify/CD\">remaster the "
-"CD/DVD</ulink> 创建一个 preseeding 文件。"
+"因此所有需要做的是用你的答案(这个在 Debian 安装程序手册的附录里叙述)和 <ulink url=\"https:/wiki.debian.org/"
+"DebianInstaller/Modify/CD\">重新录制 CD/DVD</ulink> 来创建预置文件。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Screenshot tour"
@@ -2349,7 +2308,6 @@ msgstr ""
 "然看着最宜人并且更新颖。除非用图形方式硬件有困难,那没有理由不使用它。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
@@ -2357,9 +2315,8 @@ msgid ""
 "session screen - and login screen after the session on the right has been "
 "clicked)."
 msgstr ""
-"那么这里贯穿了一个 64-bit 主服务器 + 工作站 + LTSP 服务器图形安装过程的屏幕快"
-"照观览以及在主服务器第一次引导所看到的,处于工作站网络和 LTSP 客户机网络上 "
-"PXE 引导是怎样的:"
+"这里是通过一个图形化的 64 位主服务器 + 工作站 + LTSP 服务器安装的截屏过程,以及在主服务器第一次引导时所看到的样子,和 LTSP "
+"客户端网络上引导的 PXE(瘦客户端会话屏幕——在右侧的会话被点击后的登录屏幕)。"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "01-Installer_64bit_boot_menu.png"
@@ -2378,61 +2335,50 @@ msgid "04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "05-Detect_network_hardware.png"
-msgstr "07-Detect_network_hardware.png"
+msgstr "05-Detect_network_hardware.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "06-Choose_Debian_Edu_profile.png"
-msgstr "08-Choose_Debian_Edu_profile.png"
+msgstr "06-Choose_Debian_Edu_profile.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "07-Really_use_the_automatic_partitioning_tool_0.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "07-Really_use_the_automatic_partitioning_tool_0.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "08-Really_use_the_automatic_partitioning_tool_1.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "08-Really_use_the_automatic_partitioning_tool_1.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "09-Participate_in_the_package_usage_survey_0.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
+msgstr "09-Participate_in_the_package_usage_survey_0.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "10-Participate_in_the_package_usage_survey_1.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
+msgstr "10-Participate_in_the_package_usage_survey_1.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "11-Set_up_users_and_passwords_root.png"
-msgstr "12-Set_up_users_and_passwords.png"
+msgstr "11-Set_up_users_and_passwords_root.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "12-Set_up_users_and_passwords_user_full_name.png"
-msgstr "12-Set_up_users_and_passwords.png"
+msgstr "12-Set_up_users_and_passwords_user_full_name.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "13-Set_up_users_and_passwords_username.png"
-msgstr "12-Set_up_users_and_passwords.png"
+msgstr "13-Set_up_users_and_passwords_username.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "14-Set_up_users_and_passwords_user_password.png"
-msgstr "12-Set_up_users_and_passwords.png"
+msgstr "14-Set_up_users_and_passwords_user_password.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "tjener Lightdm Login"
 msgstr "tjener Lightdm 登录"
 
@@ -2445,22 +2391,20 @@ msgid "Xfce Desktop"
 msgstr "Xfce 桌面"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "Thin-Client-Welcome"
-msgstr "瘦客户端服务器"
+msgstr "瘦客户端欢迎页面"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
 msgid "Thin-Client-Login"
-msgstr "瘦客户端"
+msgstr "瘦客户端登录"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
-msgstr "起步"
+msgstr "开始"
 
 #. type: Content of: <article><section><section><title>
 msgid "Minimum steps to get started"
-msgstr "起步的最低步骤"
+msgstr "开始的最少步骤"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -2591,18 +2535,14 @@ msgid "DHCP Administration"
 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)."
 msgstr ""
-"为了访问 GOsa² 你需要 Skolelinux 主服务器和一个有 web 浏览器的(客户端)系"
-"统,而如果是作为称作组合服务器(主服务器 + LTSP 服务器 + 工作站配置)来安装就"
-"可以是主服务器自身。如果上面提到的全都没有,请参阅:<link linkend="
-"\"Administration--Installing_a_graphical_environment_on_the_main-"
-"server_to_use_GOsa.2BALI-\">在主服务器上安装图形环境来使用 GOsa²</link>。"
+"为了访问 GOsa² 需要 Skolelinux 主服务器和安装了 web 浏览器的(客户端)系统,如果是作为所谓的组合服务器(主服务器 + LTSP "
+"服务器 + 工作站配置)来安装的话,可以是主服务器自身。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -2704,7 +2644,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 "
@@ -2717,12 +2656,11 @@ msgid ""
 "\"AdvancedAdministration--Create_Users_in_Year_Groups\">HowTo/"
 "AdvancedAdministration</link> chapter of this manual.)"
 msgstr ""
-"目前默认 Debian Edu 主服务器的安装提供两个“部门”:教师的和学生的,加上 LDAP "
-"树的基本层。学生账户设计成加入“Students”部门,教师加入“Teachers”部门;系统"
-"(服务器,Skolelinux 工作站,Windows 机器,打印机等)目前加入到基本层。寻找自"
-"己定制这一结构的方案。(在本手册的 <link linkend=\"AdvancedAdministration--"
-"User_Customisations_with_GOsa.2BALI-\">HowTo/高级管理</link>一章中,可以找到"
-"如何在有年级组的共同主目录里创建用户的示例。)"
+"默认的 Debian Edu 主服务器的安装目前提供两个“部门”:教师的和学生的,加上 LDAP "
+"树的基本层。学生账户会加入“Students”部门,教师加入“Teachers”部门;系统(服务器,Skolelinux 工作站,Windows "
+"机器,打印机等)目前加入到基本层。寻找自己定制这一结构的方案。(在本手册的 <link linkend=\"AdvancedAdministration"
+"--Create_Users_in_Year_Groups\">HowTo/"
+"高级管理</link>一章中,可以找到如何在具有共同主目录的年级组中创建用户的示例。)"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3398,7 +3336,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 "
@@ -3409,12 +3346,10 @@ msgid ""
 "Connecting_Windows_machines_to_the_network\">HowTo/NetworkClients</link> "
 "chapter of this manual."
 msgstr ""
-"机器配置的另一个重要部分是“Samba 主机”标志(在“主机信息”区域)。如果你计划添"
-"加现有的 Windows 系统到 Skolelinux Samba 域,你需要添加 Windows 主机到 LDAP "
-"树并设置能够连接该 Windows 主机到这一域的标志。有关添加 Windows 主机到 "
-"Skolelinux 网络的更多信息参看本手册的 <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-"\">HowTo/NetworkClients</link> 一章。"
+"机器配置的另一个重要部分是“Samba 主机”标志(在“主机信息”区域)。如果需要将现有的 Windows 系统添加到 Skolelinux Samba "
+"域添中,需要将 Windows 主机添加到 LDAP 树中,并设置这个标志能够将 Windows 主机加入到域中。有关将 Windows 主机添加到 "
+"Skolelinux 网络的更多信息,请参看本手册的 <link linkend=\"NetworkClients--"
+"Connecting_Windows_machines_to_the_network\">HowTo/NetworkClients</link> 一章。"
 
 #. type: Content of: <article><section><title>
 msgid "Printer Management"
@@ -3529,7 +3464,6 @@ msgid "Extending full partitions"
 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 "
@@ -3537,10 +3471,9 @@ msgid ""
 "the \"Resizing Partitions\" HowTo in the <link linkend=\"Administration"
 "\">administration HowTo chapter</link> for more information."
 msgstr ""
-"由于自动分区可能出现的错误,安装后某些分区可能太满了。要扩充这些分区,以 "
-"root 运行 <computeroutput>debian-edu-fsautoresize -n</computeroutput>。参看"
-"<link linkend=\"Administration--Resizing_Partitions\">如何管理章节</link>中如"
-"何“重新分划分区大小”的更多信息。"
+"由于自动分区可能出现的错误,安装后某些分区可能太满了。要扩充这些分区,以 root 身份运行 <computeroutput>debian-edu-"
+"fsautoresize -n</computeroutput>。参看<link linkend=\"Administration--"
+"Resizing_Partitions\">如何管理章节</link>中如何“重新分划分区大小”的更多信息。"
 
 #. type: Content of: <article><section><title>
 msgid "Maintenance"
@@ -3551,14 +3484,12 @@ msgid "Updating the software"
 msgstr "更新软件"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "This section explains how to use <computeroutput>apt full-upgrade</"
 "computeroutput>."
-msgstr "本节介绍如何使用 <computeroutput>apt-get upgrade</computeroutput>。"
+msgstr "本节介绍如何使用 <computeroutput>apt full-upgrade</computeroutput>。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "Using <computeroutput>apt</computeroutput> is really simply. To update a "
 "system you need to execute two commands on the command line as root: "
@@ -3566,10 +3497,9 @@ msgid ""
 "available packages) and <computeroutput>apt full-upgrade</computeroutput> "
 "(which upgrades the packages for which an upgrade is available)."
 msgstr ""
-"使用 <computeroutput>apt-get</computeroutput> 其实很容易。要更新系统需要以 "
-"root 在命令行中执行两个命令:<computeroutput>apt-get update</"
-"computeroutput>(更新可用软件包列表)和 <computeroutput>apt-get upgrade</"
-"computeroutput>(对可以升级的软件包升级)。"
+"使用 <computeroutput>apt</computeroutput> 真的很容易。如果要更新系统,只需要以 root "
+"身份在命令行中执行两个命令:<computeroutput>apt update</computeroutput>(更新可用软件包的列表)和 "
+"<computeroutput>apt full-upgrade</computeroutput>(对可以升级的软件包进行升级)。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3621,7 +3551,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 "
@@ -3629,9 +3558,9 @@ msgid ""
 "to wait for the download when you do <computeroutput>apt full-upgrade</"
 "computeroutput>."
 msgstr ""
-"<computeroutput>cron-apt</computeroutput> 每天通过电子邮件通知你有关可升级的"
-"任何软件包。它不安装这些升级,但下载它们(通常在夜间),那么当你执行 "
-"<computeroutput>apt-get upgrade</computeroutput> 时不必等待下载。"
+"<computeroutput>cron-apt</computeroutput> "
+"每天通过电子邮件通知你有关可升级的任何软件包。它不安装这些升级,但下载它们(通常在夜间),那么当执行 <computeroutput>apt full-"
+"upgrade</computeroutput> 时不必等待下载。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3645,15 +3574,13 @@ msgstr ""
 "<computeroutput>unattended-upgrades</computeroutput> 软件包。"
 
 #. 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>."
 msgstr ""
-"<computeroutput>apt-listchanges</computeroutput> 可以通过电子邮件来发送新的变"
-"更日志记录,抑或选择在终端中运行 <computeroutput>apt</computeroutput> 或者 "
-"<computeroutput>apt-get</computeroutput> 时显示。"
+"<computeroutput>apt-listchanges</computeroutput> 可以通过电子邮件来发送新的变更日志记录,抑或选择运行 "
+"<computeroutput>apt</computeroutput> 时在终端中显示它们。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Keep yourself informed about security updates"
@@ -3921,7 +3848,6 @@ msgid "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
 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 "
@@ -3933,28 +3859,24 @@ msgid ""
 "host in question can be added to the <computeroutput>fsautoresize-hosts</"
 "computeroutput> netgroup."
 msgstr ""
-"该分区(示例中的 /usr/)太满。这一般有两个方法来处理:(1)移除一些文件或者"
-"(2)增加该分区的大小。如果该分区是 /var/,叫 <computeroutput>apt-get clean</"
-"computeroutput> 清理 APT 贮藏可以移除一些文件。如果在 LVM 卷组中有更多空间可"
-"以获得,运行 <computeroutput>debian-edu-fsautoresize</computeroutput> 程序可"
-"以帮助扩展该分区。要在每天自动运行这个程序,可以添加提及的主机到 "
-"<computeroutput>fsautoresize-hosts</computeroutput> 网络组。"
+"该分区(示例中的 /usr/)太满。这一般有两个方法来处理:(1)移除一些文件或者(2)增加该分区的大小。如果该分区是 /var/,那么通过调用 "
+"<computeroutput>apt clean</computeroutput> 来清理 APT 缓存可以移除一些文件。如果在 LVM "
+"卷组中有更多空间可以获得,那么运行 <computeroutput>debian-edu-fsautoresize</computeroutput> "
+"程序可以帮助扩展该分区。要在每天自动运行这个程序,可以将提及的主机添加到 <computeroutput>fsautoresize-hosts</"
+"computeroutput> 网络组。"
 
 #. type: Content of: <article><section><section><section><section><section><title>
 msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 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 upgrade && apt full-upgrade' "
 "as root in a terminal or log in via ssh to do the same."
 msgstr ""
-"可以获得升级的新软件包。必要的一些正常安全修正。要升级,以 root 在终端或者通"
-"过 ssh 登录运行 'apt-get upgrade && apt-get dist-upgrade'。在 LTSP 服"
-"务器,也要记着使用 <computeroutput>ltsp-chroot apt-get update &&ltsp-"
-"chroot apt-get upgrade</computeroutput> 更新 LTSP chroot。"
+"新软件包可用于升级。重要的通常是安全修复。要升级,以 root 身份在终端或者通过 ssh 登录,来运行 'apt upgrade && "
+"apt full-upgrade'。"
 
 #. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
@@ -4113,7 +4035,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=\"https://www.debian.org/releases/stable/"
@@ -4123,7 +4044,6 @@ msgstr ""
 "installmanual\">安装手册</ulink>中有关其当前稳定发布版的信息。"
 
 #. 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 "
@@ -4132,35 +4052,30 @@ msgid ""
 "url=\"https://www.debian.org/security/faq#lifespan\">ceases support for "
 "Oldstable</ulink>, Debian Edu will necessarily do the same."
 msgstr ""
-"保持运行旧的稳定版数周长而等待一段时间也是明智的,那样其他人可以测试升级并提"
-"供他们测验的任何问题的文档。Debian Edu 旧稳定版在接下来的稳定版发布之后会受到"
-"继续支持一段时间,但当 Debian <ulink url=\"http://www.debian.org/security/"
-"faq#lifespan\">终止对旧稳定版的支持</ulink>时,Debian Edu 必然会同样做。"
+"保持运行旧的稳定版数周长而等待一段时间也是明智的,那样其他人可以测试升级,并将他们经历的任何问题归档。Debian Edu "
+"的旧稳定版在接下来的稳定版发布之后会受到继续支持一段时间,但当 Debian <ulink url=\"http://www.debian.org/"
+"security/faq#lifespan\">终止对旧稳定版的支持</ulink>时,Debian Edu 必然会同样做。"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
 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 Buster in a test "
 "environment or have backups ready to be able to go back."
-msgstr ""
-"预备:确实已经在测试环境中测试了从 Stretch 升级或者有准备好的备份能够去恢复。"
+msgstr "预备:确实已经在测试环境中测试了从 Buster 升级,或者有准备好的备份能够去恢复。"
 
 #. 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 Buster to Bullseye upgrade, see: "
 "<ulink url=\"https://www.debian.org/releases/bullseye/releasenotes\"/>)"
 msgstr ""
-"请注意下列方法适用于默认的 Debian Edu 主服务器安装(desktop=xfce,设定主服务"
-"器,工作站,LTSP 服务器)。(对于影响 stretch 到 bullseye 升级的全面概述,参"
-"阅:<ulink url=\"https://www.debian.org/releases/bullseye/releasenotes\"/>)"
+"请注意下列方法适用于默认的 Debian Edu 主服务器安装(desktop=xfce,设定主服务器,工作站,LTSP 服务器)。(对于从 "
+"Buster 到 Bullseye 升级的一般概述,请参阅:<ulink url=\"https://www.debian.org/releases/"
+"bullseye/releasenotes\"/>)"
 
 #. type: Content of: <article><section><section><para>
 msgid "Don't use X, use a virtual console, log in as root."
@@ -4203,16 +4118,15 @@ msgid "apt clean"
 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\">manual chapter</link> for "
 "more information."
 msgstr ""
-"确保有足够的磁盘空间。<emphasis>/usr</emphasis> 和 <emphasis>/var</emphasis> "
-"两者临时会需要大约 5 GiB 的自由空间。更多的信息参阅相关的<link linkend="
-"\"Administration--Resizing_Partitions\">手册章节</link>。"
+"确保有足够的磁盘空间。<emphasis>/usr</emphasis> 和 <emphasis>/var</emphasis> 两者临时会需要大约 5 "
+"GiB 的自由空间。更多的信息参阅相关的<link linkend=\"Administration--Resizing_Partitions\""
+">手册章节</link>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Bullseye:"
@@ -4331,13 +4245,11 @@ msgid ""
 msgstr "像在主服务器上做所有基本的事情而不用做不需要的事情。"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Buster)"
-msgstr "从较旧的 Debian Edu / Skolelinux 安装(Stretch 之前)升级"
+msgstr "从较旧的 Debian Edu / Skolelinux 安装(Buster 之前)升级"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 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 "
@@ -4346,11 +4258,10 @@ msgid ""
 "ulink> about how to upgrade to Buster from the previous release, Stretch. "
 "Likewise the Stretch manual describes how to upgrade from Jessie."
 msgstr ""
-"要从任何旧版本升级,首先需要升级到基于 Stretch 的 Debian Edu 版本,然后才能按"
-"照上述说明进行操作。在 <ulink url=\"https://wiki.debian.org/DebianEdu/"
-"Documentation/Stretch#\">Debian Edu Stretch 手册</ulink>中给出了有关如何从先"
-"前的发布版,Jessie 升级到 Stretch 的说明。同样 Jessie 手册叙述了如何从 "
-"Wheezy 升级。"
+"要从任何旧版本升级,首先需要升级到基于 Buster 的 Debian Edu 版本,然后才能按照上述说明进行操作。在 <ulink url="
+"\"https://wiki.debian.org/DebianEdu/Documentation/Buster#\">Debian Edu "
+"Buster 手册</ulink>中给出了有关如何从先前的发布版,Stretch 升级到 Buster 的说明。同样 Stretch 手册叙述了如何从 "
+"Jessie 升级。"
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -4408,16 +4319,14 @@ msgid ""
 msgstr "配置的历史:使用 git 版本控制系统跟踪 /etc/"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "Using <computeroutput>etckeeper</computeroutput>, all files in "
 "<computeroutput>/etc/</computeroutput> are tracked using <ulink url="
 "\"https://www.git-scm.com/\">Git</ulink> as a version control system."
 msgstr ""
-"在 Debian Edu Squeeze 中引进的 <computeroutput>etckeeper</computeroutput>(以"
-"前版本使用的 <computeroutput>etcinsvk</computeroutput> 已从 Debian 中移除),"
-"使用 <ulink url=\"http://www.git-scm.com/\">git</ulink> 作为版本控制系统跟踪 "
-"<computeroutput>/etc/</computeroutput> 中的所有文件。"
+"使用 <computeroutput>etckeeper</computeroutput>,<computeroutput>/etc/</"
+"computeroutput>中的所有文件使用<ulink url=\"https://www.git-scm.com/\""
+">Git</ulink>作为版本控制系统来跟踪。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4584,15 +4493,13 @@ msgid "Logical Volume Management"
 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="
 "\"https://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo</ulink>."
 msgstr ""
-"逻辑卷管理 (LVM) 能够使被挂载并在使用的分区重分划大小。可以从 <ulink url="
-"\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo</ulink> 中学到更多有关 "
-"LVM。"
+"逻辑卷管理 (LVM) 能够使分区被挂载并在使用时重新分划大小。可以从 <ulink url=\"http://www.tldp.org/HOWTO/"
+"LVM-HOWTO/\">LVM HowTo</ulink> 中学到更多有关 LVM 的信息。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4681,7 +4588,7 @@ msgid ""
 "server and workstation increases with the security level, <emphasis>krb5i</"
 "emphasis> is a good choice and has been chosen as default."
 msgstr ""
-"对于 NFS 使用 Kerberos 来挂载家目录是安全的特性。如 Bullseye,LTSP 客户端没有 Kerberos 就不工作。<emphasis"
+"对于 NFS 使用 Kerberos 来挂载主目录是安全的特性。如 Bullseye,LTSP 客户端没有 Kerberos 就不工作。<emphasis"
 ">krb5</emphasis>、<emphasis>krb5i</emphasis>和<emphasis>krb5p</emphasis>的水平被支持("
 "<emphasis>krb5</emphasis>意味着 Kerberos "
 "身份验证,<emphasis>i</emphasis>代表整体性检测,而<emphasis>p</emphasis> "
@@ -4728,23 +4635,20 @@ msgid "login as root"
 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=krb5i</emphasis> and replace it with <emphasis>sec=krb5</"
 "emphasis> or <emphasis>sec=krb5p</emphasis>."
 msgstr ""
-"运行 <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput>,搜寻 "
-"<emphasis>sec=sys</emphasis> 并替换为 <emphasis>sec=krb5i</emphasis>"
+"运行 <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput>,查找 "
+"<emphasis>sec=krb5i</emphasis> 并将其替换为 <emphasis>sec=krb5</emphasis> 或 "
+"<emphasis>sec=krb5p</emphasis>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "edit <computeroutput>/etc/exports</computeroutput>: adjust these existing "
 "entries for /srv/* accordingly:"
-msgstr ""
-"编辑 <computeroutput>/etc/exports</computeroutput>:去除注释/调整/注释存在"
-"的 /srv/* 项目;确定其看着像这样:"
+msgstr "编辑 <computeroutput>/etc/exports</computeroutput>:由此调整 /srv/* 的这些现有项目:"
 
 #. type: CDATA
 #, no-wrap
@@ -4760,13 +4664,12 @@ msgid "run <computeroutput>exportfs -r</computeroutput>"
 msgstr "运行 <computeroutput>exportfs -r</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "<emphasis role=\"strong\">Workstation</emphasis>, esp. any separate or "
 "additional <emphasis role=\"strong\">LTSP server</emphasis>"
 msgstr ""
-"具有<emphasis role=\"strong\">主服务器</emphasis>和 <emphasis role=\"strong"
-"\">LTSP 服务器</emphasis>配置的 PXE 菜单看上去是这样的:"
+"<emphasis role=\"strong\">工作站</emphasis>,特别是任何分离或另外 <emphasis role=\"strong\""
+">LTSP 服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "login as root."
@@ -4848,15 +4751,13 @@ msgid "Using stable-updates"
 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>."
 msgstr ""
-"自 2011 年 Squeeze 发布以来,Debian 已经在 <ulink url=\"https:/wiki.debian."
-"org/StableUpdates\">stable-updates 套件</ulink>里包含了以前在 volatile."
-"debian.org 中维护的软件包。"
+"自 2011 年 Squeeze 发布以来,Debian 已经在 <ulink url=\"https:/wiki.debian.org/"
+"StableUpdates\">stable-updates 套件</ulink>里包含了以前在 volatile.debian.org 中维护的软件包。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4936,14 +4837,11 @@ msgid "Upgrading with a CD or similar image"
 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 11.1 to 11.2) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
-msgstr ""
-"如果要从一个版本升级到另一个版本(例如从 Bullseye 10.1+edu0 到 10.3+edu1),"
-"但没有互联网连接,仅是物理介质,采用这些步骤:"
+msgstr "如果要从一个版本升级到另一个版本(例如从 Bullseye 11.1 升级到 11.2),但没有互联网连接,仅有物理媒介,那么采用这些步骤:"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5824,13 +5722,10 @@ msgid "Introduction to thin clients and diskless workstations"
 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>."
-msgstr ""
-"<emphasis>LTSP 客户端</emphasis> 是瘦客户机和无盘工作站两者的一个统称。"
-"<ulink url=\"http://ltsp.org\">LTSP 是 Linux 终端服务器项目</ulink>。"
+msgstr "<emphasis>LTSP 客户端</emphasis> 是瘦客户机和无盘工作站两者的一个统称。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5865,7 +5760,6 @@ msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 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 "
@@ -5874,10 +5768,8 @@ msgid ""
 "too. Diskless workstations are an excellent way of reusing older (but "
 "powerful) hardware with the same low maintenance cost as with thin clients."
 msgstr ""
-"无盘工作站在本地运行所有软件。客户端机器直接从 LTSP 服务器启动而没有本地硬"
-"盘。软件是在 LTSP 服务器(LTSP chroot 内部)上管理和维护,但运行在无盘工作站"
-"上。主目录和系统设置也保存在服务器上。无盘工作站如同瘦客户机是低维护成本再利"
-"用旧(但能用)硬件的极佳方法。"
+"无盘工作站在本地运行所有软件。客户端机器直接从 LTSP 服务器启动而没有本地硬盘。软件是在 LTSP 服务器上管理和维护,但运行在无盘工作站上。主目录和"
+"系统设置也保存在服务器上。无盘工作站如同瘦客户机一样,是以低维护成本再利用旧的(但功能强大的)硬件的极佳方法。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5890,7 +5782,6 @@ msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 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 "
@@ -5898,12 +5789,10 @@ msgid ""
 "XXX.bin file then non-free firmware has to be added to the LTSP server's "
 "initrd."
 msgstr ""
-"如果 LTSP 客户端网卡依赖非自由固件则客户端启动将会失败。以网络启动一台机器应"
-"用 PXE 安装;要是 Debian 安装器提示关于未找到 XXX.bin 文件因而由 LTSP 客户端"
-"添加非自由固件来用于初始化内存盘那就可以检查到问题。"
+"如果客户端网卡接口依赖非自由固件,则 LTSP 客户端引导会失败。PXE 安装可以用于对网络启动的机器进行故障检测;如果 Debian "
+"安装程序提示未找到 XXX.bin 文件,那么非自由固件必须添加到 LTSP 服务器的 initrd 中。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid "In this case execute the following commands on the LTSP server."
 msgstr "这个情况在 LTSP 服务器上执行以下命令。"
 
@@ -5936,15 +5825,13 @@ msgid "LTSP client type selection"
 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 subnet (a separate subnet for each LTSP server)."
 msgstr ""
-"每一 LTSP 服务器有两个网卡接口:一个已配置在主 10.0.0.0/8 子网(那是与主服务"
-"器共用的),而另一个构成本地 192.198.0.0/24 子网(每一 LTSP 服务器单独的子"
-"网)。"
+"每一 LTSP 服务器有两个网卡接口:一个已配置在主 10.0.0.0/8 子网(那是与主服务器共用的),而另一个构成本地子网(每一 LTSP "
+"服务器的单独子网)。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6148,9 +6035,8 @@ msgid "LTSP in detail"
 msgstr "LTSP 细节"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
 msgid "LTSP client configuration"
-msgstr "LDAP(和 lts.conf)中的 LTSP 客户机配置"
+msgstr "LTSP 客户端配置"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6945,16 +6831,14 @@ msgid "Contribute globally"
 msgstr "世界贡献"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "Internationally we are organised into various <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Teams/\">teams</ulink> working on different subjects."
 msgstr ""
-"在国际上我们组织成多种<ulink url=\"https:/wiki.debian.org/DebianEdu/Teams/\">"
-"团队</ulink>工作在不同的主题上。"
+"在国际上,我们组成各种<ulink url=\"https:/wiki.debian.org/DebianEdu/Teams/\""
+">团队</ulink>,来从事不同的项目。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "Most of the time, the <ulink url=\"https://lists.debian.org/debian-edu"
 "\">developer mailing list</ulink> is our main medium for communication, "
@@ -6964,11 +6848,11 @@ msgid ""
 "contributors</ulink> should read our <ulink url=\"https://wiki.debian.org/"
 "DebianEdu/ArchivePolicy\"/>."
 msgstr ""
-"大多数时间,<ulink url=\"http://lists.debian.org/debian-edu\">开发者邮件列表"
-"</ulink>是我们交流的主要媒介,虽然我们在 irc.debian.org #debian-edu 有每月的 "
-"IRC 会议而且还有,不经常的,真实聚会,在那里我们彼此亲身相识。<ulink url="
-"\"https:/wiki.debian.org/DebianEdu/NewContributor\">新贡献者</ulink>要阅读我"
-"们的 <ulink url=\"https:/wiki.debian.org/DebianEdu/ArchivePolicy\"/>。"
+"大多数时间,<ulink url=\"http://lists.debian.org/debian-edu\""
+">开发者邮件列表</ulink>是我们交流的主要媒介,虽然我们在 irc.debian.org 的 #debian-edu 上有每月的 IRC "
+"会议,而且还有但并不经常的真实聚会,在那里我们彼此亲身相识。<ulink url=\"https:/wiki.debian.org/DebianEdu/"
+"NewContributor\">新贡献者</ulink>要阅读我们的 <ulink url=\"https:/wiki.debian.org/"
+"DebianEdu/ArchivePolicy\"/>。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6994,7 +6878,6 @@ msgstr ""
 "有许多 FIXME。如果你正好知道(一点儿)需要在这讲解的,请同我们分享你的知识。"
 
 #. 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/"
@@ -7002,10 +6885,9 @@ msgid ""
 "to edit the pages; you need to <ulink url=\"https://wiki.debian.org/"
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
-"文本的来源是一个维基并且可以用简单的 web 浏览器来编辑。仅来到 <ulink url="
-"\"https:/wiki.debian.org/DebianEdu/Documentation/Bullseye/\"/> 就可以很容易地"
-"做贡献。提示:编辑这些页面需要一个用户账号;首先需要<ulink url=\"http://wiki."
-"debian.org/UserPreferences\">创建一个维基用户</ulink>。"
+"文本的来源是一个维基,并且可以用简单的 web 浏览器来编辑。仅前往 <ulink url=\"https:/wiki.debian.org/"
+"DebianEdu/Documentation/Bullseye/\"/> 就可以很容易地做贡献。提示:编辑这些页面需要一个用户账号;"
+"首先需要<ulink url=\"http://wiki.debian.org/UserPreferences\">创建一个维基用户</ulink>。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7075,12 +6957,10 @@ msgid "in German"
 msgstr "德语方面"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "<ulink url=\"https://lists.debian.org/debian-edu-german\"/> - support "
 "mailing list"
-msgstr ""
-"<ulink url=\"http://lists.debian.org/debian-edu-german\"/> - 支持邮件列表"
+msgstr "<ulink url=\"http://lists.debian.org/debian-edu-german\"/> - 支持邮件列表"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7107,13 +6987,12 @@ msgid "Professional support"
 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\"/>."
 msgstr ""
-"从 <ulink url=\"https:/wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/> 可"
-"得到提供专业支持的公司列表。"
+"从 <ulink url=\"https:/wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/> "
+"可得到提供专业支持的公司列表。"
 
 #. type: Content of: <article><section><title>
 msgid "New features in Debian Edu Bullseye"
@@ -7128,14 +7007,13 @@ msgid "Installation changes"
 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="
 "\"https://www.debian.org/releases/bullseye/installmanual\">installation "
 "manual</ulink> for more details."
 msgstr ""
-"出自 Debian Bullseye 的新版 debian-installer,更多细节参阅其 <ulink url="
-"\"http://www.debian.org/releases/bullseye/installmanual\">安装手册</ulink>。"
+"出自 Debian Bullseye 的新版 debian-installer,更多细节参阅其 <ulink url=\"http://www."
+"debian.org/releases/bullseye/installmanual\">安装手册</ulink>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "The debian-installer doesn't support LTSP chroot setup anymore."
@@ -7146,9 +7024,8 @@ msgid "Software updates"
 msgstr "软件更新"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid "Everything which is new in Debian 11 Bullseye, eg:"
-msgstr "获得新的 Debian Edu Bullseye 插图:"
+msgstr "Debian 11 Bullseye 中新的内容的插图,例如:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Linux kernel 5.4"
@@ -7191,16 +7068,15 @@ msgid ""
 msgstr "Debian Bullseye 包含超过 57000 种软件包用于安装。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "More information about Debian 11 Bullseye is provided in the <ulink url="
 "\"https://www.debian.org/releases/bullseye/releasenotes\">release notes</"
 "ulink> and the <ulink url=\"https://www.debian.org/releases/bullseye/"
 "installmanual\">installation manual</ulink>."
 msgstr ""
-"更多有关 Debian 10 Bullseye 的信息在 <ulink url=\"http://www.debian.org/"
-"releases/bullseye/releasenotes\">发行说明</ulink>和<ulink url=\"http://www."
-"debian.org/releases/bullseye/installmanual\">安装手册</ulink>里提供。"
+"更多有关 Debian 11 Bullseye 的信息在 <ulink url=\"http://www.debian.org/releases/"
+"bullseye/releasenotes\">发行说明</ulink>和<ulink url=\"http://www.debian.org/"
+"releases/bullseye/installmanual\">安装手册</ulink>里提供。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Documentation and translation updates"
@@ -7534,9 +7410,8 @@ msgid "Appendix C - Features in older releases"
 msgstr "附件 C——旧发布版本中的特点"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
 msgid "New features for Debian Edu 10+edu0 Codename Buster released 2019-07-06"
-msgstr "2016 年 7 月 2 日发行的 Debian Edu 8+edu0 代号 Jessie 的新面貌"
+msgstr "2019 年 07 月 06 日发行的 Debian Edu 10+edu0 代号 Buster 的新特性"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7548,14 +7423,13 @@ msgstr ""
 "像,因此这些是官方的 Debian 映像。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "New version of debian-installer from Debian Buster, see its <ulink url="
 "\"http://www.debian.org/releases/buster/installmanual\">installation manual</"
 "ulink> for more details."
 msgstr ""
-"出自 Debian Bullseye 的新版 debian-installer,更多细节参阅其 <ulink url="
-"\"http://www.debian.org/releases/bullseye/installmanual\">安装手册</ulink>。"
+"出自 Debian Buster 的新版 debian-installer,更多细节参阅其 <ulink url=\"http://www.debian."
+"org/releases/buster/installmanual\">安装手册</ulink>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7625,16 +7499,15 @@ msgid ""
 msgstr "Debian Buster 包括超过 57000 个软件包用于安装。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "More information about Debian 10 Buster is provided in the <ulink url="
 "\"http://www.debian.org/releases/buster/releasenotes\">release notes</ulink> "
 "and the <ulink url=\"http://www.debian.org/releases/buster/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"更多有关 Debian 10 Bullseye 的信息在 <ulink url=\"http://www.debian.org/"
-"releases/bullseye/releasenotes\">发行说明</ulink>和<ulink url=\"http://www."
-"debian.org/releases/bullseye/installmanual\">安装手册</ulink>里提供。"
+"更多有关 Debian 10 Buster 的信息在 <ulink url=\"http://www.debian.org/releases/"
+"buster/releasenotes\">发行说明</ulink>和<ulink url=\"http://www.debian.org/"
+"releases/buster/installmanual\">安装手册</ulink>里提供。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7691,14 +7564,14 @@ msgstr ""
 ">安装</ulink>章节。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "Site specific multi-language support. See the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Buster/HowTo/Desktop#Set_up_a_multi-"
 "language_desktop_environment\">Desktop</ulink> chapter for more information."
 msgstr ""
-"设置具体多语言支持。更多信息参阅<link linkend=\"Desktop--Set_up_a_multi-"
-"language_desktop_environment\">桌面</link>章节。"
+"每个网站的多语言支持。更多信息参阅<ulink url=\"https://wiki.debian.org/DebianEdu/"
+"Documentation/Buster/HowTo/Desktop#Set_up_a_multi-"
+"language_desktop_environment\">桌面</ulink>章节。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "LXQt 0.14 is offered as a new choice for the desktop environment."
@@ -7748,7 +7621,7 @@ msgid ""
 "and Konqueror can now use HTTPS without the need to allow insecure "
 "connections."
 msgstr ""
-"内部网络内改进的 TLS/SSL 支持。RootCA 证书用于签署服务器证书,并且配置用户家目录在账户创建时接受;除了 Firefox ESR,现在 "
+"内部网络内改进的 TLS/SSL 支持。RootCA 证书用于签署服务器证书,并且配置用户主目录在账户创建时接受;除了 Firefox ESR,现在 "
 "Chromium 和 Konqueror 也使用 HTTPS 而不需要允许不安全的链接。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7767,7 +7640,7 @@ msgid ""
 "HowTo/Administration#Kerberized_NFS\">Administration</ulink> chapter for "
 "more information."
 msgstr ""
-"Kerberized NFS。现在能够使用更安全的家目录访问,更多信息请参见<ulink url=\"https://wiki.debian.org/"
+"Kerberized NFS。现在能够使用更安全的主目录访问,更多信息请参见<ulink url=\"https://wiki.debian.org/"
 "DebianEdu/Documentation/Buster/HowTo/Administration#Kerberized_NFS\""
 ">管理</ulink>章节。"
 
@@ -8016,14 +7889,12 @@ msgid "The following Debian Edu releases were made further in the past:"
 msgstr "以下是从前所做的更多 Debian Edu 发行版:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid "Debian Edu 8+edu0 Codename Jessie released 2016-07-02."
-msgstr "2016 年 7 月 2 日发行的 Debian Edu 8+edu0 代号 Jessie 的新面貌"
+msgstr "2016 年 07 月 02 日发行的 Debian Edu 8+edu0 代号 Jessie。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid "Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28."
-msgstr "Debian Edu 5.0.4+edu0 代号 \"Lenny\",发布于 2010-02-08。"
+msgstr "发布于 2013 年 09 月 28 日的 Debian Edu 7.1+edu0 代号 Wheezy。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Debian Edu 6.0.7+r1 Codename \"Squeeze\", released 2013-03-03."


=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.nb-no.po
=====================================
@@ -22,11 +22,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "POT-Creation-Date: 2020-08-24 15:54+0000\n"
-"PO-Revision-Date: 2020-09-20 09:58+0000\n"
-"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
+"PO-Revision-Date: 2020-10-16 02:26+0000\n"
+"Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
 "debian-edu-documentation/debian-edu-buster/nb_NO/>\n"
-"Language: nb\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4081,6 +4081,11 @@ msgid ""
 "if this is the case. To apply the changes, run <computeroutput>cf-agent -D "
 "installation</computeroutput>."
 msgstr ""
+"Etter å ha oppgradert <computeroutput>debian-edu-config</computeroutput>-"
+"pakke, kan det hende endrede Cfengine-oppsettsfiler er tilgjengelige. Kjør "
+"<computeroutput>ls -ltr /etc/cfengine3/debian-edu/</computeroutput> for å "
+"sjekke at dette er tilfelle. For å utføre endringene, kjør <computeroutput"
+">cf-agent -D installation</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""


=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.zh-cn.po
=====================================
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "POT-Creation-Date: 2020-08-24 15:54+0000\n"
-"PO-Revision-Date: 2020-10-05 14:27+0000\n"
+"PO-Revision-Date: 2020-10-17 11:27+0000\n"
 "Last-Translator: tao wang <tonywang5 at 163.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n"
-"Language: zh\n"
+"Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.3.1-dev\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
@@ -2087,10 +2087,9 @@ msgid ""
 "though a shorter password and also a password matching the username will be "
 "accepted by the installer)."
 msgstr ""
-"用户的密码<emphasis role=\"strong\">必须</emphasis>具有<emphasis role="
-"\"strong\">至少 5 个字符</emphasis>的长度并且和<emphasis role=\"strong\">用户"
-"名</emphasis><emphasis role=\"strong\">必须不相似</emphasis> -- 否则登录不会"
-"被认可(尽管安装器会接受较短的密码还有和用户名相似的密码)。"
+"用户的密码<emphasis role=\"strong\">必须</emphasis>具有<emphasis role=\"strong\">至少 5 "
+"个字符</emphasis>的长度并且和<emphasis role=\"strong\">用户名</emphasis><emphasis role="
+"\"strong\">必须不相似</emphasis> -- 否则登录不会被认可(尽管安装程序会接受较短的密码还有和用户名相似的密码)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
@@ -2401,10 +2400,9 @@ msgid ""
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"创建定制 CD,DVD 或蓝光光盘因我们使用 <ulink url=\"http://wiki.debian.org/"
-"DebianInstaller/\">Debian 安装器</ulink>而相当容易,有模块化设计及其他宜人特"
-"性。<ulink url=\"http://wiki.debian.org/DebianInstaller/Preseed"
-"\">Preseeding</ulink> 允许你定义回答正常提问的问题。"
+"创建定制 CD,DVD 或蓝光光盘因我们使用 <ulink url=\"http://wiki.debian.org/DebianInstaller/\""
+">Debian 安装程序</ulink>而相当容易,有模块化设计及其他宜人特性。<ulink url=\"http://wiki.debian.org/"
+"DebianInstaller/Preseed\">Preseeding</ulink> 允许你定义回答正常提问的问题。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2561,11 +2559,11 @@ msgstr "无盘工作站登录"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
-msgstr "起步"
+msgstr "开始"
 
 #. type: Content of: <article><section><section><title>
 msgid "Minimum steps to get started"
-msgstr "起步的最低步骤"
+msgstr "开始的最少步骤"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -2810,7 +2808,7 @@ msgstr ""
 "树的基本层。学生账户设计成加入“Students”部门,教师加入“Teachers”部门;系统(服务器,Skolelinux 工作站,Windows "
 "机器,打印机等)目前加入到基本层。寻找自己定制这一结构的方案。(在本手册的<link linkend=\"AdvancedAdministration--"
 "User_Customisations_with_GOsa.2BALI-\">HowTo/"
-"AdvancedAdministration</link>章节中,可以找到如何在每个组都带有共同家目录的年级组创建用户的例子。)"
+"AdvancedAdministration</link>章节中,可以找到如何在每个组都带有共同主目录的年级组创建用户的例子。)"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6391,9 +6389,8 @@ msgid ""
 "XXX.bin file then non-free firmware has to be added to the initrd used by "
 "LTSP clients."
 msgstr ""
-"如果 LTSP 客户端网卡依赖非自由固件则客户端启动将会失败。以网络启动一台机器应"
-"用 PXE 安装;要是 Debian 安装器提示关于未找到 XXX.bin 文件因而由 LTSP 客户端"
-"添加非自由固件来用于初始化内存盘那就可以检查到问题。"
+"如果 LTSP 客户端网卡依赖非自由固件则客户端启动将会失败。以网络启动一台机器应用 PXE 安装;要是 Debian 安装程序提示关于未找到 "
+"XXX.bin 文件因而由 LTSP 客户端添加非自由固件来用于初始化内存盘那就可以检查到问题。"
 
 #. type: Content of: <article><section><section><para>
 msgid "In this case execute the following commands on an LTSP server."
@@ -8589,7 +8586,7 @@ msgid ""
 "and Konqueror can now use HTTPS without the need to allow insecure "
 "connections."
 msgstr ""
-"内部网络内改进的 TLS/SSL 支持。RootCA 证书用于签署服务器证书,并且配置用户家目录在账户创建时接受;除了 Firefox ESR,现在 "
+"内部网络内改进的 TLS/SSL 支持。RootCA 证书用于签署服务器证书,并且配置用户主目录在账户创建时接受;除了 Firefox ESR,现在 "
 "Chromium 和 Konqueror 也使用 HTTPS 而不需要允许不安全的链接。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8607,7 +8604,7 @@ msgid ""
 "see the <link linkend=\"Administration--Kerberized_NFS\">Administration</"
 "link> chapter for more information."
 msgstr ""
-"Kerberized NFS。现在能够使用更安全的家目录访问。更多信息请参见<link linkend=\"Administration--"
+"Kerberized NFS。现在能够使用更安全的主目录访问。更多信息请参见<link linkend=\"Administration--"
 "Kerberized_NFS\">管理</link>章节。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/df33669afe57b1899d97ef0691de0775201af693...3fc3a3a16e3a260c10cb1a834271bb339fbfe445

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/df33669afe57b1899d97ef0691de0775201af693...3fc3a3a16e3a260c10cb1a834271bb339fbfe445
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/20201020/654b21b8/attachment-0001.html>


More information about the debian-edu-commits mailing list