[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: Translation update for Buster manual: Chinese (Simplified): Ma Yong

Holger Levsen gitlab at salsa.debian.org
Mon Sep 30 10:35:16 BST 2019



Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc


Commits:
9425c40a by Holger Levsen at 2019-09-30T09:31:29Z
Translation update for Buster manual: Chinese (Simplified): Ma Yong

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
b48e08c5 by Holger Levsen at 2019-09-30T09:34:47Z
Bump standards version to 4.4.1, no changes needed.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- debian/changelog
- debian/control
- documentation/debian-edu-buster/debian-edu-buster-manual.zh.po


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+debian-edu-doc (2.10.20) UNRELEASED; urgency=medium
+
+  [ Translation updates ]
+  * Buster manual:
+    - Chinese (Simplified): Ma Yong
+
+  [ Holger Levsen ]
+  * Bump standards version to 4.4.1, no changes needed.
+
+ -- Holger Levsen <holger at debian.org>  Mon, 30 Sep 2019 10:29:23 +0100
+
 debian-edu-doc (2.10.19) unstable; urgency=medium
 
   * Update Debian Edu Buster manual from the wiki.


=====================================
debian/control
=====================================
@@ -26,7 +26,7 @@ Build-Depends-Indep: dblatex,
                      unzip
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Holger Levsen <holger at debian.org>,
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Rules-Requires-Root: no
 Homepage: https://wiki.debian.org/DebianEdu/Documentation/Buster
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu-doc.git


=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
=====================================
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "POT-Creation-Date: 2019-08-14 12:25+0000\n"
-"PO-Revision-Date: 2019-08-26 10:02+0800\n"
+"PO-Revision-Date: 2019-09-30 15:49+0800\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n"
@@ -150,7 +150,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid "Today the system is in use in several countries around the world."
-msgstr ""
+msgstr "现在世界上的几个地区在使用这个系统。"
 
 #. type: Content of: <article><section><title>
 msgid "Architecture"
@@ -2112,7 +2112,6 @@ msgstr ""
 "Edu 非常重要的帐号:你要使用这个帐号管理 Skolelinux 网络。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 #| msgid ""
 #| "The password for this user <emphasis role=\"strong\">must</emphasis> have "
 #| "a length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
@@ -2126,9 +2125,10 @@ 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\">至少 5 个字符</emphasis>的长度并且和<emphasis role=\"strong\">用户"
+"名</emphasis><emphasis role=\"strong\">必须不相似</emphasis> -- 否则登录不会"
+"被认可(尽管安装器会接受较短的密码还有和用户名相似的密码)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
@@ -3853,9 +3853,11 @@ msgid ""
 "which in cases of problems is more likely to produce results in search "
 "engines."
 msgstr ""
+"升级使用 C locale 来获得英语输出也是个好主意那若出现难题更可能在搜索引擎中产"
+"生答案。"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "LC_ALL=C apt-get update ; LC_ALL=C ltsp-chroot apt-get update\n"
 "LC_ALL=C apt-get upgrade -y\n"
@@ -3865,10 +3867,13 @@ msgid ""
 "ltsp-update-kernels # If a new kernel was installed\n"
 "ltsp-update-image"
 msgstr ""
-"LC_ALL=C apt-get update ; LC_ALL=C TMP= TMPDIR= ltsp-chroot apt-get update\n"
+"LC_ALL=C apt-get update ; LC_ALL=C ltsp-chroot apt-get update\n"
 "LC_ALL=C apt-get upgrade -y\n"
-"LC_ALL=C TMP= TMPDIR= ltsp-chroot -p apt-get upgrade -y\n"
-"ltsp-update-kernels # If a new kernel was installed"
+"LC_ALL=C ltsp-chroot -m apt-get upgrade -y\n"
+"cf-agent -D installation # On upgrades of debian-edu-config\n"
+"ltsp-chroot -m cf-agent -D installation  # On upgrades of debian-edu-config\n"
+"ltsp-update-kernels # If a new kernel was installed\n"
+"ltsp-update-image"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3920,29 +3925,27 @@ msgstr ""
 "<computeroutput>apt-get upgrade</computeroutput> 时不必等待下载。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
 "installed and configured as described on <ulink url=\"https://wiki.debian."
 "org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
-"如果希望更新可以容易地自动安装,仅需要以 <ulink url=\"https://wiki.debian."
-"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink> 中的讲述"
-"来配置 <computeroutput>unattended-upgrades</computeroutput> 软件包。在新的安"
-"全更新安装中默认启用。"
+"如果希望能容易地做到更新的自动安装,这就需要安装并按照 <ulink url=\"https://"
+"wiki.debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
+"ulink> 中叙述的方式配置 <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> or <computeroutput>apt-get</"
 "computeroutput>."
 msgstr ""
-"<computeroutput>apt-listchanges</computeroutput> 可以通过电子邮件给你发送新变"
-"更日志记录,或者当在终端中运行 <computeroutput>aptitude</computeroutput> 或 "
-"<computeroutput>apt-get</computeroutput> 时显示它们。"
+"<computeroutput>apt-listchanges</computeroutput> 可以通过电子邮件来发送新的变"
+"更日志记录,抑或选择在终端中运行 <computeroutput>apt</computeroutput> 或者 "
+"<computeroutput>apt-get</computeroutput> 时显示。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Keep yourself informed about security updates"
@@ -3970,23 +3973,23 @@ msgid "Backup Management"
 msgstr "备份管理"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "since you have to enter the root password there. If you try to access this "
 "site without using SSL it will fail."
 msgstr ""
-"在浏览器指向 <ulink url=\"https://www/slbackup-php\"/> 是备份管理。请注意那需"
-"要通过 SSL 访问该站点,因为你需要在那里输入 root 密码。如果你尝试不使用 SSL "
-"来访问这个站点将会失败。注意:如果你临时允许 root 在备份服务器(默认是主服务"
-"器 'tjener')上登录该站点将只工作。"
+"为了备份管理指示浏览器到 <ulink url=\"https://www/slbackup-php\"/>。请注意需"
+"要通过 SSL 访问这个站点,因为要在那里输入 root 密码。如果尝试不用 SSL 来访问"
+"该站点将会失败。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Note: the site will only work if you temporarily allow ssh root login on the "
 "backup server (main server 'tjener' by default)."
 msgstr ""
+"注意:如果暂时允许 ssh root 登录备份服务器(默认为主服务器‘tjener’)该站点只"
+"会工作。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4058,7 +4061,6 @@ msgstr ""
 "如果要清除较旧的备份,在备份页面的菜单中选择“维护”并选择要保留的最早的快照:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
@@ -4373,13 +4375,12 @@ msgstr ""
 "围。</emphasis>"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
 msgid ""
 "Please read this chapter and the <link linkend=\"Features\">New features in "
 "Buster</link> chapter of this manual completely before attempting to upgrade."
 msgstr ""
-"在试图升级之前请完整阅读本手册的这一章和 <link linkend=\"Features\">Stretch "
-"的新特性</link>一章。"
+"请在试图升级前完整阅读本手册的这一章和 <link linkend=\"Features\">Buster 的新"
+"面貌</link> 一章。"
 
 #. type: Content of: <article><section><section><title>
 msgid "General notes on upgrading"
@@ -4417,6 +4418,8 @@ msgid ""
 "way as your production machines. There you can test the upgrade without risk "
 "and see if everything works as it should."
 msgstr ""
+"如果希望保证升级之后一切和之前一样工作,应该在和生产机器系统配置方法相同的测"
+"试系统上测试升级。在那里可以没有风险地测试升级并检查是否所有工作如其所愿。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4446,12 +4449,11 @@ msgid "Upgrades from Debian Edu Stretch"
 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."
 msgstr ""
-"准备:确保已在测试环境中测试了从 Jessie 升级或者准备好了可以恢复的备份。"
+"预备:确实已经在测试环境中测试了从 Stretch 升级或者有准备好的备份能够去恢复。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4497,9 +4499,9 @@ msgid "Cleanup the package cache:"
 msgstr "清理软件包仓库:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "apt clean"
-msgstr "apt-get clean"
+msgstr "apt clean"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -4508,11 +4510,13 @@ msgid ""
 "See the related <link linkend=\"Administration--Resizing_Partitions\">manual "
 "chapter</link> for more information."
 msgstr ""
+"确保有足够的磁盘空间。<emphasis>/usr</emphasis> 和 <emphasis>/var</emphasis> "
+"两者临时会需要大约 5 GiB 的自由空间。更多的信息参阅相关的<link linkend="
+"\"Administration--Resizing_Partitions\">手册章节</link>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid "Prepare and start the upgrade to Buster:"
-msgstr "准备并开始升级到 Stretch:"
+msgstr "准备并开始升级到 Buster:"
 
 #. type: CDATA
 #, no-wrap
@@ -4527,15 +4531,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press <"
 "return> to scroll down, <q> to leave the pager. All information "
 "will be mailed to root so that you can read it again (using <emphasis>mailx</"
 "emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
-"apt-list-changes:准备好阅读大量的消息;按 < 返回 > 向下滚动,<"
-"q> 离开这一页面。"
+"apt-list-changes:准备好阅读大量的消息;按 <return> 向下滚动,<"
+"q> 离开这一页面。所有消息会被邮递给 root 而可以再次阅读(使用 "
+"<emphasis>mailx</emphasis> 或者 <emphasis>mutt</emphasis>)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -4546,11 +4550,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "restart services: Choose yes."
-msgstr ""
+msgstr "restart services:选择 yes。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "ntp: Choose N."
-msgstr ""
+msgstr "ntp:选择 N。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "smb"
@@ -4569,14 +4573,13 @@ msgid "Apply and adjust configuration:"
 msgstr "应用和调整配置:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "cf-agent -I -D installation"
-msgstr "安装之后:"
+msgstr "cf-agent -I -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid "Get the new Debian Edu Buster artwork:"
-msgstr "获得新的 Debian Edu Stretch 插图:"
+msgstr "获得新的 Debian Edu Buster 插图:"
 
 #. type: CDATA
 #, no-wrap
@@ -4585,7 +4588,7 @@ msgstr "apt install debian-edu-artwork-buster"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Enable PHP 7.3 support:"
-msgstr ""
+msgstr "启用 PHP 7.3 支持:"
 
 #. type: CDATA
 #, no-wrap
@@ -4598,11 +4601,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Adjust GOsa² access (changed encryption method):"
-msgstr ""
+msgstr "整理 GOsa² 访问(改变加密方法):"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "backup /etc/gosa/gosa.conf.orig"
-msgstr ""
+msgstr "备份 /etc/gosa/gosa.conf.orig"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -4611,20 +4614,21 @@ msgid ""
 "<emphasis>adminPassword</emphasis> and <emphasis>snapshotAdminPassword</"
 "emphasis>)"
 msgstr ""
+"用来自 /etc/gosa/gosa.conf.orig 的短(随机)密码代替 /etc/gosa/gosa.conf 里的"
+"长(哈希)密码(对于 <emphasis>adminPassword</emphasis> 和 "
+"<emphasis>snapshotAdminPassword</emphasis> 两者)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "remove /etc/gosa/gosa.secrets"
-msgstr ""
+msgstr "移除 /etc/gosa/gosa.secrets"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
 msgid "run <computeroutput>gosa-encrypt-passwords</computeroutput>"
-msgstr "默认安装提供<computeroutput>网络组</computeroutput>"
+msgstr "运行 <computeroutput>gosa-encrypt-passwords</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
 msgid "run <computeroutput>service apache2 reload</computeroutput>"
-msgstr "默认安装提供<computeroutput>网络组</computeroutput>"
+msgstr "运行 <computeroutput>service apache2 reload</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "After reboot, do some more cleanup:"
@@ -4678,31 +4682,31 @@ msgstr "升级工作站"
 msgid ""
 "Do all the basic things like on the main-server and without doing the things "
 "not needed."
-msgstr ""
+msgstr "像在主服务器上做所有基本的事情而不用做不需要的事情。"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
 msgid "Upgrading LTSP chroots"
-msgstr "重建 LTSP chroot"
+msgstr "升级 LTSP chroot"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "Make sure you have enough disk space. LTSP uses Network Block Device (NBD). "
 "The NBD image file size is about 4 GiB (default installation). If the image "
 "is updated, another 4 GiB for a temporary file are needed."
 msgstr ""
-"确保有充足的磁盘空间。LTSP 现在使用网络块设备(NBD)。NBD 镜像文件大小大约是 "
-"4 GiB(默认安装)。如果更新该镜像,需要为临时文件再多一个 4 GiB。"
+"确保有充足的磁盘空间。LTSP 使用网络块设备(NBD)。NBD 镜像文件大小大约是 4 "
+"GiB(默认安装)。如果更新该镜像,需要为临时文件再多加 4 GiB。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Also please note that the default LTSP architecture was i386 for Stretch. "
 "See below how to create a chroot for 64-bit-PCs (amd64)."
 msgstr ""
+"也请注意 Stretch 的默认 LTSP 架构是 i386。看下面如何创建 64 位 PC(amd64)的 "
+"chroot。"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "ltsp-chroot -m -a i386 apt update\n"
 "ltsp-chroot -m -a i386 apt -y full-upgrade\n"
@@ -4714,7 +4718,7 @@ msgid ""
 msgstr ""
 "ltsp-chroot -m -a i386 apt update\n"
 "ltsp-chroot -m -a i386 apt -y full-upgrade\n"
-"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"sed -i 's/stretch/buster/g' /opt/ltsp/i386/etc/apt/sources.list\n"
 "ltsp-chroot -m -a i386 apt update\n"
 "ltsp-chroot -m -a i386 apt -y full-upgrade\n"
 "ltsp-chroot -m -a i386 apt -f install\n"
@@ -4755,12 +4759,10 @@ msgstr ""
 "computeroutput>。"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
 msgid "Recreating an LTSP chroot"
 msgstr "重建 LTSP chroot"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "On the LTSP server(s) the LTSP chroot could also be recreated. The new "
 "chroot will still support both thin-clients and diskless workstations. "
@@ -4768,7 +4770,8 @@ msgid ""
 "the server side."
 msgstr ""
 "在 LTSP 服务器上还可以重新创建 LTSP chroot。新的 chroot 仍将支持瘦客户端和无"
-"盘工作站二者。"
+"盘工作站两者。请注意:从 Buster 开始,LTSP chroot 架构默认适应服务器侧的架"
+"构。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4787,26 +4790,30 @@ msgid ""
 "information about options. The file <emphasis>/etc/ltsp/ltsp-build-client."
 "conf</emphasis> contains some useful (commented) options."
 msgstr ""
+"有关选项的更多信息参看 <computeroutput>ltsp-build-client --help</"
+"computeroutput> 和 <computeroutput>ltsp-build-client --extra-help</"
+"computeroutput>。<emphasis>/etc/ltsp/ltsp-build-client.conf</emphasis> 文件包"
+"含一些有用的(解释)选项。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "Recreate the chroot by running <computeroutput>ltsp-build-client</"
 "computeroutput> as root."
 msgstr ""
-"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
+"作为 root 来运行 <computeroutput>ltsp-build-client</computeroutput> 重建 "
+"chroot。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Add additional LTSP chroot to support 64-bit-PC clients"
-msgstr ""
+msgstr "添加另外的 LTSP chroot 来支持 64 位 PC 客户机"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "At least 20 GiB additional disk space on /opt is required."
-msgstr ""
+msgstr "/opt 需要至少 20 GiB 另外的磁盘空间。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
-msgstr ""
+msgstr "运行 “ltsp-build-client --arch amd64” 来创建 chroot 和 NBD 映像。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -4814,31 +4821,31 @@ msgid ""
 "computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
 "in LDAP for one dedicated network)."
 msgstr ""
+"使用 “ldapvi -ZD '(cn=admin)'” 替换 <computeroutput>i386</computeroutput> 为 "
+"<computeroutput>amd64</computeroutput>(在专用网络 LDAP 中 dhcp 说明)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Run \"service isc-dhcp-server restart\"."
-msgstr ""
+msgstr "运行 “service isc-dhcp-server restart”。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
-msgstr ""
+msgstr "编辑 /etc/debian-edu/pxeinstall.conf(设置 ltsparch=amd64)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
-msgstr ""
+msgstr "运行 ‘debian-edu-pxeinstall’ 来重新生成 PXE 菜单。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Run 'service nbd-service restart' to serve the new NBD file."
-msgstr ""
+msgstr "运行 ‘service nbd-service restart’ 来应用新的 NBD 文件。"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Stretch)"
-msgstr "从较旧的 Debian Edu / Skolelinux 安装(Jessie 之前)升级"
+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 "
@@ -4847,11 +4854,11 @@ msgid ""
 "ulink> about how to upgrade to Stretch from the previous release, Jessie. "
 "Likewise the Jessie manual describes how to upgrade from Wheezy."
 msgstr ""
-"要从任何旧版本升级,需要首先升级到基于 Jessie 的 Debian Edu 版本,然后才能按"
+"要从任何旧版本升级,首先需要升级到基于 Stretch 的 Debian Edu 版本,然后才能按"
 "照上述说明进行操作。在 <ulink url=\"https://wiki.debian.org/DebianEdu/"
-"Documentation/Jessie#\">Debian Edu Jessie 手册</ulink>中给出了有关如何从先前"
-"的发布版,Wheezy 升级到 Jessie 的说明。同样 Wheezy 手册叙述了如何从 Squeeze "
-"升级。"
+"Documentation/Stretch#\">Debian Edu Stretch 手册</ulink>中给出了有关如何从先"
+"前的发布版,Jessie 升级到 Stretch 的说明。同样 Jessie 手册叙述了如何从 "
+"Wheezy 升级。"
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -5233,16 +5240,15 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "How to enable it"
-msgstr ""
+msgstr "如何使用"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid "<emphasis role=\"strong\">Main server</emphasis>"
 msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "login as root"
-msgstr ""
+msgstr "作为 root 登录"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5250,6 +5256,8 @@ msgid ""
 "<emphasis>sec=sys</emphasis> and replace it with <emphasis>sec=krb5i</"
 "emphasis>"
 msgstr ""
+"运行 <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput>,搜寻 "
+"<emphasis>sec=sys</emphasis> 并替换为 <emphasis>sec=krb5i</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5265,9 +5273,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid "run <computeroutput>exportfs -r</computeroutput>"
-msgstr "默认安装提供<computeroutput>网络组</computeroutput>"
+msgstr "运行 <computeroutput>exportfs -r</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5277,7 +5284,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "login as root."
-msgstr ""
+msgstr "作为 root 登录。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5297,16 +5304,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "The configuration file <computeroutput>/etc/standardskriver.cfg</"
 "computeroutput> has to be provided by the admin, see <computeroutput>/usr/"
 "share/doc/standardskriver/examples/standardskriver.cfg</computeroutput> as "
 "an example."
 msgstr ""
-"Icinga 配置文件使用的是 <computeroutput>/etc/icinga/sitesummary.cfg</"
-"computeroutput>。sitesummary cron job 生成有主机和服务监控列表的 "
-"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput>。"
+"其配置文件 <computeroutput>/etc/standardskriver.cfg</computeroutput> 由管理员"
+"提供,参看 <computeroutput>/usr/share/doc/standardskriver/examples/"
+"standardskriver.cfg</computeroutput> 作为一个示例。"
 
 #. type: Content of: <article><section><section><title>
 msgid "JXplorer, an LDAP GUI"
@@ -5322,7 +5328,7 @@ msgstr ""
 "computeroutput> 软件包,默认情况下已安装。要获得写访问连接像这样:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "host: ldap.intern\n"
 "port: 636\n"
@@ -5330,12 +5336,9 @@ msgid ""
 "User dn: cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 "host: ldap.intern\n"
-"port:636\n"
-"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"port: 636\n"
 "Security level: ssl + user + password\n"
-"User dn: cn=admin,ou=ldap-access\n"
-"\n"
-"当询问证书时点击 \"This session only\"。"
+"User dn: cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><title>
 msgid "ldap-createuser-krb, a command-line tool"
@@ -5404,12 +5407,12 @@ msgid "Using backports is simple:"
 msgstr "使用 backports 是简单的:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "echo \"deb http://deb.debian.org/debian/ buster-backports main\" >> /etc/apt/sources.list\n"
 "apt-get update"
 msgstr ""
-"echo \"deb http://deb.debian.org/debian/ stretch-backports main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb.debian.org/debian/ buster-backports main\" >> /etc/apt/sources.list\n"
 "apt-get update"
 
 #. type: Content of: <article><section><section><para>
@@ -5421,9 +5424,9 @@ msgstr ""
 "的 <emphasis>tuxtype</emphasis>:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "apt-get install -t buster-backports tuxtype"
-msgstr "apt-get install -t stretch-backports tuxtype"
+msgstr "apt-get install -t buster-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5439,22 +5442,19 @@ 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 Buster "
 "10.1+edu0 to 10.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
-"如果要从一个版本升级到另一个版本(例如从 Stretch 9.1 + edu0 到 9.3 + edu1),"
-"但没有互联网连接,则只能使用物理介质,请执行以下步骤:"
+"如果要从一个版本升级到另一个版本(例如从 Buster 10.1+edu0 到 10.3+edu1),但"
+"没有互联网连接,仅是物理介质,采用这些步骤:"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "Insert the CD / DVD / Blu-ray disc / USB flash drive and use the apt-cdrom "
 "command:"
-msgstr ""
-"插入 CD / DVD / 蓝光光盘 / USB 闪存驱动器,将其挂载并使用 apt-cdrom 命令:"
+msgstr "插入 CD / DVD / 蓝光光盘 / USB 闪存驱动器并使用 apt-cdrom 命令:"
 
 #. type: CDATA
 #, no-wrap
@@ -5511,7 +5511,6 @@ msgid "Automatic installation of security upgrades"
 msgstr "安全升级的自动安装"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
 msgid ""
 "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
 "which will install security (and other) upgrades automatically. If "
@@ -5520,10 +5519,10 @@ msgid ""
 "computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
 "computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
 msgstr ""
-"<computeroutput>unattended-upgrades</computeroutput> 是会自动安装安全(和其"
-"他)升级的 Debian 软件包。这个软件包是默认安装并预配置来安装安全升级。在 "
-"<computeroutput>/var/log/unattended-upgrades/</computeroutput> 里提供其日志;"
-"而且,那里一贯是 <computeroutput>/var/log/dpkg.log</computeroutput> 和 "
+"<computeroutput>unattended-upgrades</computeroutput> 是一个会自动安装安全(和"
+"其他)升级的 Debian 软件包。如已安装,该软件包已预配置来安装安全升级。其日志"
+"在 <computeroutput>/var/log/unattended-upgrades/</computeroutput> 里获得;而"
+"且,一直是 <computeroutput>/var/log/dpkg.log</computeroutput> 和 "
 "<computeroutput>/var/log/apt/</computeroutput>。"
 
 #. type: Content of: <article><section><section><title>
@@ -5769,7 +5768,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Create Users in Year Groups"
-msgstr ""
+msgstr "在年级组中创建用户"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6296,9 +6295,8 @@ msgid "Introduction to thin clients and diskless workstations"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
 msgid "./images/idea.png"
-msgstr "./images/smile.png"
+msgstr "./images/idea.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "(!)"
@@ -6633,7 +6631,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Use a different LTSP client network"
-msgstr ""
+msgstr "使用不同的 LTSP 客户机网络"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6658,12 +6656,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "Run <computeroutput>ltsp-build-client --arch i386</computeroutput> to create "
 "chroot and NBD image."
 msgstr ""
-"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
+"运行 <computeroutput>ltsp-build-client --arch i386</computeroutput> 来创建 "
+"chroot 和 NBD 映像。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6675,18 +6673,19 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
 msgstr ""
+"运行 <computeroutput>service isc-dhcp-server restart</computeroutput>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "Run <computeroutput>service nbd-service restart</computeroutput> to serve "
 "the new NBD file."
 msgstr ""
-"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
+"运行 <computeroutput>service nbd-service restart</computeroutput> 来满足新的 "
+"NBD 文件。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Changing network settings"
-msgstr ""
+msgstr "改变网络设置"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6717,11 +6716,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid "LTSP in detail"
-msgstr ""
+msgstr "LTSP 细节"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "LTSP client configuration in LDAP (and lts.conf)"
-msgstr ""
+msgstr "LDAP(和 lts.conf)中的 LTSP 客户机配置"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6858,6 +6857,8 @@ msgid ""
 "Read about it: run <computeroutput>ltsp-chroot cat /usr/share/doc/desktop-"
 "autoloader/README.Debian</computeroutput>"
 msgstr ""
+"其相关阅读:运行 <computeroutput>ltsp-chroot cat /usr/share/doc/desktop-"
+"autoloader/README.Debian</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6886,6 +6887,8 @@ msgid ""
 "If the setup is complete, update the NBD image running <computeroutput>ltsp-"
 "update-image</computeroutput> and test it."
 msgstr ""
+"如果设置完成,运行 <computeroutput>ltsp-update-image</computeroutput> 更新 "
+"NBD 映像并测试。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Load-balancing LTSP servers"
@@ -6989,7 +6992,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Part 3"
-msgstr ""
+msgstr "第 3 部分"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -7191,7 +7194,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Joining a domain"
-msgstr ""
+msgstr "加入域"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7316,7 +7319,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Available Remote Desktop clients"
-msgstr ""
+msgstr "可用的远程桌面客户端"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7385,7 +7388,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid "Getting Started"
-msgstr ""
+msgstr "开始"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7395,6 +7398,9 @@ msgid ""
 "also presume that you have a Windows workstation at hand, so you can test "
 "access to the Debian Edu main server from a Windows machine."
 msgstr ""
+"本文档假设已安装了 Debian Edu 主服务器还有 Debian Edu 工作站。假定已经创建了"
+"一些可以登录并使用 Debian Edu 工作站的用户。也假定手头上有 Windows 工作站,那"
+"么可以测试从一台 Windows 机器访问 Debian Edu 主服务器。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7403,14 +7409,17 @@ msgid ""
 "Windows domain is SKOLELINUX. Use a Windows machine (or a Linux system with "
 "smbclient) to browse your Windows/Samba network environment."
 msgstr ""
+"安装 Debian Edu 主服务器之后 Samba 主机 \\\\TJENER 会在 Windows 网上邻居中看"
+"到。Debian Edu 的 Windows 域是 SKOLELINUX。用 Windows 机器(或者有 smbclient "
+"的 Linux 系统)来浏览 Windows/Samba 网络环境。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "START -> Run command"
-msgstr ""
+msgstr "开始 -> 运行"
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid "enter \\\\TJENER and press return"
-msgstr ""
+msgstr "输入 \\\\TJENER 并按回车"
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid ""
@@ -7418,10 +7427,12 @@ msgid ""
 "\\TJENER, and maybe printers you already have configured for printing under "
 "Unix/Linux (CUPS queues)."
 msgstr ""
+"-> 一个 Windows Explorer 窗口将会打开并显示在 \\\\TJENER 中的网络登录共"
+"享,也许还有已经在 Unix/Linux (CUPS queues) 下配置打印的打印机。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Accessing files via Samba"
-msgstr ""
+msgstr "通过 Samba 存取文件"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7431,23 +7442,28 @@ msgid ""
 "<emphasis role=\"strong\">not</emphasis> joined to the Windows SKOLELINUX "
 "domain."
 msgstr ""
+"通过 GOsa² 配置学生和教师帐户将能对照 \\\\TJENER\\HOMES 或 \\\\TJENER\\<用"
+"户名> 来验证并访问他们的主目录即使有 Windows 机器<emphasis role=\"strong"
+"\">未</emphasis>加入 Windows SKOLELINUX 域。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "enter \\\\TJENER\\HOMES or \\\\TJENER\\<username> and press return"
-msgstr ""
+msgstr "输入 \\\\TJENER\\HOMES 或 \\\\TJENER\\<用户名> 并按回车"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "enter your login credentials (username, password) in the authentication "
 "dialog window that appears"
-msgstr ""
+msgstr "在出现的验证对话窗口中输入登录证明(用户名,密码)"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "-> a Windows Explorer window should open and show files and folders in "
 "your Debian Edu home directory."
 msgstr ""
+"-> 一个 Windows Explorer 窗口将会打开并显示用户在 Debian Edu 主目录里的文"
+"件和文件夹。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7456,10 +7472,13 @@ msgid ""
 "etc/samba/smb-debian-edu.conf</computeroutput> on your Debian Edu main "
 "server."
 msgstr ""
+"默认仅输出 [homes] 和 [netlogon] 共享;更多的学生和教师共享示例可以在 Debian "
+"Edu 主服务器的 <computeroutput>/etc/samba/smb-debian-edu.conf</"
+"computeroutput> 里找到。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Domain Membership"
-msgstr ""
+msgstr "域成员"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7467,6 +7486,8 @@ msgid ""
 "workstations have to join the SKOLELINUX domain provided by the Debian Edu "
 "main server."
 msgstr ""
+"要使用 TJENER 上的 Samba 作为域管理器,网络的 Windows 工作站要加入由 Debian "
+"Edu 主服务器提供的 SKOLELINUX 域。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7476,6 +7497,9 @@ msgid ""
 "account log on to TJENER as the first user (created during main server "
 "installation) and run this command:"
 msgstr ""
+"首先要做的事是启用 SKOLELINUX\\Administrator 帐户。该帐户不计划为日常工作使"
+"用;其现在的主要目的是向 SKOLELINUX 域添加 Windows 机器。要使该帐户作为第一个"
+"用户(安装主服务器期间创建)登录到 TJENER 并运行这个命令:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "$ sudo smbpasswd -e Administrator"
@@ -7487,12 +7511,14 @@ msgid ""
 "main server's installation. Please use the system's root account when "
 "authenticating as SKOLELINUX\\Administrator."
 msgstr ""
+"这个 SKOLELINUX\\Administrator 密码在主服务器安装时被预先配置了。当证明为 "
+"SKOLELINUX\\Administrator 时请使用系统的 root 帐户。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Once you are done with your administrative work make sure to disable the "
 "SKOLELINUX\\Administrator account again:"
-msgstr ""
+msgstr "一旦完成管理工作就得再次禁用 SKOLELINUX\\Administrator 帐户:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "$ sudo smbpasswd -d Administrator"
@@ -7500,7 +7526,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Windows hostname"
-msgstr ""
+msgstr "Windows 主机名"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7509,10 +7535,13 @@ msgid ""
 "host name of the Windows machine will later on be used in GOsa² and cannot "
 "be changed there (without breaking the domain membership for this machine)."
 msgstr ""
+"要让需要在 SKOLELINUX 域中使用的 Windows 机器有名称。如果没有,首先重命名(然"
+"后重启)。Windows 机器的 NetBIOS 主机名以后会在 GOsa² 中使用并且在这里不能更"
+"改(没有粉碎该机器的域成员)。"
 
 #. type: Content of: <article><section><section><title>
 msgid "First Domain Logon"
-msgstr ""
+msgstr "第一次域登录"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7526,6 +7555,7 @@ msgid ""
 "copy the user's Firefox profile to a separate location and register that "
 "with Mozilla Firefox on Windows"
 msgstr ""
+"拷贝用户的 Firefox 设定到单独的位置并用 Windows 上的 Mozilla Firefox 注册"
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid "set up Web-Proxy and start page in Firefox"
@@ -7557,6 +7587,8 @@ msgid ""
 "All Debian packages mentioned in this section can be installed by running "
 "<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
+"这节中提到的所有 Debian 软件包可以由运行 <computeroutput>apt install <软件"
+"包></computeroutput> (作为 root)来安装。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Teaching Programming"
@@ -7582,6 +7614,8 @@ msgid ""
 "of the laws about monitoring and restricting computer users' activities in "
 "your jurisdiction."
 msgstr ""
+"<emphasis role=\"strong\">提醒</emphasis>:确知自己在管辖权限内有关监视和约束"
+"计算机用户活动的法律地位。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7594,7 +7628,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid "To get full Epoptes support, these steps are required."
-msgstr ""
+msgstr "要获得全部的 Epoptes 支持,需要这些步骤。"
 
 #. type: CDATA
 #, no-wrap
@@ -7624,7 +7658,7 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for users"
-msgstr ""
+msgstr "用户 HowTo"
 
 #. type: Content of: <article><section><section><title>
 msgid "Changing passwords"
@@ -7696,11 +7730,11 @@ msgstr "启动 Thunderbird"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
-msgstr ""
+msgstr "点击‘略过并使用我的现有电子邮件’"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Enter your email address"
-msgstr ""
+msgstr "输入自己的电子邮件地址"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Don't enter your password as Kerberos single sign on will be used"
@@ -7708,7 +7742,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Continue'"
-msgstr ""
+msgstr "点击‘继续’"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7718,7 +7752,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Done'"
-msgstr ""
+msgstr "点击‘完成’"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -7944,16 +7978,15 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 msgid "New features in Debian Edu Buster"
-msgstr ""
+msgstr "Debian Edu Buster 中的新面貌"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
 msgid "New features for Debian Edu 10+edu0 Codename Buster"
-msgstr "对于 Debian Edu 9+edu0 别名 Stretch 的手册"
+msgstr "Debian Edu 10+edu0 别名 Buster 的新面貌"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation changes"
-msgstr ""
+msgstr "安装变化"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7963,14 +7996,13 @@ msgid ""
 msgstr ""
 
 #. 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 Stretch 的新版 debian-installer,更多细节参阅它的<ulink url="
-"\"http://www.debian.org/releases/stretch/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 ""
@@ -7981,7 +8013,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New default desktop environment Xfce (replacing KDE)."
-msgstr ""
+msgstr "新的默认桌面环境 Xfce(取代 KDE)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7997,7 +8029,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
-msgstr ""
+msgstr "软件更新"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian 10 Buster, eg:"
@@ -8034,9 +8066,8 @@ msgid "GOsa 2.74"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
 msgid "LTSP 5.18"
-msgstr "LTSP"
+msgstr "LTSP 5.18"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -8044,15 +8075,15 @@ msgid ""
 msgstr ""
 
 #. 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 Stretch 发行版的信息可以在其<ulink url=\"http://www."
-"debian.org/releases/stretch/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><title>
 msgid "Documentation and translation updates"
@@ -8173,20 +8204,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "Added configuration file <computeroutput>/etc/debian-edu/pxeinstall.conf</"
 "computeroutput> with examples to make site specific changes easier."
 msgstr ""
-"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
+"用示例添加配置文件 <computeroutput>/etc/debian-edu/pxeinstall.conf</"
+"computeroutput> 让站点的特定变更很容易。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "Added configuration file <computeroutput>/etc/ltsp/ltsp-build-client.conf</"
 "computeroutput> with examples to make site specific changes easier."
 msgstr ""
-"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
+"用示例添加配置文件 <computeroutput>/etc/ltsp/ltsp-build-client.conf</"
+"computeroutput> 让站点的特定变更很容易。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -8227,13 +8258,12 @@ msgid "Known issues"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "see <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Buster#\">the "
 "Debian Edu Buster status page</ulink>."
 msgstr ""
-"在 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Stretch\"/> 上"
-"的版本是一个维基,并会时常更新。"
+"参看 <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Buster#\">Debian "
+"Edu Buster 现状页面</ulink>。"
 
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
@@ -8402,15 +8432,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
 "using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
 "debian-edu-doc.git</computeroutput>"
 msgstr ""
-"然后使用 ssh 访问签出 <computeroutput>debian-edu-doc</computeroutput> 源代"
-"码:<computeroutput>git clone git+ssh://git.debian.org/git/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 ""
@@ -8435,13 +8464,12 @@ msgstr ""
 "匿名签出 <computeroutput>debian-edu-doc</computeroutput> 源代码:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
 msgid ""
 "<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
-"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8491,13 +8519,12 @@ msgid ""
 msgstr "请留意这一手册仍在开发中,那就不要翻译任何含有 ” FIXME” 的字符串。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "Basic information about Salsa (the host where our Git repository is located) "
 "and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
-"关于 Alioth (我们的 Git 代码库位于该主机)和 Git 的基本信息 <ulink url="
-"\"http://wiki.debian.org/Alioth/Git\"/>。"
+"有关 Salsa(我们的 Git 仓库设置于该主机)和 Git 的基本信息可在 <ulink url="
+"\"https://wiki.debian.org/Salsa\"/> 获得。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9093,9 +9120,8 @@ msgid "Appendix C - Features in older releases"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
 msgid "New features for Debian Edu 9+edu0 Codename Stretch released 2017-06-17"
-msgstr "对于 Debian Edu 9+edu0 别名 Stretch 的手册"
+msgstr "2017-06-17 发行的 Debian Edu 9+edu0 代号 Stretch 的新面貌"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9588,13 +9614,12 @@ msgid "More information on even older releases"
 msgstr "关于旧发行版本的更多信息"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 msgid ""
 "More information on even older (pre-)releases can be found at <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgstr ""
-"更旧发行版本相关的更多信息可以在 <ulink url=\"http://developer.skolelinux.no/"
-"info/cdbygging/news.html\"/> 找到。"
+"即使更老的(预)发行版的很多信息可以在 <ulink url=\"http://developer."
+"skolelinux.no/info/cdbygging/news.html\"/> 里找到。"
 
 #~ msgid ""
 #~ "All the Buster images are still under development - check <ulink url="



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/compare/ec1106c97417a4ee6f33660040d68bb253c9557e...b48e08c52d66a9bdfa8a3d6e5c16d7a236099889

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/compare/ec1106c97417a4ee6f33660040d68bb253c9557e...b48e08c52d66a9bdfa8a3d6e5c16d7a236099889
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/20190930/14960810/attachment-0001.html>


More information about the debian-edu-commits mailing list