[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 5 commits: (zh) (zh_Hans) Debian Edu Audacity manual update from hosted.weblate, thanks to zlffcn
Frans Spiesschaert
gitlab at salsa.debian.org
Mon Apr 22 16:55:19 BST 2019
Frans Spiesschaert pushed to branch master at Debian Edu / debian-edu-doc
Commits:
041baa3f by Frans Spiesschaert at 2019-04-22T15:45:38Z
(zh) (zh_Hans) Debian Edu Audacity manual update from hosted.weblate, thanks to zlffcn
- - - - -
a5e28fb6 by Frans Spiesschaert at 2019-04-22T15:45:38Z
(zh) (zh_Hans) Debian Edu Audacity manual update from hosted.weblate, thanks to Ma Yong
- - - - -
ca02de85 by Frans Spiesschaert at 2019-04-22T15:45:38Z
(zh) (zh_Hans) Debian Edu Stretch manual update from hosted.weblate, thanks to Ma Yong
- - - - -
1cb377dc by Frans Spiesschaert at 2019-04-22T15:45:38Z
(pl) Debian Edu Stretch manual update from hosted.weblate, thanks to Wiktor Wandachowicz
- - - - -
6f073a79 by Frans Spiesschaert at 2019-04-22T15:52:33Z
(zh) Debian Edu Buster manual translation update after resolving merge conflict
- - - - -
5 changed files:
- documentation/audacity/audacity-manual.zh.po
- documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
- documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
Changes:
=====================================
documentation/audacity/audacity-manual.zh.po
=====================================
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2019-04-01 16:48+0000\n"
-"PO-Revision-Date: 2018-10-14 05:24+0000\n"
-"Last-Translator: Ma Yong <debuser at yeah.net>\n"
+"PO-Revision-Date: 2019-04-14 12:04+0000\n"
+"Last-Translator: zlffcn <a527408965 at hotmail.com>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
"debian-edu-documentation/audacity/zh_Hans/>\n"
"Language: zh\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.2.1\n"
+"X-Generator: Weblate 3.6-dev\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -25,7 +25,7 @@ msgstr "zh-cn"
#. type: Content of: <article><articleinfo><title>
#, fuzzy
msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
-msgstr "Debian Edu / Skolelinux Audacity 手册"
+msgstr "Debian Edu / Skolelinux Audacity 手册 2019-01-20"
#. type: Content of: <article><section><section><title>
msgid "Audacity manual"
@@ -180,6 +180,7 @@ msgstr "当你录音时最好记住不要将音量设置的过大，往往设置
msgid ""
"<imageobject><imagedata fileref=\"./images/recording.png\"/></imageobject>"
msgstr ""
+"<imageobject><imagedata fileref=\"./images/recording.png\"/></imageobject>"
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
msgid "recording.png"
@@ -191,11 +192,14 @@ msgid ""
"the volume automatically set right volume on the record without any danger "
"of have part of the sound overdriven."
msgstr ""
+"当你录制了你想要的内容时，你可以对录音进行标准化处理，在录音中自动设置正确的"
+"音量而不会有部分声音过载的危险。"
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
"<imageobject><imagedata fileref=\"./images/normalize.png\"/></imageobject>"
msgstr ""
+"<imageobject><imagedata fileref=\"./images/normalize.png\"/></imageobject>"
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
msgid "normalize.png"
@@ -546,10 +550,6 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid ""
-#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
msgid ""
"Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
@@ -579,10 +579,6 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
msgid ""
"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
"git</computeroutput>"
@@ -635,10 +631,6 @@ msgstr "请留意这一手册仍在开发中，那就不要翻译任何含有
#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid ""
-#| "Basic information about Alioth (the host where our Git repository is "
-#| "located) and Git is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Git\"/>."
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\"/>."
=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
=====================================
The diff for this file was not included because it is too large.
=====================================
documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
=====================================
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2019-04-01 16:48+0000\n"
-"PO-Revision-Date: 2018-10-14 05:24+0000\n"
+"PO-Revision-Date: 2019-03-09 11:03+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
"debian-edu-documentation/debian-edu-itil/zh_Hans/>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.2.1\n"
+"X-Generator: Weblate 3.5.1-dev\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -24,7 +24,6 @@ msgstr "zh-cn"
#. type: Content of: <article><articleinfo><title>
#, fuzzy
-#| msgid "Debian Edu / Skolelinux ITIL Manual"
msgid "Debian Edu / Skolelinux ITIL Manual 2019-05-01"
msgstr "Debian Edu / Skolelinux ITIL 手册"
@@ -9053,7 +9052,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid "and"
-msgstr ""
+msgstr "和"
#. type: Content of: <article><section><section><para>
msgid ""
=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
=====================================
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
"POT-Creation-Date: 2019-04-20 09:05+0000\n"
-"PO-Revision-Date: 2017-06-05 08:57+0000\n"
-"Last-Translator: Stanisław Krukowski <stdf021 at riseup.net>\n"
+"PO-Revision-Date: 2019-03-27 08:04+0000\n"
+"Last-Translator: Wiktor Wandachowicz <siryes at gmail.com>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
"documentation/debian-edu-stretch/pl/>\n"
"Language: pl\n"
@@ -12,7 +12,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.15-dev\n"
+"X-Generator: Weblate 3.6-dev\n"
# type: Attribute 'lang' of: <article>
#. type: Attribute 'lang' of: <article>
@@ -21,7 +21,6 @@ msgstr "pl"
#. type: Content of: <article><articleinfo><title>
#, fuzzy
-#| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
msgstr "Podręcznik Debian Edu / Skolelinux Stretch 9+edu0"
@@ -714,14 +713,6 @@ msgstr ""
"maszynach."
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP "
-#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
-#| "network traffic of the thin clients doesn't interfere with the rest of "
-#| "the network services)."
msgid ""
"Network configuration on the clients is done automatically using DHCP. All "
"types of clients can be connected to the private 10.0.0.0/8 subnet and will "
@@ -731,11 +722,12 @@ msgid ""
"the rest of the network services)."
msgstr ""
"Konfiguracja sieci komputerowej dla klientów jest wykonywana automatycznie "
-"za pomocą DHCP. Zwykłe klienty mają adresy IP przydzielane w prywatnej "
-"podsieci 10.0.0.0/8, natomiast cienkie klienty są podłączane do "
-"odpowiadającego im serwera LTSP poprzez oddzielną podsieć 192.168.0.0/24 (ma "
-"to zapewnić sytuację, w której ruch sieciowy cienkich klientów nie będzie "
-"kolidował z resztą usług sieci komputerowej)."
+"za pomocą DHCP. Wszystkie rodzaje klientów mogą być podłączane do prywatnej "
+"podsieci 10.0.0.0/8, w której dostaną odpowiednie adresy IP. Z kolei klienty "
+"LTSP powinny być podłączane do odpowiadającego im serwera LTSP poprzez "
+"oddzielną podsieć 192.168.0.0/24 (ma to zapewnić sytuację, w której ruch "
+"sieciowy cienkich klientów nie będzie kolidował z resztą usług sieci "
+"komputerowej)."
# type: Content of: <article><section><section><section><para>
#. type: Content of: <article><section><section><section><para>
@@ -1228,9 +1220,6 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and LTSP server profiles."
msgid ""
"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
"clients are recommended for the main and LTSP server profiles."
@@ -1240,10 +1229,6 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-#| "possible, though 256 MiB RAM or more and faster processors are "
-#| "recommended."
msgid ""
"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
"and faster processors are recommended."
@@ -1275,10 +1260,6 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone systems, 800 MHz "
-#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
-#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
=====================================
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"POT-Creation-Date: 2019-04-20 09:05+0000\n"
-"PO-Revision-Date: 2018-06-08 00:36+0000\n"
+"PO-Revision-Date: 2019-04-22 14:57+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
-"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
-"documentation/debian-edu-stretch/zh/>\n"
+"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
+"debian-edu-documentation/debian-edu-stretch/zh_Hans/>\n"
"Language: zh\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 3.0\n"
+"X-Generator: Weblate 3.6\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -24,7 +24,6 @@ msgstr "zh-cn"
#. type: Content of: <article><articleinfo><title>
#, fuzzy
-#| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
msgstr "Debian Edu / Skolelinux Stretch 9+edu0 手册"
@@ -232,11 +231,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
-#| msgid ""
-#| "This is designed to be modified - that is, you can have the NFS-root in "
-#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
-#| "option (stored in LDAP) to have clients directly boot via PXE from the "
-#| "terminal server."
msgid ""
"This is designed to be modified - that is, you can have the NFS-root in "
"syslinux pointing to one of the LTSP servers or change the DHCP next-server "
@@ -282,18 +276,6 @@ msgid "Services running on the main server"
msgstr "运行在主服务器上的服务"
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "With the exception of the control of the thin-clients, all services are "
-#| "initially set up on one central computer (the main server). For "
-#| "performance reasons, the thin-client-server should be a separate machine "
-#| "(though it is possible to install both the main server and thin-client "
-#| "server profiles on the same machine). All services are allocated a "
-#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
-#| "DNS name makes it easy to move individual services from the main-server "
-#| "to a different machine, by simply stopping the service on the main-"
-#| "server, and changing the DNS configuration to point to the new location "
-#| "of the service (which should be set up on that machine first, of course)."
msgid ""
"With the exception of the control of the thin clients, all services are "
"initially set up on one central computer (the main server). For performance "
@@ -306,12 +288,12 @@ msgid ""
"location of the service (which should be set up on that machine first, of "
"course)."
msgstr ""
-"以瘦客户端管理为例外，所有服务最初设置在一个中央计算机（主服务器）上。由于性"
-"能的原因，瘦客户端服务器会是一台独立的机器（不过在同一机器上既能安装主服务器"
-"也能安装瘦客户端服务器profile）。所有服务分配一个专用 DNS 名称并提供唯一通过 "
-"IPv4 传送。分配 DNS 名称使之从主服务器迁移个别的服务到不同的机器，仅以停止主"
-"服务器上的该服务，并改变 DNS 配置指向该服务的新位置（当然，首先要设置那台机"
-"器）。"
+"除了瘦客户机的管理之外，所有的服务最初设置在一台中央计算机上（主服务器）。为"
+"了性能的原因，LTSP 服务器将要分开来（不过在同一机器上可以安装主服务器和 LTSP "
+"服务器两者的配置文件）。所有服务分配了专用 DNS 名称并且只在 IPv4 上提供。分配"
+"的 DNS 名称使其容易地从主服务器迁移单独的服务到不同的机器，简单地在主服务器上"
+"关闭该服务，而后变更 DNS 配置指向该服务的新位置（当然，首先要在这台机器上设"
+"置）。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -565,15 +547,6 @@ msgstr ""
"通过 NFS 的 Unix 客户端，SMB 的 Windows 和 Macintosh 客户端提供存取通路。"
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "By default email is set up for local delivery (i.e. within the school) "
-#| "only, though email delivery to the wider Internet may be set up if the "
-#| "school has a permanent Internet connection. Mailing lists are set up "
-#| "based on the user database, giving each class their own mailing list. "
-#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
-#| "users can <link linkend=\"Users--Using_email\">access their personal "
-#| "mail</link> through IMAP."
msgid ""
"By default email is set up for local delivery (i.e. within the school) only, "
"though email delivery to the wider Internet may be set up if the school has "
@@ -581,10 +554,10 @@ msgid ""
"server (using 'smarthost'), and users can <link linkend=\"Users--Using_email"
"\">access their personal mail</link> through IMAP."
msgstr ""
-"缺省电子邮件设置仅为本地投递（即学校内），不过若学校有固定互联网连接可以设置"
-"电子邮件投递到更宽广的互联网。设置基于用户数据库的邮件列表，给予每个班级他们"
-"自己的邮件列表。设置客户端投递邮件到服务器（使用 'smarthost'），而用户可以通"
-"过 IMAP <link linkend=\"Users--Using_email\">存取他们的个人邮件</link>。"
+"只预设电子邮件本地投递设置（如在学校内），但如果学校有固定互联网连接那么可以"
+"设置投递电子邮件到更广的互联网。客户端设置为投递电子邮件到服务器（使"
+"用‘smarthost’），而用户可以通过 IMAP <link linkend=\"Users--Using_email\">读"
+"取他们的个人邮件</link>。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -604,14 +577,6 @@ msgstr ""
"器上一同做路由上限制的 web 流量与互联网访问的控制。"
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP "
-#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
-#| "network traffic of the thin clients doesn't interfere with the rest of "
-#| "the network services)."
msgid ""
"Network configuration on the clients is done automatically using DHCP. All "
"types of clients can be connected to the private 10.0.0.0/8 subnet and will "
@@ -620,9 +585,10 @@ msgid ""
"ensure that the network traffic of the LTSP clients doesn't interfere with "
"the rest of the network services)."
msgstr ""
-"在客户端的网络配置使用 DHCP 自动完成。常规客户端在私有子网 10.0.0.0/8 分配 "
-"IP 地址，而瘦客户端通过分开的子网 192.168.0.0/24 连接到相符的 LTSP 服务器（这"
-"是保证瘦客户端的网络流量不阻碍其他的网络服务）。"
+"客户端的网络配置是使用 DHCP 自动完成的。所有类型的客户端可以连接到私有的 "
+"10.0.0.0/8 子网并且将获得协商 IP 地址；LTSP 客户机将会通过独立的 "
+"192.168.0.0/24 子网（这是保证 LTSP 客户机的网络流量不干扰到其他的网络服务）连"
+"接到相配合的 LTSP 服务器。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -714,17 +680,13 @@ msgid "LTSP server(s)"
msgstr "LTSP 服务器"
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the Thin client server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (which we called \"thin "
"client servers\" in releases before Stretch), which are installed by "
"selecting the LTSP Server profile."
msgstr ""
-"一个 Skolelinux 网络上可以有许多 LTSP 服务器（亦称瘦客户端服务器），是由选择"
-"瘦客户端服务器profile而安装。"
+"一个 Skolelinux 网络上可以有许多 LTSP 服务器（在 Stretch 之前的发行中称之"
+"为“瘦客户机服务器”），是由选择了 LTSP 服务器配置文件而安装的。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -765,16 +727,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP server. This works as follows: "
-#| "the service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted via NFS from the LTSP "
-#| "server, and finally the X Window System is started. The display manager "
-#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
-#| "data is encrypted on the network. For very old thin clients which are too "
-#| "slow for the encryption this can be set to the behavior from former "
-#| "versions, which is to use a direct X connection via XDMCP."
msgid ""
"Thin clients are a good way to make use of older, weaker machines as they "
"effectively run all programs on the LTSP server. This works as follows: the "
@@ -854,11 +806,6 @@ msgstr "管理"
#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid ""
-#| "All the Linux machines that are installed with the Skolelinux installer "
-#| "will be administrable from a central computer, most likely the server. It "
-#| "will be possible to log in to all machines via SSH (root not allowed by "
-#| "default), and thereby have full access to the machines."
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
@@ -1040,16 +987,12 @@ msgstr ""
"陈旧被支持的处理器是 686 级）或者 64 位（Debian 架构 'amd64'）x86 处理器。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and LTSP server profiles."
msgid ""
"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
"clients are recommended for the main and LTSP server profiles."
msgstr ""
-"建议主服务器和 LTSP 服务器的配置对于 30 客户端至少 2 GiB 而 50-60 客户端为 4 "
-"GiB。"
+"建议用于 30 瘦客户机的主服务器和 LTSP 服务器配置至少 12 GiB 的内存而对于 "
+"50-60 瘦客户机则为 20 GiB。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1079,10 +1022,6 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone systems, 800 MHz "
-#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
-#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
@@ -1325,14 +1264,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=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
-#| "you can also use the original firmware. Using the original firmware is "
-#| "easier; using OpenWRT gives you more choices and control. Check the "
-#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
-#| "TableOfHardware\">supported hardware</ulink>."
msgid ""
"If you need something for an embedded router or accesspoint we recommend "
"using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1341,10 +1272,10 @@ msgid ""
"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
"\">supported hardware</ulink>."
msgstr ""
-"如果你需要固定路由或访问点的某事我们建议使用 <ulink url=\"http://openwrt.org"
-"\">OpenWRT</ulink>，当然你也可以使用新颖的固件。使用新颖固件很容易；使用 "
-"OpenWRT 给你更多选择和控制权。检索 OpenWRT 网页的 <ulink url=\"http://wiki."
-"openwrt.org/TableOfHardware\">supported hardware</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>
msgid ""
@@ -1448,12 +1379,6 @@ msgstr "i386 和 amd64 的 USB 驱动器 ISO 镜像"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. Like the netinstall image it can "
-#| "be installed on USB flash drives or disk media of sufficient size. Please "
-#| "note that internet access during installation is needed. Like the others "
-#| "it can be downloaded over FTP, HTTP or rsync via:"
msgid ""
"The multi-architecture ISO image is 5.5 GiB large and can be used for "
"installation of amd64 and i386 machines. Like the netinstall image it can be "
@@ -1495,21 +1420,15 @@ msgid "Request a CD / DVD by mail"
msgstr "以邮件请求 CD / DVD"
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For those without a fast Internet connection, we can offer a CD or DVD "
-#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
-#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
-#| "will discuss the payment details (for shipping and media)"
msgid ""
"For those without a fast Internet connection, we can offer a CD or DVD sent "
"for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
"\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
"payment details (for shipping and media)."
msgstr ""
-"对于没有快速互联网连接，我们能以 CD 或 DVD 及运输费用发送 CD 或 DVD。直接发送"
-"电子邮件 <ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> 而我"
-"们会商议支付细节（运输和媒体介质）"
+"对于那些没有快速互联网连接，我们可以按 CD 或 DVD 以及运输的费用提供 CD 或 "
+"DVD 的发送。只要发送电子邮件到 <ulink url=\"mailto:cd at skolelinux.no"
+"\">cd at skolelinux.no</ulink> 我们就会商量支付细节（运输和媒体）。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -1689,9 +1608,6 @@ msgstr "<emphasis>Add or change boot parameters for installations</emphasis>"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
-#| msgid ""
-#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
-#| "boot menu."
msgid ""
"In both cases, boot options can be edited by pressing the TAB key in the "
"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
@@ -1728,11 +1644,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
@@ -1744,10 +1655,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
@@ -1808,12 +1715,6 @@ msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "This is the main server (tjener) for your school providing all services "
-#| "pre-configured to work out of the box. You must only install one main "
-#| "server per school! This profile does not include a graphical user "
-#| "interface. If you want a graphical user interface, then select "
-#| "Workstation or Thin-Client-Server in addition to this one."
msgid ""
"This is the main server (tjener) for your school providing all services pre-"
"configured to work out of the box. You must install only one main server per "
@@ -1861,15 +1762,6 @@ msgstr "<emphasis role=\"strong\">LTSP 服务器</emphasis>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "A thin client (and diskless workstation) server, also called a LTSP "
-#| "server. Clients without hard drives boot and run software from this "
-#| "server. This computer needs two network cards, a lot of memory, and "
-#| "ideally more than one processor or core. See the chapter about <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for more information "
-#| "on this subject. Choosing this profile also enables the workstation "
-#| "profile (even if it is not selected) - a thin client server can always be "
-#| "used as a workstation, too."
msgid ""
"A thin client (and diskless workstation) server, is called an LTSP server. "
"Clients without hard drives boot and run software from this server. This "
@@ -1913,20 +1805,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\">Thin "
-#| "Client Server</emphasis> profiles are preselected. These profiles can be "
-#| "installed on one machine together if you want to install a so called "
-#| "<emphasis>combined main server</emphasis>. This means the main server "
-#| "will be a thin client server and also be used as a workstation. This is "
-#| "the default choice, since we assume most people will install <link "
-#| "linkend=\"Installation--"
-#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
-#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
-#| "cards installed in a machine which is going to be installed as a combined "
-#| "main server or as a thin client server to become usefull after the "
-#| "installation."
msgid ""
"The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
"\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP Server</"
@@ -1972,10 +1850,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "Wait. If the selected profiles include Thin-client-server then the "
-#| "installer will spend quite some time at the end, \"Finishing the "
-#| "installation - Running debian-edu-profile-udeb...\""
msgid ""
"Wait. If the selected profiles include LTSP Server then the installer will "
"spend quite some time at the end, \"Finishing the installation - Running "
@@ -2080,11 +1954,6 @@ msgstr "仅用于瘦客户端的 LTSP 服务器安装的注意事项"
#. type: Content of: <article><section><section><section><section><para>
#, fuzzy
-#| msgid ""
-#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-#| "client</computeroutput> makes it possible to skip the step which converts "
-#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
-#| "diskless workstation chroot."
msgid ""
"Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
"client</computeroutput> makes it possible to skip one step which converts "
@@ -2181,10 +2050,6 @@ msgstr "width=400"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
-#| msgid ""
-#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-#| "emphasis> profiles:"
msgid ""
"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
@@ -2354,11 +2219,6 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid ""
-#| "So here is a screenshot tour through a graphical Main-Server + "
-#| "Workstation + Thin Client Server installation and how it looks at the "
-#| "first boot of the tjener, a PXE boot on the workstation network and on "
-#| "the thinclient network:"
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 "
@@ -5992,9 +5852,6 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid ""
-#| "More information about network clients can be found in the <link linkend="
-#| "\"NetworkClients\">Network clients HowTo</link> chapter."
msgid ""
"The use of LXDE as default on thin clients can be forced; see <link linkend="
"\"NetworkClients\">networked clients</link> for details."
@@ -8413,10 +8270,6 @@ 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+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
msgid ""
"Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
@@ -8450,9 +8303,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
"git</computeroutput>"
@@ -8504,10 +8354,6 @@ msgstr "请留意这一手册仍在开发中，那就不要翻译任何含有
#. type: Content of: <article><section><section><section><para>
#, fuzzy
-#| msgid ""
-#| "Basic information about Alioth (the host where our Git repository is "
-#| "located) and Git is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Git\"/>."
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\"/>."
@@ -9444,20 +9290,15 @@ msgstr ""
"更旧发行版本相关的更多信息可以在 <ulink url=\"http://developer.skolelinux.no/"
"info/cdbygging/news.html\"/> 找到。"
-#, fuzzy
-#~| msgid ""
-#~| "If you are looking for a router firewall solution capable of running on "
-#~| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</"
-#~| "ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
#~ msgid ""
#~ "In case you are looking for a complete router firewall solution capable "
#~ "of running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
#~ "\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
#~ "ulink>."
#~ msgstr ""
-#~ "如果你寻找一个能够运行在旧个人电脑上的路由防火墙方案，我们推荐 <ulink url="
-#~ "\"http://www.ipcop.org\">IPCop</ulink> 或 <ulink url=\"http://www.zelow."
-#~ "no/floppyfw\">floppyfw</ulink>。"
+#~ "如果你正寻找一个能够运行在旧个人电脑上的完善的路由防火墙方案，我们推荐 "
+#~ "<ulink url=\"http://www.ipcop.org\">IPCop</ulink> 或 <ulink url=\"http://"
+#~ "www.zelow.no/floppyfw\">floppyfw</ulink>。"
#~ msgid "Let us know you exist"
#~ msgstr "让我们知道你的存在"
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/compare/c8f3ef1e057269c76bcafad9e0dda27fa2b8e7e7...6f073a790b7e000be77bf6c6ff2e468e78376971
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/compare/c8f3ef1e057269c76bcafad9e0dda27fa2b8e7e7...6f073a790b7e000be77bf6c6ff2e468e78376971
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/20190422/c30cc860/attachment-0001.html>
More information about the debian-edu-commits
mailing list