[debian-edu-commits] debian-edu/debian-edu-doc.git (#604) - wheezy (branch) updated: 1.3_20091109_5.0.3+edu0_alpha-13-gb0d3f0e
David Prévot
taffit at alioth.debian.org
Sat Oct 5 12:21:24 UTC 2013
The branch, wheezy has been updated
via b0d3f0e6bca6211e76faa84ca32208fd17452536 (commit)
from db9f84168c2dc3586fc5273a01bddfb121e7d9a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-lenny/debian-edu-lenny-manual.zh.po | 4204 +++++++++-----------
1 file changed, 1834 insertions(+), 2370 deletions(-)
The diff of changes is:
diff --git a/documentation/debian-edu-lenny/debian-edu-lenny-manual.zh.po b/documentation/debian-edu-lenny/debian-edu-lenny-manual.zh.po
index c964944..a232779 100644
--- a/documentation/debian-edu-lenny/debian-edu-lenny-manual.zh.po
+++ b/documentation/debian-edu-lenny/debian-edu-lenny-manual.zh.po
@@ -1,13 +1,13 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Skolelinux User Manual
+# Copyright (C) 2009 Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# Andrew Lee <ajqlee at debian.org>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: release-manual.zh\n"
"POT-Creation-Date: 2009-11-28 13:02+0100\n"
-"PO-Revision-Date: 2009-11-02 07:06+0800\n"
+"PO-Revision-Date: 2009-12-01 21:51+0800\n"
"Last-Translator: Andrew Lee <andrew at linux.org.tw>\n"
"Language-Team: zh-l10n <zh-l10n at lists.linux.org.tw>\n"
"MIME-Version: 1.0\n"
@@ -17,122 +17,165 @@ msgstr ""
"X-Poedit-Country: TAIWAN\n"
# type: Content of: <article><articleinfo><title>
-#: debian-edu-lenny-manual.xml:3
-msgid "\"Debian Edu / Skolelinux Lenny 5.0.1+edu0~alpha Manual\""
-msgstr "\"Debian Edu / Skolelinux Lenny 5.0.1+edu0~alpha 使用手冊\""
-
+#~ msgid "\"Debian Edu / Skolelinux Lenny 5.0.1+edu0~alpha Manual\""
+#~ msgstr "\"Debian Edu / Skolelinux Lenny 5.0.1+edu0~alpha 使用手冊\""
# type: Content of: <article><section><title>
-#: debian-edu-lenny-manual.xml:5
-msgid "Manual for Debian Edu 5.0.3+edu0 Codename \"Lenny\""
-msgstr "Debian Edu 5.0.3+edu0 代號 \"Lenny\" 使用手冊"
-
+#~ msgid "Manual for Debian Edu 5.0.3+edu0 Codename \"Lenny\""
+#~ msgstr "Debian Edu 5.0.3+edu0 代號 \"Lenny\" 使用手冊"
# type: Content of: <article><section><para>
-#: debian-edu-lenny-manual.xml:7
-msgid ""
-"This is the (<emphasis>still incomplete </emphasis>) manual for the Debian "
-"Edu Lenny 5.0.3+edu0 release."
-msgstr ""
-"這是一本 Debian Edu Lenny 5.0.3+edu0 版本(<emphasis>尚未完成 </emphasis>) 的"
-"手冊."
-
+#~ msgid ""
+#~ "This is the (<emphasis>still incomplete </emphasis>) manual for the "
+#~ "Debian Edu Lenny 5.0.3+edu0 release."
+#~ msgstr ""
+#~ "這是一本 Debian Edu Lenny 5.0.3+edu0 版本(<emphasis>尚未完成 </emphasis>) "
+#~ "的手冊."
# type: Content of: <article><section><para>
-#: debian-edu-lenny-manual.xml:10
#, fuzzy
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "This document was put into the <computeroutput>debian-edu-doc </computeroutput> package on <computeroutput>2009-11-09 </computeroutput>."
+msgstr "這份文件於 <computeroutput>2009-10-31 </computeroutput> 收入於 <computeroutput>debian-edu-doc </computeroutput> 套件。"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
msgid ""
"This document was put into the <computeroutput>debian-edu-doc </"
-"computeroutput> package on <computeroutput>2009-11-28 </computeroutput>."
+"computeroutput> package on <computeroutput>2009-11-09 </computeroutput>."
msgstr ""
"這份文件於 <computeroutput>2009-10-31 </computeroutput> 收入於 "
"<computeroutput>debian-edu-doc </computeroutput> 套件。"
-
-# type: Content of: <article><section><para>
-#: debian-edu-lenny-manual.xml:14
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
-"The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Lenny\"/> is a wiki and updated frequently."
+"This document was put into the <computeroutput>debian-edu-doc </"
+"computeroutput> package on <computeroutput>2009-11-28 </computeroutput>."
msgstr ""
-"位於 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny\"/> 的"
-"版本是一個 wiki 並隨時會更新。"
+"這份文件於 <computeroutput>2009-10-31 </computeroutput> 收入於 "
+"<computeroutput>debian-edu-doc </computeroutput> 套件。"
+<<<< 125968969722687
# type: Content of: <article><section><para>
-#: debian-edu-lenny-manual.xml:16
-msgid ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"Translations#\">Translations </ulink> are part of the <computeroutput>debian-"
-"edu-doc </computeroutput> package, which can be <ulink url=\"http://"
-"maintainer.skolelinux.org/debian-edu-doc/\">installed on a webserver </"
-"ulink>."
-msgstr ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"Translations#\">Translations </ulink> 視為 <computeroutput>debian-edu-doc </"
-"computeroutput> 套件的一部分，並可 <ulink url=\"http://maintainer.skolelinux."
-"org/debian-edu-doc/\">安裝在 webserver 上</ulink>。"
-
+#~ msgid ""
+#~ "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
+#~ "Documentation/Lenny\"/> is a wiki and updated frequently."
+#~ msgstr ""
+#~ "位於 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny\"/"
+#~ "> 的版本是一個 wiki 並隨時會更新。"
+# type: Content of: <article><section><para>
+#~ msgid ""
+#~ "<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
+#~ "Translations#\">Translations </ulink> are part of the "
+#~ "<computeroutput>debian-edu-doc </computeroutput> package, which can be "
+#~ "<ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">installed "
+#~ "on a webserver </ulink>."
+#~ msgstr ""
+#~ "<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
+#~ "Translations#\">Translations </ulink> 視為 <computeroutput>debian-edu-doc "
+#~ "</computeroutput> 套件的一部分，並可 <ulink url=\"http://maintainer."
+#~ "skolelinux.org/debian-edu-doc/\">安裝在 webserver 上</ulink>。"
# type: Content of: <article><section><title>
-#: debian-edu-lenny-manual.xml:24
-msgid "About Debian Edu and Skolelinux"
-msgstr "關於 Debian Edu 和 Skolelinux"
-
+#~ msgid "About Debian Edu and Skolelinux"
+#~ msgstr "關於 Debian Edu 和 Skolelinux"
# type: Content of: <article><section><para>
-#: debian-edu-lenny-manual.xml:26
-msgid ""
-"Skolelinux is a Linux distribution made by the Debian Edu project. Being a "
-"<ulink url=\"http://wiki.debian.org/CustomDebian\">Custom Debian "
-"Distribution </ulink> (CDD) it is part of <ulink url=\"http://www.debian.org"
-"\">Debian </ulink>."
-msgstr ""
-"Skolelinux 是一套 Debian Edu 計畫中產出的 Linux distribution。並且以 <ulink "
-"url=\"http://wiki.debian.org/CustomDebian\">Custom Debian Distribution </"
-"ulink> (CDD) 的形式存在，並且為 <ulink url=\"http://www.debian.org\">Debian "
-"</ulink> 的一部份。"
-
+#~ msgid ""
+#~ "Skolelinux is a Linux distribution made by the Debian Edu project. Being "
+#~ "a <ulink url=\"http://wiki.debian.org/CustomDebian\">Custom Debian "
+#~ "Distribution </ulink> (CDD) it is part of <ulink url=\"http://www.debian."
+#~ "org\">Debian </ulink>."
+#~ msgstr ""
+#~ "Skolelinux 是一套 Debian Edu 計畫中產出的 Linux distribution。並且以 "
+#~ "<ulink url=\"http://wiki.debian.org/CustomDebian\">Custom Debian "
+#~ "Distribution </ulink> (CDD) 的形式存在，並且為 <ulink url=\"http://www."
+#~ "debian.org\">Debian </ulink> 的一部份。"
# type: Content of: <article><section><para>
-#: debian-edu-lenny-manual.xml:30
-msgid ""
-"What this means is that Skolelinux is a version of Debian providing an out-"
-"of-the box environment of a completely configured school-network."
-msgstr ""
-"換句話說，Skolelinux 是一套為提供校園網路完整配置，而特為優化的 Debian 版本。"
-
+#~ msgid ""
+#~ "What this means is that Skolelinux is a version of Debian providing an "
+#~ "out-of-the box environment of a completely configured school-network."
+#~ msgstr ""
+#~ "換句話說，Skolelinux 是一套為提供校園網路完整配置，而特為優化的 Debian 版"
+#~ "本。"
# type: Content of: <article><section><para>
-#: debian-edu-lenny-manual.xml:32
-msgid ""
-"In Norway, where Skolelinux was started, the main target group is schools "
-"serving the 6-16 years age bracket. Today the system is in use in several "
-"countries around the world, with most installations in Norway, Germany and "
-"France."
-msgstr ""
-"在 Skolelinux 發跡的在挪威，主要的目標對象是針對學生年齡層在 6-16 歲的學校。"
-"而今日，這系統在世界上被許多國家廣泛使用，以及大多數是安裝在挪威、德國和法國"
-"等。"
-
+#~ msgid ""
+#~ "In Norway, where Skolelinux was started, the main target group is schools "
+#~ "serving the 6-16 years age bracket. Today the system is in use in several "
+#~ "countries around the world, with most installations in Norway, Germany "
+#~ "and France."
+#~ msgstr ""
+#~ "在 Skolelinux 發跡的在挪威，主要的目標對象是針對學生年齡層在 6-16 歲的學"
+#~ "校。而今日，這系統在世界上被許多國家廣泛使用，以及大多數是安裝在挪威、德國"
+#~ "和法國等。"
# type: Content of: <article><section><title>
-#: debian-edu-lenny-manual.xml:37
-msgid "Architecture"
-msgstr "結構"
-
+#~ msgid "Architecture"
+#~ msgstr "架構"
# type: Content of: <article><section><para>
-#: debian-edu-lenny-manual.xml:39
-msgid ""
-"This section of the document describes the network architecture and services "
-"provided by a Skolelinux installation."
-msgstr "這章節介紹 Skolelinux 安裝提供的網路結構和服務。"
-
+#~ msgid ""
+#~ "This section of the document describes the network architecture and "
+#~ "services provided by a Skolelinux installation."
+#~ msgstr "這章節介紹 Skolelinux 安裝提供的網路結構和服務。"
# type: Content of: <article><section><section><title>
-#: debian-edu-lenny-manual.xml:43
-msgid "Network"
-msgstr "網路"
-
+#~ msgid "Network"
+#~ msgstr "網路"
# type: Content of: <article><section><section><para><inlinemediaobject>
-#: debian-edu-lenny-manual.xml:45
-msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
-"png\"/> </imageobject>"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
-"png\"/> </imageobject>"
-
-# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#~ msgid ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-"
+#~ "arch.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-"
+#~ "arch.png\"/> </imageobject>"
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:49
+#: debian-edu-lenny-manual.xml:539
+#: debian-edu-lenny-manual.xml:607
+#: debian-edu-lenny-manual.xml:789
+#: debian-edu-lenny-manual.xml:865
+#: debian-edu-lenny-manual.xml:871
+#: debian-edu-lenny-manual.xml:877
+#: debian-edu-lenny-manual.xml:883
+#: debian-edu-lenny-manual.xml:889
+#: debian-edu-lenny-manual.xml:895
+#: debian-edu-lenny-manual.xml:901
+#: debian-edu-lenny-manual.xml:907
+#: debian-edu-lenny-manual.xml:913
+#: debian-edu-lenny-manual.xml:919
+#: debian-edu-lenny-manual.xml:925
+#: debian-edu-lenny-manual.xml:931
+#: debian-edu-lenny-manual.xml:937
+#: debian-edu-lenny-manual.xml:943
+#: debian-edu-lenny-manual.xml:951
+#: debian-edu-lenny-manual.xml:980
+#: debian-edu-lenny-manual.xml:1029
+#: debian-edu-lenny-manual.xml:1098
+#: debian-edu-lenny-manual.xml:1116
+#: debian-edu-lenny-manual.xml:1124
+#: debian-edu-lenny-manual.xml:1262
+#: debian-edu-lenny-manual.xml:1315
+#: debian-edu-lenny-manual.xml:1525
+#: debian-edu-lenny-manual.xml:1532
+#: debian-edu-lenny-manual.xml:1539
+#: debian-edu-lenny-manual.xml:2307
+#: debian-edu-lenny-manual.xml:2909
+#: debian-edu-lenny-manual.xml:3290
+#: debian-edu-lenny-manual.xml:3333
+#: debian-edu-lenny-manual.xml:3339
+#: debian-edu-lenny-manual.xml:3408
+#: debian-edu-lenny-manual.xml:3812
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:49 debian-edu-lenny-manual.xml:539
+#: debian-edu-lenny-manual.xml:607 debian-edu-lenny-manual.xml:789
+#: debian-edu-lenny-manual.xml:865 debian-edu-lenny-manual.xml:871
+#: debian-edu-lenny-manual.xml:877 debian-edu-lenny-manual.xml:883
+#: debian-edu-lenny-manual.xml:889 debian-edu-lenny-manual.xml:895
+#: debian-edu-lenny-manual.xml:901 debian-edu-lenny-manual.xml:907
+#: debian-edu-lenny-manual.xml:913 debian-edu-lenny-manual.xml:919
+#: debian-edu-lenny-manual.xml:925 debian-edu-lenny-manual.xml:931
+#: debian-edu-lenny-manual.xml:937 debian-edu-lenny-manual.xml:943
+#: debian-edu-lenny-manual.xml:951 debian-edu-lenny-manual.xml:980
+#: debian-edu-lenny-manual.xml:1029 debian-edu-lenny-manual.xml:1098
+#: debian-edu-lenny-manual.xml:1116 debian-edu-lenny-manual.xml:1124
+#: debian-edu-lenny-manual.xml:1262 debian-edu-lenny-manual.xml:1315
+#: debian-edu-lenny-manual.xml:1525 debian-edu-lenny-manual.xml:1532
+#: debian-edu-lenny-manual.xml:1539 debian-edu-lenny-manual.xml:2307
+#: debian-edu-lenny-manual.xml:2909 debian-edu-lenny-manual.xml:3290
+#: debian-edu-lenny-manual.xml:3333 debian-edu-lenny-manual.xml:3339
+#: debian-edu-lenny-manual.xml:3408 debian-edu-lenny-manual.xml:3812
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:49 debian-edu-lenny-manual.xml:540
#: debian-edu-lenny-manual.xml:601 debian-edu-lenny-manual.xml:753
#: debian-edu-lenny-manual.xml:871 debian-edu-lenny-manual.xml:877
@@ -151,124 +194,111 @@ msgstr ""
#: debian-edu-lenny-manual.xml:2979 debian-edu-lenny-manual.xml:3360
#: debian-edu-lenny-manual.xml:3403 debian-edu-lenny-manual.xml:3409
#: debian-edu-lenny-manual.xml:3479 debian-edu-lenny-manual.xml:3883
+<<<< 125968969722687
msgid "</inlinemediaobject>"
msgstr "</inlinemediaobject>"
# type: Content of: <article><section><section><para>
-#: debian-edu-lenny-manual.xml:51
-msgid ""
-"(The <computeroutput>debian-edu-doc </computeroutput> source package "
-"contains this image as a <computeroutput>dia </computeroutput> file.)"
-msgstr ""
-"(此 <computeroutput>debian-edu-doc </computeroutput> 的來源檔套件(source "
-"package) 中包含了這個 <computeroutput>dia </computeroutput> 檔案。)"
-
-# type: Content of: <article><section><section><para>
-#: debian-edu-lenny-manual.xml:55
-msgid ""
-"The figure is a sketch of the assumed network topology. The default setup of "
-"a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients). The number of workstations can be as "
-"large or small as you want (starting from none to a lot). The same goes for "
-"the thin-client servers, each of which is on a separate network so that the "
-"traffic between the thin-clients and the thin-client server doesn't affect "
-"the rest of the network services."
-msgstr ""
-"此圖表描述一個假想網路。Skolelinux 預設的網路設定皆假設有一個(且只有一個) "
-"main-server，並允許同時包含一般的 workstations 以及 thin-client-servers (與其"
-"管理的 thin-clients)。Workstations 的數量可依您的需求可大可小(從無到有)，對 "
-"thin-client servers 也一樣，每個 thin-clients 與 thin-client server 間的流量"
-"都分別在不同的網路上，所以不會影響到其他的網路服務。"
-
-# type: Content of: <article><section><section><para>
-#: debian-edu-lenny-manual.xml:57
-msgid ""
-"The reason that there can only be one main server in each school network is "
-"that the main server provides DHCP, and there can be only one machine doing "
-"so in each network. It is possible to move services from the main server to "
-"other machines by setting up the service on another machine, and "
-"subsequently updating the DNS-configuration, pointing the DNS alias for that "
-"service to the right computer."
-msgstr ""
-"在每個學校網路中只能有一台 main server 的原因是 main server 提供了 DHCP，而每"
-"一個網路中限制只能有一台機器提供此服務。將服務從 main server 搬到其他機器是可"
-"行的，透過在其他機器設定此服務並且跟著更新 DNS 設定，將 DNS alias 指向提供此"
-"服務的正確電腦。"
-
-# type: Content of: <article><section><section><para>
-#: debian-edu-lenny-manual.xml:59
-msgid ""
-"In order to simplify the standard setup of Skolelinux, the Internet "
-"connection runs over a separate router. It is possible to set up Debian with "
-"both a modem and an ISDN connection, however no attempt is made to make such "
-"a setup work out of the box for Skolelinux (the setup needed to adjust the "
-"default situation to this should be documented separately)."
-msgstr ""
-"為簡化 Skolelinux 標準設定，internet 的連線設定透過另外的路由器執行。將 "
-"Debian 設定為同時包含數據機及 ISDN 的連線也是可行的，但不要期望 Skolelinux 預"
-"設的設定能直接搞定(需要修改預設設定的特殊情況應另行說明)。"
-
+#~ msgid ""
+#~ "(The <computeroutput>debian-edu-doc </computeroutput> source package "
+#~ "contains this image as a <computeroutput>dia </computeroutput> file.)"
+#~ msgstr ""
+#~ "(此 <computeroutput>debian-edu-doc </computeroutput> 的來源檔套件(source "
+#~ "package) 中包含了這個 <computeroutput>dia </computeroutput> 檔案。)"
+# type: Content of: <article><section><section><para>
+#~ msgid ""
+#~ "The figure is a sketch of the assumed network topology. The default setup "
+#~ "of a Skolelinux network assumes that there is one (and only one) main-"
+#~ "server, while allowing the inclusion of both normal workstations and thin-"
+#~ "client-servers (with associated thin-clients). The number of workstations "
+#~ "can be as large or small as you want (starting from none to a lot). The "
+#~ "same goes for the thin-client servers, each of which is on a separate "
+#~ "network so that the traffic between the thin-clients and the thin-client "
+#~ "server doesn't affect the rest of the network services."
+#~ msgstr ""
+#~ "此圖表描述一個假想網路。Skolelinux 預設的網路設定皆假設有一個(且只有一個) "
+#~ "main-server，並允許同時包含一般的 workstations 以及 thin-client-servers "
+#~ "(與其管理的 thin-clients)。Workstations 的數量可依您的需求可大可小(從無到"
+#~ "有)，對 thin-client servers 也一樣，每個 thin-clients 與 thin-client "
+#~ "server 間的流量都分別在不同的網路上，所以不會影響到其他的網路服務。"
+# type: Content of: <article><section><section><para>
+#~ msgid ""
+#~ "The reason that there can only be one main server in each school network "
+#~ "is that the main server provides DHCP, and there can be only one machine "
+#~ "doing so in each network. It is possible to move services from the main "
+#~ "server to other machines by setting up the service on another machine, "
+#~ "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#~ "for that service to the right computer."
+#~ msgstr ""
+#~ "在每個學校網路中只能有一台 main server 的原因是 main server 提供了 DHCP，"
+#~ "而每一個網路中限制只能有一台機器提供此服務。將服務從 main server 搬到其他"
+#~ "機器是可行的，透過在其他機器設定此服務並且跟著更新 DNS 設定，將 DNS alias "
+#~ "指向提供此服務的正確電腦。"
+# type: Content of: <article><section><section><para>
+#~ msgid ""
+#~ "In order to simplify the standard setup of Skolelinux, the Internet "
+#~ "connection runs over a separate router. It is possible to set up Debian "
+#~ "with both a modem and an ISDN connection, however no attempt is made to "
+#~ "make such a setup work out of the box for Skolelinux (the setup needed to "
+#~ "adjust the default situation to this should be documented separately)."
+#~ msgstr ""
+#~ "為簡化 Skolelinux 標準設定，internet 的連線設定透過另外的路由器執行。將 "
+#~ "Debian 設定為同時包含數據機及 ISDN 的連線也是可行的，但不要期望 "
+#~ "Skolelinux 預設的設定能直接搞定(需要修改預設設定的特殊情況應另行說明)。"
# type: Content of: <article><section><section><section><title>
#: debian-edu-lenny-manual.xml:63
msgid "Main server (tjener)"
-msgstr ""
+msgstr "主要伺服器 (tjener)"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:65
-msgid ""
-"A Skolelinux network needs one main server (also called \"tjener\" which is "
-"Norwegian and means \"server\") which per default has the IP address "
-"10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not requiered) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
-msgstr ""
+msgid "A Skolelinux network needs one main server (also called \"tjener\" which is Norwegian and means \"server\") which per default has the IP address 10.0.2.2 and is installed by selecting the main server profile. It's possible (but not requiered) to also select and install the thin-client-server and workstation profiles in addition to the main server profile."
+msgstr "每個 Skolelinux 網路都需要一個主要伺服器 (又稱為 \"tjener\" 是挪威文 \"伺服器\" 的意思) 且 main server profile 會預設配置 IP 位置 10.0.2.2。也可以(非必要)選擇將 thin-client-server 和 workstation profiles 一同安裝在主要伺服器。"
# type: Content of: <article><section><title>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:70
+#: debian-edu-lenny-manual.xml:985
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:70 debian-edu-lenny-manual.xml:985
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:70 debian-edu-lenny-manual.xml:996
+<<<< 125968969722687
msgid "Services running on the main server"
-msgstr ""
-
-# type: Content of: <article><section><section><para>
-#: debian-edu-lenny-manual.xml:72
-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 setup on that "
-"machine first of course)."
-msgstr ""
-"除了 thin-clients 的管理外，所有的服務一開始透過一台主要的電腦(main server)負"
-"責，基於效能理由，thin-client-server 應分開安裝在不同的機器(雖然將 main "
-"server 和 thin-client server 的 profiles 都安裝在同一台機器是可能的)。所有的"
-"服務都會透過 IPv4 配與固定的 DNS 名稱。透過配與服務 DNS 名稱，使得每個服務皆"
-"可輕易的從 main server 搬到其他機器，如：先在 main-server 上停止服務，然後修"
-"改 DNS 設定，將其指到新的服務位置(當然得先在該機器上架設好服務)。"
-
-# type: Content of: <article><section><section><para>
-#: debian-edu-lenny-manual.xml:74
-msgid ""
-"To ensure security all connections where passwords are transmitted over the "
-"network are encrypted, so no passwords are send over the network as plain "
-"text."
-msgstr ""
-"為了確保安全所有透過網路傳送的密碼連結都已加密處理，所以密碼不會透過純文字傳"
-"送。"
-
+msgstr "在主要伺服器上運行的服務"
+
+# type: Content of: <article><section><section><para>
+#~ 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 setup on that machine first of course)."
+#~ msgstr ""
+#~ "除了 thin-clients 的管理外，所有的服務一開始透過一台主要的電腦(main "
+#~ "server)負責，基於效能理由，thin-client-server 應分開安裝在不同的機器(雖然"
+#~ "將 main server 和 thin-client server 的 profiles 都安裝在同一台機器是可能"
+#~ "的)。所有的服務都會透過 IPv4 配與固定的 DNS 名稱。透過配與服務 DNS 名稱，"
+#~ "使得每個服務皆可輕易的從 main server 搬到其他機器，如：先在 main-server 上"
+#~ "停止服務，然後修改 DNS 設定，將其指到新的服務位置(當然得先在該機器上架設好"
+#~ "服務)。"
+# type: Content of: <article><section><section><para>
+#~ msgid ""
+#~ "To ensure security all connections where passwords are transmitted over "
+#~ "the network are encrypted, so no passwords are send over the network as "
+#~ "plain text."
+#~ msgstr ""
+#~ "為了確保安全所有透過網路傳送的密碼連結都已加密處理，所以密碼不會透過純文字"
+#~ "傳送。"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:76
-msgid ""
-"Below is a list of the services that are set up by default in a Skolelinux "
-"network, with the DNS name of each service given in square brackets. If "
-"possible all configuration files will refer to the service by name (without "
-"the domain name) thus making it easy for schools to change either their "
-"domain (if they have an own DNS domain) or the IP addresses they use."
-msgstr ""
+msgid "Below is a list of the services that are set up by default in a Skolelinux network, with the DNS name of each service given in square brackets. If possible all configuration files will refer to the service by name (without the domain name) thus making it easy for schools to change either their domain (if they have an own DNS domain) or the IP addresses they use."
+msgstr "下列為 Skolelinux 網路預設服務清單，包含每個服務的 DNS 名稱。盡可能的直接使用服務名稱(不包含網域名稱)。如此可以方便學校日後改變網域名稱(如學校合併或改組後，網域名稱的改變)或者 IP 位置改變。"
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:78
@@ -276,12 +306,6 @@ msgid "Centralized Logging [syslog]"
msgstr "集中登入 [syslog]"
# type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-lenny-manual.xml:81
-#, fuzzy
-msgid "DNS (PowerDNS) [domain]"
-msgstr "DNS (Bind) [domain]"
-
-# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:84
msgid "Automatic Network Configuration of Machines (DHCP) [bootps]"
msgstr "自動網路配置 (DHCP) [bootps]"
@@ -344,169 +368,113 @@ msgstr "自動配置 [cfengine]"
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:120
msgid "Thin Client Server/s (LTSP) [ltspserver\\#]"
-msgstr ""
+msgstr "Thin Client 伺服器/s (LTSP) [ltspserver\\#]"
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:123
-msgid ""
-"Machine and Service Surveillance with Error Reporting, plus Status and "
-"History on the Web. Error Reporting by E-mail (munin,nagios and site-summary)"
-msgstr ""
+msgid "Machine and Service Surveillance with Error Reporting, plus Status and History on the Web. Error Reporting by E-mail (munin,nagios and site-summary)"
+msgstr "機器與服務看顧，包含透過 Email 的錯誤自動回報機制(munin,nagios 和 site-summary)，與透過網頁查看狀態和過往紀錄。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:127
-msgid ""
-"Each user stores his personal files in his home folder which is made "
-"available by the server. Home folders are accessible from all machines, "
-"giving users access to the same files regardless of which machine they are "
-"using. The server is operating system agnostic in offering access using NFS "
-"for Unix Clients, SMB for Windows and Macintosh clients."
-msgstr ""
+msgid "Each user stores his personal files in his home folder which is made available by the server. Home folders are accessible from all machines, giving users access to the same files regardless of which machine they are using. The server is operating system agnostic in offering access using NFS for Unix Clients, SMB for Windows and Macintosh clients."
+msgstr "每個使用者皆透過伺服器，存放位於家目錄的私人資料。不論使用者使用哪一個機器，皆可相同的存取自己家目錄中的資料。且伺服器接受各式作業系統，針對 Unix 用戶端採用 NFS，對 Windows 及 Macintosh 用戶端採用 SMB。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:129
-msgid ""
-"By default e-mail is set up for local delivery (i.e. within the school) "
-"only, though e-mail delivery to the wider Internet may be set up if the "
-"school has a fixed 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 access "
-"their personal mail through either POP3 or IMAP."
-msgstr ""
+msgid "By default e-mail is set up for local delivery (i.e. within the school) only, though e-mail delivery to the wider Internet may be set up if the school has a fixed 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 access their personal mail through either POP3 or IMAP."
+msgstr "電子郵件預設僅為本地端使用(如：校內)，若學校有固定網路連線，可以設定提供與 Internet 互通的電子郵件服務。通訊論壇的設定倚賴使用者資料庫狀態，每堂課程都有各自的通訊論壇。用戶端設定(透過 'smarthost')方式將郵件送達伺服器端，且使用者可以透過 POP3 或 IMAP 方式存取私人郵件。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:131
-msgid ""
-"All services are accessible using the same username and password, thanks to "
-"the central user database for authentication and authorization."
-msgstr ""
+msgid "All services are accessible using the same username and password, thanks to the central user database for authentication and authorization."
+msgstr "透過中央使用者資料庫與認證方式，所有的服務皆可使用單一帳號存取。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:133
-msgid ""
-"To increase performance on frequently accessed sites a web proxy that caches "
-"files locally (Squid) is used. In conjunction with blocking web-traffic in "
-"the router this also enables control of Internet access on individual "
-"machines."
-msgstr ""
+msgid "To increase performance on frequently accessed sites a web proxy that caches files locally (Squid) is used. In conjunction with blocking web-traffic in the router this also enables control of Internet access on individual machines."
+msgstr "透過 web proxy (Squid) 將常存取的資料暫存在本地端以增加網路存取效能，並配合用來管理與過濾用戶端網路存取與過濾特定不良內容網站。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:135
-msgid ""
-"Network configuration on the clients is done automatically using DHCP. "
-"Normal clients are allocated IP addresses in the private subnet 10.0.2.0/23, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the seperate subnet 192.168.0.0/24 (this to ensure that the network traffic "
-"of the thin clients doesn't interfere with the rest of the network services)."
-msgstr ""
+msgid "Network configuration on the clients is done automatically using DHCP. Normal clients are allocated IP addresses in the private subnet 10.0.2.0/23, while thin clients are connected to the corresponding thin-client-server via the seperate subnet 192.168.0.0/24 (this to ensure that the network traffic of the thin clients doesn't interfere with the rest of the network services)."
+msgstr "用戶端的網路透過 DHCP 自動設定，一般用戶端會分配到 private subnet 10.0.2.0/23，thin clients 透過不同的 subnet 192.168.0.0/24 連到 thin-client-server (這是為了確保 thin clients 的網路流量不會干擾其他的網路服務)。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:137
-msgid ""
-"Centralized logging is set up so that all machines send their syslog "
-"messages to the server. The syslog service is set up so that it only accepts "
-"incoming messages from the local network."
-msgstr ""
+msgid "Centralized logging is set up so that all machines send their syslog messages to the server. The syslog service is set up so that it only accepts incoming messages from the local network."
+msgstr "集中式的紀錄服務，所有機器皆將 syslog 訊息傳送到伺服器上。且 syslog 服務設定只接受來自內部網路的訊息。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:139
-msgid ""
-"By default the DNS server is set up with a domain for internal use only (*."
-"intern), until a real (\"external\") DNS domain can be set up. The DNS "
-"server is set up as caching DNS server so that all machines on the network "
-"can use it as the main DNS Server."
-msgstr ""
+msgid "By default the DNS server is set up with a domain for internal use only (*.intern), until a real (\"external\") DNS domain can be set up. The DNS server is set up as caching DNS server so that all machines on the network can use it as the main DNS Server."
+msgstr "DNS 預設僅設定給內部使用(*.intern)，除非有個真實的 (\"external\") DNS 網域名稱可以使用。且 DNS 服務設定為 caching DNS 模式，如此所有的內部機器皆可將之指定為主要 DNS 伺服器。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:141
-msgid ""
-"Pupils and teachers have the possibility to publish websites. The web server "
-"provides mechanisms for authenticating users, and for limiting access to "
-"individual pages and subdiretories to certain users and groups. Users will "
-"have the possibility to create dynamic web pages, as the web server will be "
-"programmable on the server side."
-msgstr ""
+msgid "Pupils and teachers have the possibility to publish websites. The web server provides mechanisms for authenticating users, and for limiting access to individual pages and subdiretories to certain users and groups. Users will have the possibility to create dynamic web pages, as the web server will be programmable on the server side."
+msgstr "學生與教師皆可以發佈網站，網頁伺服器提供使用者認證機制，可依使用者名稱或群組，個別限制頁面或是子目錄的存取。且伺服器端提供使用者建立動態網頁的能力。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:143
-msgid ""
-"Information on users and machines can be changed in one central location, "
-"and is made accessible to all computers on the network automatically. To "
-"achieve this a centralized directory server is set up. The directory will "
-"have information on users, user groups, machines, and groups of machines. To "
-"avoid user confusion there won't be any difference between file groups, "
-"mailing lists, and network groups. This implies that groups of machines "
-"which have to be network groups, have the same namespace as user groups and "
-"mailing lists."
-msgstr ""
+msgid "Information on users and machines can be changed in one central location, and is made accessible to all computers on the network automatically. To achieve this a centralized directory server is set up. The directory will have information on users, user groups, machines, and groups of machines. To avoid user confusion there won't be any difference between file groups, mailing lists, and network groups. This implies that groups of machines which have to be network groups, have the same namespace as user groups and mailing lists."
+msgstr "使用者與機器的資料可以在一個集中的位置修改，並自動對整個網路生效。位達到此效果，有個集中的目錄服務，目錄服務內包含使用者名稱、群組、主機與主機群。避免使用者誤解，無論是檔案群組、通訊論壇和網路群組間皆為相同名稱。這意味著機器群組間需為相同的網路群組，且與使用者群組及通訊論壇使用一致的名稱命名。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:145
-msgid ""
-"Administration of services and users will by and large be via web, and "
-"follow established standards, functioning well in the web browsers which are "
-"part of Skolelinux. The delegation of certain tasks to individual users or "
-"user groups will be made possible by the administration systems."
-msgstr ""
+msgid "Administration of services and users will by and large be via web, and follow established standards, functioning well in the web browsers which are part of Skolelinux. The delegation of certain tasks to individual users or user groups will be made possible by the administration systems."
+msgstr "服務與使用者的管理皆可透過網頁操作，透過 Skolelinux 內建符合標準的網頁瀏覽器存取即可。透過管理系統可以對個別使用者或群組進行管理。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:147
-msgid ""
-"In order to avoid certain problems with NFS, and to make it simpler to debug "
-"problems, time needs to be synchronized on the different machines. To "
-"achieve this the Skolelinux server is set up as a local Network Time "
-"Protocol (NTP) server, and all workstations and clients are set up to "
-"synchronize their clock with the server. The server itself should "
-"synchronize its clock via NTP against machines on the Internet, thus "
-"ensuring the whole network has the correct time."
-msgstr ""
+msgid "In order to avoid certain problems with NFS, and to make it simpler to debug problems, time needs to be synchronized on the different machines. To achieve this the Skolelinux server is set up as a local Network Time Protocol (NTP) server, and all workstations and clients are set up to synchronize their clock with the server. The server itself should synchronize its clock via NTP against machines on the Internet, thus ensuring the whole network has the correct time."
+msgstr "位避免 NFS 潛在問題以及除錯方便，所有機器間的時間必需要同步。為了達到此效果，Skolelinux 伺服器上提供了 Network Time Protocal (NTP) 給本地網路，所有的 workstations 及用戶端皆設定回自動與伺服器對時。伺服器自己則需透過網路與其他 NTP 對時，以確保整個網路有一致且正確的時間。"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:149
-msgid ""
-"Printers are connected where convenient, either directly onto the network, "
-"or connected to a server, workstation or thin-client-server. Access to "
-"printers can be controlled for individual users according to the groups they "
-"belong to, this will be achieved by using quota and access control for "
-"printers."
-msgstr ""
+msgid "Printers are connected where convenient, either directly onto the network, or connected to a server, workstation or thin-client-server. Access to printers can be controlled for individual users according to the groups they belong to, this will be achieved by using quota and access control for printers."
+msgstr "印表機可透過任何方便的方式連接，無論是直接連上網路、或是接到一台伺服器、workstation 或者是 thin-client-server 上。透過 quota 及 access control 可以控制個別使用者或群組對印表機的存取。"
# type: Content of: <article><section><section><section><title>
#: debian-edu-lenny-manual.xml:154
msgid "LTSP server(s) (Thin client server(s))"
-msgstr ""
+msgstr "LTSP 伺服器(群) (Thin client server(s))"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:156
-msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the LTSP server profile."
-msgstr ""
+msgid "A Skolelinux network can have many LTSP servers (also called thin client servers), which are installed by selecting the LTSP server profile."
+msgstr "Skolelinux 網路允許有很多個 LTSP 伺服器(又稱為 thin client servers)，可透過選取 LTSP server profile 來安裝。"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:158
-msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
-msgstr ""
+msgid "The thin client servers are set up to receive syslog from the thin clients, and forward these messages to the central syslog recipient."
+msgstr "Thin client server 預設接受來自 thin clients 的 syslogs 並將之轉發給 syslog 集中收集位置。"
# type: Content of: <article><section><section><section><title>
#: debian-edu-lenny-manual.xml:163
msgid "Thin clients"
-msgstr ""
+msgstr "Thin clients"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:165
-msgid ""
-"A thin client setup enables a ordinary PC to function as an (X-)terminal. "
-"This means that this machine boots from a diskette or directly from the "
-"server using network-PROM (or PXE) without using the local client hard "
-"drive. The thin client setup used is that of the Linux Terminal Server "
-"Project (LTSP)."
-msgstr ""
+msgid "A thin client setup enables a ordinary PC to function as an (X-)terminal. This means that this machine boots from a diskette or directly from the server using network-PROM (or PXE) without using the local client hard drive. The thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+msgstr "Thin client 將一般的 PC 配置為 X 終端機運作，且可透過磁碟或者無碟直接透過 network-PROM (或 PXE) 從伺服器上開機。Thin client 的設定透過 Linux Terminal Server Project (LTSP) 完成。"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:167
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+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 X11 is started and connected to the same LTSP-server by XDMCP, thus ensuring that all programs are run on the LTSP-server."
+msgstr "Thin clients 是個非常好且有效率的方法將程式在 LTSP-Server 上運作，來繼續使用較舊或較慢的機器。這運作方式：透過 DHCP 及 TFTP 連接與從網路開機，接著透過 NFS 掛載 LTSP-Server 上的檔案系統，最後再啟動 X11 透過 XDMCP 連上 LTSP-Server，如此所有的程式皆在 LTSP-Server 上運行。"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+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 X11 is started and connected to the same LTSP-server by XDMCP, thus "
+"ensuring that all programs are run on the LTSP-server."
+msgstr ""
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
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 "
@@ -518,6 +486,7 @@ msgid ""
"can be set to the behaviour from former versions: use direct X connection "
"via XDMCP."
msgstr ""
+<<<< 125968969722687
# type: Content of: <article><section><section><section><title>
#: debian-edu-lenny-manual.xml:172
@@ -526,35 +495,35 @@ msgstr "無碟工作站"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:174
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "For diskless workstations the terms stateless workstations, lowfat clients or half-thick clients are also used."
+msgstr "無碟 workstations、lowfat clients 或 half-thick clients 也如此運作。"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"For diskless workstations the terms stateless workstations, lowfat clients "
+"or half-thick clients are also used."
+msgstr ""
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"For diskless workstations the terms \"stateless workstations\", \"lowfat "
"clients\" or \"half-thick clients\" are also used. For the sake of clarity "
"this manual sticks to the term \"diskless workstations\"."
msgstr ""
+<<<< 125968969722687
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:176
-msgid ""
-"A diskless workstation runs all software on the PC without a locally "
-"installed operating system. This means that client machines boot direcly "
-"from the servers hard drive without running software installed on a local "
-"hard drive."
-msgstr ""
+msgid "A diskless workstation runs all software on the PC without a locally installed operating system. This means that client machines boot direcly from the servers hard drive without running software installed on a local hard drive."
+msgstr "無碟 workstation 無須本地端安裝作業系統即可在本機上運行所有程式。這表示用戶端機器直接從伺服器的磁碟開機，直接在本地端執行安裝在伺服器磁碟上的程式。"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:178
-msgid ""
-"Diskless workstations are an exellent way of reusing newer hardware with the "
-"same low maintanence cost as with thin clients. Software is administered and "
-"maintained on the server with no need for local installed software on the "
-"clients. Home directories and system settings are stored on the server too."
-msgstr ""
+msgid "Diskless workstations are an exellent way of reusing newer hardware with the same low maintanence cost as with thin clients. Software is administered and maintained on the server with no need for local installed software on the clients. Home directories and system settings are stored on the server too."
+msgstr "無碟 workstations 是個非常好的方法，在相較與 thin client 相同的低維護成本下重複使用較新的硬體。軟體的管理與維護皆在伺服器端，不需在任何用戶端本地安裝軟體。家目錄和系統設定也相同的存放在 server 端。"
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:180
-msgid ""
-"Diskless workstations were introduced as part of the Linux Terminal Server "
-"Project (LTSP) with version 5.0."
+msgid "Diskless workstations were introduced as part of the Linux Terminal Server Project (LTSP) with version 5.0."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -564,10 +533,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:187
-msgid ""
-"The term \"networked clients\" is used in this manual to refer to both thin "
-"clients and diskless workstations as well as computers running MacOS or "
-"Windows."
+msgid "The term \"networked clients\" is used in this manual to refer to both thin clients and diskless workstations as well as computers running MacOS or Windows."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -577,32 +543,28 @@ msgstr "管理者"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:195
-msgid ""
-"All the linux machines that are installed by means of a Skolelinux CD or DVD "
-"will be administrable from a central computer, most likely the server. It "
-"will be possible to login to all machines by ssh, and thereby have full "
-"access to the machines"
+msgid "All the linux machines that are installed by means of a Skolelinux CD or DVD will be administrable from a central computer, most likely the server. It will be possible to login to all machines by ssh, and thereby have full access to the machines"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:197
-msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automatation "
-"distribute the changes."
+msgid "We use cfengine to edit configuration files. These files are updated from the server to the clients. In order to change the client configuration, it suffices to edit the server configuration and let the automatation distribute the changes."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:199
-msgid ""
-"All user information is kept in an LDAP directory. Updates of user accounts "
-"are made against this database and is used by the clients for user "
-"authentication."
+msgid "All user information is kept in an LDAP directory. Updates of user accounts are made against this database and is used by the clients for user authentication."
msgstr ""
# type: Content of: <article><section><title>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:204
+#: debian-edu-lenny-manual.xml:589
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:204 debian-edu-lenny-manual.xml:589
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:204 debian-edu-lenny-manual.xml:590
+<<<< 125968969722687
msgid "Installation"
msgstr "安裝"
@@ -613,20 +575,12 @@ msgstr "可以透過CD或DVD來安裝"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:208
-msgid ""
-"The aim is to be able to install a server from CD/DVD, and install clients "
-"over the network by booting all other machines from the network. The DVD "
-"installation works without access to the Internet."
+msgid "The aim is to be able to install a server from CD/DVD, and install clients over the network by booting all other machines from the network. The DVD installation works without access to the Internet."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:210
-msgid ""
-"The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a centrally "
-"location by the system administrator subsequent to the installation."
+msgid "The installation should not ask any questions, with the exception of desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, workstation, thin client server). All other configuration will be set up automatically with reasonable values, to be changed from a centrally location by the system administrator subsequent to the installation."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -636,89 +590,37 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:217
-msgid ""
-"Each Skolelinux user account is assigned a section of the file system on the "
-"file server. This section (home directory) contains the user's configuration "
-"files, documents, email and web pages. Some of the files should be set to "
-"have read access for other users on the system, some should be readable by "
-"everyone on the internet, and some should not be accessible for reading by "
-"anyone but the user."
+msgid "Each Skolelinux user account is assigned a section of the file system on the file server. This section (home directory) contains the user's configuration files, documents, email and web pages. Some of the files should be set to have read access for other users on the system, some should be readable by everyone on the internet, and some should not be accessible for reading by anyone but the user."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:219
-msgid ""
-"To ensure that all disks that are used for user directories or shared "
-"directories can be uniquely named across all the computers in the "
-"installation, they can be mounted as <computeroutput>/skole/host/directory/ "
-"</computeroutput>. Initially, one directory is created on the file server, "
-"<computeroutput>/skole/tjener/home0/ </computeroutput>, in which all the "
-"user accounts are created. More directories may then be created when needed, "
-"to accomodate particular user groups or particular patterns of usage."
+msgid "To ensure that all disks that are used for user directories or shared directories can be uniquely named across all the computers in the installation, they can be mounted as <computeroutput>/skole/host/directory/ </computeroutput>. Initially, one directory is created on the file server, <computeroutput>/skole/tjener/home0/ </computeroutput>, in which all the user accounts are created. More directories may then be created when needed, to accomodate particular user groups or particular patterns of usage."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:223
-msgid ""
-"To enable shared file access control using the file groups, each user must "
-"be assigned a primary group with no other members. The name of this private "
-"group should be identical to the username. (<ulink url=\"http://www.redhat."
-"com/docs/manuals/linux/RHL-9-Manual/ref-guide/s1-users-groups-private-groups."
-"html\">More info on private groups </ulink> is available from Redhat.) This "
-"allows for all new files created by the user to be set with full access for "
-"the file's group. Together with set-gid bit on directories and inheritance "
-"of rights, this enables controlled file sharing between the members of a "
-"file group. Therefore, the users' umask should be 00X. (If all users "
-"initially should be able to read newly created files, then X=2. If only the "
-"relevant group should be given initial read access then X=7.)"
+msgid "To enable shared file access control using the file groups, each user must be assigned a primary group with no other members. The name of this private group should be identical to the username. (<ulink url=\"http://www.redhat.com/docs/manuals/linux/RHL-9-Manual/ref-guide/s1-users-groups-private-groups.html\">More info on private groups </ulink> is available from Redhat.) This allows for all new files created by the user to be set with full access for the file's group. Together with set-gid bit on directories and inheritance of rights, this enables controlled file sharing between the members of a file group. Therefore, the users' umask should be 00X. (If all users initially should be able to read newly created files, then X=2. If only the relevant group should be given initial read access then X=7.)"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:226
-msgid ""
-"The initial access settings for newly created files is a matter of policy. "
-"They may either be set to give read access to everybody, which can later be "
-"removed by explicit user action, or they may be initially blocked, "
-"necessitating user action to make them accessible. The first approach "
-"encourages knowledge sharing, and makes the system more transparent, whereas "
-"the second method decreases the risk of unwanted spreading of sensitive "
-"information. The problem with the first solution is that it is not apparent "
-"to the users that the material they create will be accessible to all other "
-"users. This is detectable only upon inspection of other users' directories, "
-"where one can see that the files are readable. The problem with the second "
-"solution is that few people are likely to make their files accessible, even "
-"if they do not contain sensitive information and the content would be "
-"helpful to inquisitive users who want to learn how others have solved "
-"particular problems (typically configuration issues)."
+msgid "The initial access settings for newly created files is a matter of policy. They may either be set to give read access to everybody, which can later be removed by explicit user action, or they may be initially blocked, necessitating user action to make them accessible. The first approach encourages knowledge sharing, and makes the system more transparent, whereas the second method decreases the risk of unwanted spreading of sensitive information. The problem with the first solution is that it is not apparent to the users that the material they create will be accessible to all other users. This is detectable only upon inspection of other users' directories, where one can see that the files are readable. The problem with the second solution is that few people are likely to make their files accessible, even if they do not contain sensitive information and the content would be helpful to inquisitive users who want to learn how others have solved particular problems (typically configuration issues)."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:228
-msgid ""
-"Suggestion: The files are initially set to be readable by all, but "
-"particular directories are created in which the content is initially "
-"blocked. This will simplify deciding whether the file should be made "
-"readable or not. Concretely, umask should be set to 002, and "
-"<computeroutput>~/ </computeroutput> created with privileges 0775, "
-"<computeroutput>~/priv/ </computeroutput> given 0750,and <computeroutput>~/"
-"pub/ </computeroutput> given 0775. Files that should not be readable by "
-"others should be put in <computeroutput>~/priv/ </computeroutput>, whereas "
-"public files will be put in <computeroutput>~/pub/ </computeroutput>. Other "
-"files will initially be accessible, but may be blocked as needed."
+msgid "Suggestion: The files are initially set to be readable by all, but particular directories are created in which the content is initially blocked. This will simplify deciding whether the file should be made readable or not. Concretely, umask should be set to 002, and <computeroutput>~/ </computeroutput> created with privileges 0775, <computeroutput>~/priv/ </computeroutput> given 0750,and <computeroutput>~/pub/ </computeroutput> given 0775. Files that should not be readable by others should be put in <computeroutput>~/priv/ </computeroutput>, whereas public files will be put in <computeroutput>~/pub/ </computeroutput>. Other files will initially be accessible, but may be blocked as needed."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:235
-msgid ""
-"ssh requires that the home directory can only be written to by the owner, "
-"thus the maximum access privilege for <computeroutput>~/ </computeroutput> "
-"is 755."
+msgid "ssh requires that the home directory can only be written to by the owner, thus the maximum access privilege for <computeroutput>~/ </computeroutput> is 755."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:238
-msgid ""
-"- access to home directories (*~/.)? - home directories - shared directories?"
+msgid "- access to home directories (*~/.)? - home directories - shared directories?"
msgstr ""
# type: Content of: <article><section><section><title>
@@ -728,23 +630,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:247
-msgid ""
-"These are random notes concerning things which should be included in this "
-"document."
+msgid "These are random notes concerning things which should be included in this document."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:249
-msgid ""
-"Centralized user database with grouping and the ability to control which "
-"groups have access to which machines."
+msgid "Centralized user database with grouping and the ability to control which groups have access to which machines."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:252
-msgid ""
-"Grouping of machines and ability to control access to network services for "
-"these groups (access blocking to Internet via squid)"
+msgid "Grouping of machines and ability to control access to network services for these groups (access blocking to Internet via squid)"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -754,13 +650,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:259
-msgid ""
-"<emphasis role=\"strong\">This chapter was initially copied and pasted from "
-"<ulink url=\"http://developer.skolelinux.no/arkitektur/arkitektur.html.en\"/"
-"> ( at that time it was Copyright © 2001, 2002, 2003, 2004 Petter "
-"Reinholdtsen < <ulink url=\"mailto:pere at hungry.com\">pere at hungry.com </"
-"ulink> >, released under the GPL) and has since then beed edited. </"
-"emphasis>"
+msgid "<emphasis role=\"strong\">This chapter was initially copied and pasted from <ulink url=\"http://developer.skolelinux.no/arkitektur/arkitektur.html.en\"/> ( at that time it was Copyright © 2001, 2002, 2003, 2004 Petter Reinholdtsen < <ulink url=\"mailto:pere at hungry.com\">pere at hungry.com </ulink> >, released under the GPL) and has since then beed edited. </emphasis>"
msgstr ""
# type: Content of: <article><section><title>
@@ -770,12 +660,39 @@ msgstr ""
# type: Content of: <article><section><section><title>
#: debian-edu-lenny-manual.xml:271
-msgid ""
-"New features in the Debian Edu 5.0.3+edu0 Codename \"Lenny\" release "
-"2009-??-??"
+msgid "New features in the Debian Edu 5.0.3+edu0 Codename \"Lenny\" release 2009-??-??"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:273
+#: debian-edu-lenny-manual.xml:591
+#: debian-edu-lenny-manual.xml:1264
+#: debian-edu-lenny-manual.xml:1291
+#: debian-edu-lenny-manual.xml:1327
+#: debian-edu-lenny-manual.xml:1422
+#: debian-edu-lenny-manual.xml:1514
+#: debian-edu-lenny-manual.xml:2225
+#: debian-edu-lenny-manual.xml:2423
+#: debian-edu-lenny-manual.xml:2812
+#: debian-edu-lenny-manual.xml:2846
+#: debian-edu-lenny-manual.xml:2862
+#: debian-edu-lenny-manual.xml:2880
+#: debian-edu-lenny-manual.xml:2887
+#: debian-edu-lenny-manual.xml:3256
+#: debian-edu-lenny-manual.xml:3271
+#: debian-edu-lenny-manual.xml:3804
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:273 debian-edu-lenny-manual.xml:591
+#: debian-edu-lenny-manual.xml:1264 debian-edu-lenny-manual.xml:1291
+#: debian-edu-lenny-manual.xml:1327 debian-edu-lenny-manual.xml:1422
+#: debian-edu-lenny-manual.xml:1514 debian-edu-lenny-manual.xml:2225
+#: debian-edu-lenny-manual.xml:2423 debian-edu-lenny-manual.xml:2812
+#: debian-edu-lenny-manual.xml:2846 debian-edu-lenny-manual.xml:2862
+#: debian-edu-lenny-manual.xml:2880 debian-edu-lenny-manual.xml:2887
+#: debian-edu-lenny-manual.xml:3256 debian-edu-lenny-manual.xml:3271
+#: debian-edu-lenny-manual.xml:3804
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:273 debian-edu-lenny-manual.xml:963
#: debian-edu-lenny-manual.xml:1126 debian-edu-lenny-manual.xml:1321
#: debian-edu-lenny-manual.xml:1336 debian-edu-lenny-manual.xml:1428
@@ -785,25 +702,18 @@ msgstr ""
#: debian-edu-lenny-manual.xml:2932 debian-edu-lenny-manual.xml:2950
#: debian-edu-lenny-manual.xml:2957 debian-edu-lenny-manual.xml:3326
#: debian-edu-lenny-manual.xml:3341 debian-edu-lenny-manual.xml:3875
-msgid ""
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/alert.png\" depth=\"15\"/> </imageobject>"
+<<<< 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/alert.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:277
-msgid ""
-"</inlinemediaobject> FIXME: describe new features in 5.0.3+edu0 here and set "
-"the correct release date."
+msgid "</inlinemediaobject> FIXME: describe new features in 5.0.3+edu0 here and set the correct release date."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:280
-msgid ""
-"Everything what is new in Debian 5.0.3, see the <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Documentation/Lenny/"
-"Features#NewfeaturesintheDebian5.0.3onwhichDebianEdu5.0.3.2B-edu0isbased"
-"\">following paragraph </ulink> for details."
+msgid "Everything what is new in Debian 5.0.3, see the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/Features#NewfeaturesintheDebian5.0.3onwhichDebianEdu5.0.3.2B-edu0isbased\">following paragraph </ulink> for details."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -813,25 +723,17 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:287
-msgid ""
-"If the main-server profile is selected together with the thin-client-server "
-"profile, diskless workstations and thin-clients are enabled."
+msgid "If the main-server profile is selected together with the thin-client-server profile, diskless workstations and thin-clients are enabled."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:289
-msgid ""
-"if the thin-client-server profile is selected along, only thin-clients are "
-"enabled."
+msgid "if the thin-client-server profile is selected along, only thin-clients are enabled."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:294
-msgid ""
-"The configuration for DNS and DHCP is stored in LDAP and can be edited using "
-"<computeroutput>lwat </computeroutput>. The DNS server has been switched "
-"from <computeroutput>bind9 </computeroutput> to <computeroutput>power-dns </"
-"computeroutput>."
+msgid "The configuration for DNS and DHCP is stored in LDAP and can be edited using <computeroutput>lwat </computeroutput>. The DNS server has been switched from <computeroutput>bind9 </computeroutput> to <computeroutput>power-dns </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -846,32 +748,22 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:307
-msgid ""
-"Multi arch (amd64/i386) installer DVD which is captable of installing "
-"without network."
+msgid "Multi arch (amd64/i386) installer DVD which is captable of installing without network."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:310
-msgid ""
-"Add GNOME as supported desktop ( FIXME: describe how to install with gnome "
-"instead of the default, KDE), add experimental support for the Sugar desktop "
-"environment."
+msgid "Add GNOME as supported desktop ( FIXME: describe how to install with gnome instead of the default, KDE), add experimental support for the Sugar desktop environment."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:314
-msgid ""
-"<computeroutput>killer </computeroutput> is not enabled per default anymore. "
-"Read the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"HowTo/Administration#Automaticcleanupofleft-overprocess\">general "
-"administration HowTo </ulink> to learn how to enable it."
+msgid "<computeroutput>killer </computeroutput> is not enabled per default anymore. Read the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/Administration#Automaticcleanupofleft-overprocess\">general administration HowTo </ulink> to learn how to enable it."
msgstr ""
# type: Content of: <article><section><section><title>
#: debian-edu-lenny-manual.xml:323
-msgid ""
-"New features in the Debian 5.0.3 on which Debian Edu 5.0.3+edu0 is based"
+msgid "New features in the Debian 5.0.3 on which Debian Edu 5.0.3+edu0 is based"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -881,15 +773,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:328
-msgid ""
-"With this release, Debian GNU/Linux updates from X.Org 7.1 to X.Org 7.3 "
-"(which includes support of newer hardware) and now includes the desktop "
-"environments KDE 3.5.10 and GNOME 2.22. <ulink url=\"http://wiki.debian.org/"
-"OpenOffice#\">OpenOffice </ulink>.org 2.4.1 Updates of other desktop "
-"applications include iceweasel (version 3.0.6, which is the unbranded "
-"Firefox web browser) and icedove (version 2.0.0.19, which is the unbranded "
-"Thunderbird mail client) as well as upgrades to Evolution 2.22.3 and Pidgin "
-"2.4.3 (formerly known as Gaim)."
+msgid "With this release, Debian GNU/Linux updates from X.Org 7.1 to X.Org 7.3 (which includes support of newer hardware) and now includes the desktop environments KDE 3.5.10 and GNOME 2.22. <ulink url=\"http://wiki.debian.org/OpenOffice#\">OpenOffice </ulink>.org 2.4.1 Updates of other desktop applications include iceweasel (version 3.0.6, which is the unbranded Firefox web browser) and icedove (version 2.0.0.19, which is the unbranded Thunderbird mail client) as well as upgrades to Evolution 2.22.3 and Pidgin 2.4.3 (formerly known as Gaim)."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -904,16 +788,12 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:341
-msgid ""
-"Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+msgid "Much improved documentation with updated translations to German, Norwegian Bokmal and Italian"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:344
-msgid ""
-"Includes more than 40 bug fixes, improvements and security updates that came "
-"to our attentention after the 3.0r0 release"
+msgid "Includes more than 40 bug fixes, improvements and security updates that came to our attentention after the 3.0r0 release"
msgstr ""
# type: Content of: <article><section><section><title>
@@ -1003,10 +883,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:403
-msgid ""
-"New processor architectures: amd64 (fully supported) and powerpc "
-"(experimental support, installation media only boots on the newworld "
-"subarchitecture)"
+msgid "New processor architectures: amd64 (fully supported) and powerpc (experimental support, installation media only boots on the newworld subarchitecture)"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1016,29 +893,17 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:409
-msgid ""
-"Regression: the CD-install requires Internet access during installation. "
-"Previous versions could be installed from one CD without Internet access."
+msgid "Regression: the CD-install requires Internet access during installation. Previous versions could be installed from one CD without Internet access."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:412
-msgid ""
-"Regression: <computeroutput>webmin </computeroutput> is now removed from "
-"Debian because of problems supporting it. We've added a new web based user "
-"administration tool named <computeroutput>lwat </computeroutput>, which "
-"doesn't has the same functionality as <computeroutput>wlus </"
-"computeroutput>, the old user administration tool. But <computeroutput>wlus "
-"</computeroutput> requires <computeroutput>webmin </computeroutput>."
+msgid "Regression: <computeroutput>webmin </computeroutput> is now removed from Debian because of problems supporting it. We've added a new web based user administration tool named <computeroutput>lwat </computeroutput>, which doesn't has the same functionality as <computeroutput>wlus </computeroutput>, the old user administration tool. But <computeroutput>wlus </computeroutput> requires <computeroutput>webmin </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:420
-msgid ""
-"Regression: swi-prolog is not part of etch, but was part of sarge. The "
-"<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Etch/HowTo/"
-"TeachAndLearn#\">HowTo teach and learn </ulink> Chapter describes how to "
-"install swi-prolog on etch."
+msgid "Regression: swi-prolog is not part of etch, but was part of sarge. The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Etch/HowTo/TeachAndLearn#\">HowTo teach and learn </ulink> Chapter describes how to install swi-prolog on etch."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -1103,9 +968,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:469
-msgid ""
-"More information on the older releases can be found at <ulink url=\"http://"
-"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+msgid "More information on the older releases can be found at <ulink url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
msgstr ""
# type: Content of: <article><section><title>
@@ -1115,12 +978,23 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:477
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "There are different ways of set up a Skolelinux solution. It can be installed on just one standalone PC or a regional wide solution at many schools operated centrally. This variety of configurations makes a huge difference on how things are set up regarding network components, servers and client machines."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"There are different ways of set up a Skolelinux solution. It can be "
+"installed on just one standalone PC or a regional wide solution at many "
+"schools operated centrally. This variety of configurations makes a huge "
+"difference on how things are set up regarding network components, servers "
+"and client machines."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"There are different ways of setting up a Skolelinux solution. It can be "
"installed on just one standalone PC or a regional wide solution at many "
"schools operated centrally. This variety of configurations makes a huge "
"difference on how things are set up regarding network components, servers "
"and client machines."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><title>
@@ -1130,35 +1004,49 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:483
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "The purpose of the different profiles is explained in the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Etch/Architecture#\">network architecture </ulink> chapter."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"The purpose of the different profiles is explained in the <ulink url="
+"\"http://wiki.debian.org/DebianEdu/Documentation/Etch/Architecture#"
+"\">network architecture </ulink> chapter."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"The purpose of the different profiles is explained in the <ulink url="
"\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/Architecture#"
"\">network architecture </ulink> chapter."
+<<<< 125968969722687
msgstr ""
"位於 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny\"/> 的"
"版本是一個 wiki 並隨時會更新。"
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:486
-msgid ""
-"the computers running Debian Edu / Skolelinux must have either i386, amd64 "
-"or powerpc processors."
+msgid "the computers running Debian Edu / Skolelinux must have either i386, amd64 or powerpc processors."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:488
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "On powerpc, the installation media will only boot on machines of the newworld sub-architecture, which are the systems from apple with a translucent case"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"On powerpc, the installation media will only boot on machines of the "
+"newworld sub-architecture, which are the systems from apple with a "
+"translucent case"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"On powerpc, the installation media will only boot on machines of the "
"newworld sub-architecture, which are the systems from Apple with a "
"translucent case."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:493
-msgid ""
-"thin client (LTSP) servers need two network cards when using the default "
-"network architecture:"
+msgid "thin client (LTSP) servers need two network cards when using the default network architecture:"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1173,32 +1061,58 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:503
-msgid ""
-"disk space requirements depend on profiles used, but any disk larger than 10 "
-"GiB will be sufficient for a workstation installation, 15 Gib for a thin-"
-"client server and at least 30 GiB on the main server. As usual, on the main-"
-"server it's the bigger the better."
+msgid "disk space requirements depend on profiles used, but any disk larger than 10 GiB will be sufficient for a workstation installation, 15 Gib for a thin-client server and at least 30 GiB on the main server. As usual, on the main-server it's the bigger the better."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:506
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "thin clients can run on 64 MB RAM and 133 MHz processor. Recommended minimum is 128 MB RAM. Swap is required."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"thin clients can run on 64 MB RAM and 133 MHz processor. Recommended minimum "
+"is 128 MB RAM. Swap is required."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"thin clients can run on as low as 64 MiB RAM and 133 MHz processor, though "
"128 MiB RAM and somewhat faster processors are recommended."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:508
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "for workstations or standalone PCs 450 MHz, 256 MiB RAM are recommended minimum requirements"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"for workstations or standalone PCs 450 MHz, 256 MiB RAM are recommended "
+"minimum requirements"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"for running Iceweasel/Firefox and OpenOffice.org, we recommend 128 MiB RAM "
"at minimum."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:513
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "for diskless workstations (also known as stateless workstations, half-thick clients or lowfat clients) 256 MB RAM and 800 MHz are recommended minimum requirements, 512 or 1024 MB RAM is much better. Swapping over the network is automatically enabled, the swap size is 32mb, if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap size </emphasis> either locally on the pc or on the server. 512 MB swap on a 256 MB RAM diskless workstation is recommended."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"for diskless workstations (also known as stateless workstations, half-thick "
+"clients or lowfat clients) 256 MB RAM and 800 MHz are recommended minimum "
+"requirements, 512 or 1024 MB RAM is much better. Swapping over the network "
+"is automatically enabled, the swap size is 32mb, if you need more you can "
+"tune this by editing /etc/ltsp/nbdswapd.conf on tjener to set the SIZE "
+"variable. Please <emphasis>tune up the swap size </emphasis> either locally "
+"on the pc or on the server. 512 MB swap on a 256 MB RAM diskless workstation "
+"is recommended."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"for workstations or standalone PCs 450 MHz, 256 MiB RAM are recommended "
"minimum requirements"
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1210,15 +1124,37 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:518
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<emphasis role=\"strong\">1) </emphasis> Due to memory usage on the thin clients X-server when running Firefox and <ulink url=\"http://wiki.debian.org/OpenOffice#\">OpenOffice </ulink>.org, 128 MB RAM is recommended minimum."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<emphasis role=\"strong\">1) </emphasis> Due to memory usage on the thin "
+"clients X-server when running Firefox and <ulink url=\"http://wiki.debian."
+"org/OpenOffice#\">OpenOffice </ulink>.org, 128 MB RAM is recommended minimum."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"Swapping over the network is automatically enabled, the swap size is 32 MiB, "
"if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
"tjener to set the SIZE variable. Please <emphasis>tune up the swap size </"
"emphasis> either locally on the pc or on the server."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:522
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<emphasis role=\"strong\">2) </emphasis> On 256 MB RAM lowfat clients the spell checker makes <ulink url=\"http://wiki.debian.org/OpenOffice#\">OpenOffice </ulink>.org hang i the swap space is to small. Then the sys.admin has to disable the spell checker on <ulink url=\"http://wiki.debian.org/OpenOffice#\">OpenOffice </ulink>.org or students has to kill <ulink url=\"http://wiki.debian.org/OpenOffice#\">OpenOffice </ulink> losing their work. Enabling at least 512 MB swap on a 256 MB RAM diskless workstation counter this problem, and the spell checker runs smoothly."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<emphasis role=\"strong\">2) </emphasis> On 256 MB RAM lowfat clients the "
+"spell checker makes <ulink url=\"http://wiki.debian.org/OpenOffice#"
+"\">OpenOffice </ulink>.org hang i the swap space is to small. Then the sys."
+"admin has to disable the spell checker on <ulink url=\"http://wiki.debian."
+"org/OpenOffice#\">OpenOffice </ulink>.org or students has to kill <ulink url="
+"\"http://wiki.debian.org/OpenOffice#\">OpenOffice </ulink> losing their "
+"work. Enabling at least 512 MB swap on a 256 MB RAM diskless workstation "
+"counter this problem, and the spell checker runs smoothly."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"On workstations with little amount of RAM the spell checker can cause "
"OpenOffice.org to hang if the swap space is too small. Then the system "
@@ -1226,6 +1162,7 @@ msgid ""
"have to kill OpenOffice.org resulting in loss of their work. Enabling at "
"least 512 MiB swap on a 256 MiB RAM workstation solves this problem and the "
"spell checker runs smoothly."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1240,27 +1177,17 @@ msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:536
-msgid ""
-"A list of tested hardware is provided from <ulink url=\"http://wiki.debian."
-"org/DebianEdu/Hardware/\"/> . This list is not nearly complete "
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+msgid "A list of tested hardware is provided from <ulink url=\"http://wiki.debian.org/DebianEdu/Hardware/\"/> . This list is not nearly complete <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:542
-msgid ""
-"<ulink url=\"http://wiki.debian.org/InstallingDebianOn\"/> is an effort to "
-"document how to install, configure and use Debian on some specific hardware. "
-"Therefore potential buyers would know if that hardware is supported and "
-"owner would know how get the best out of that hardware."
+msgid "<ulink url=\"http://wiki.debian.org/InstallingDebianOn\"/> is an effort to document how to install, configure and use Debian on some specific hardware. Therefore potential buyers would know if that hardware is supported and owner would know how get the best out of that hardware."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:544
-msgid ""
-"An excellent database about hardware supported by Debian is online at <ulink "
-"url=\"http://kmuto.jp/debian/hcl/\"/>."
+msgid "An excellent database about hardware supported by Debian is online at <ulink url=\"http://kmuto.jp/debian/hcl/\"/>."
msgstr ""
# type: Content of: <article><section><title>
@@ -1270,17 +1197,12 @@ msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:552
-msgid ""
-"a router/gateway (IP 10.0.2.1) providing access to the internet (when using "
-"the default network architecture)"
+msgid "a router/gateway (IP 10.0.2.1) providing access to the internet (when using the default network architecture)"
msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:555
-msgid ""
-"for the main server (10.0.2.2): this is the one single computer in the "
-"network which get's the <computeroutput>tjener </computeroutput>-profile "
-"installed"
+msgid "for the main server (10.0.2.2): this is the one single computer in the network which get's the <computeroutput>tjener </computeroutput>-profile installed"
msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
@@ -1300,43 +1222,37 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:570
-msgid ""
-"A router/gateway, connected to the internet on the external interface and "
-"running on the IP address 10.0.2.1 on the internal interface, is needed to "
-"connect to the internet."
+msgid "A router/gateway, connected to the internet on the external interface and running on the IP address 10.0.2.1 on the internal interface, is needed to connect to the internet."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:572
-msgid ""
-"The router should not run a DHCP server, it can run a DNS server, though "
-"this is not needed and will not be used. (If the router runs a DHCP server "
-"you must disable the DHCP server on the main server and you will loose some "
-"features and certain documented procedures will work differently. So better "
-"disable the DHCP server on the router.)"
+msgid "The router should not run a DHCP server, it can run a DNS server, though this is not needed and will not be used. (If the router runs a DHCP server you must disable the DHCP server on the main server and you will loose some features and certain documented procedures will work differently. So better disable the DHCP server on the router.)"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:574
-msgid ""
-"If you are looking for a i386 based solution (so that you can reuse an old "
-"PC), we recommend <ulink url=\"http://www.ipcop.org\">IPCop </ulink> or "
-"<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw </ulink>."
+msgid "If you are looking for a i386 based solution (so that you can reuse an old PC), we recommend <ulink url=\"http://www.ipcop.org\">IPCop </ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw </ulink>."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:578
-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 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>."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:582
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "It is possible to use a different network setup, this is the <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented procedure </ulink> to do this. If you are not forced to do this by an existing network infrastructure, we recommend against doing so and recommend you stay with the default <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Etch/Architecture#\">network architecture </ulink>."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"It is possible to use a different network setup, this is the <ulink url="
+"\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
+"procedure </ulink> to do this. If you are not forced to do this by an "
+"existing network infrastructure, we recommend against doing so and recommend "
+"you stay with the default <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Etch/Architecture#\">network architecture </ulink>."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"It is possible to use a different network setup, this is the <ulink url="
"\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
@@ -1344,8 +1260,25 @@ msgid ""
"existing network infrastructure, we recommend against doing so and recommend "
"you stay with the default <ulink url=\"http://wiki.debian.org/DebianEdu/"
"Documentation/Lenny/Architecture#\">network architecture </ulink>."
+<<<< 125968969722687
msgstr ""
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+# type: Content of: <article><section><para>
+#: debian-edu-lenny-manual.xml:595
+msgid "</inlinemediaobject> FIXME: probably each paragraph on this page needs to be (slightly) rewritten for lenny."
+msgstr ""
+
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+# type: Content of: <article><section><para>
+#: debian-edu-lenny-manual.xml:595
+msgid ""
+"</inlinemediaobject> FIXME: probably each paragraph on this page needs to be "
+"(slightly) rewritten for lenny."
+msgstr ""
+
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+<<<< 125968969722687
# type: Content of: <article><section><section><title>
#: debian-edu-lenny-manual.xml:594
msgid "Where to find additional information"
@@ -1353,6 +1286,18 @@ msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:596
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "We recommend to read or at least take a look at the <ulink url=\"http://www.debian.org/releases/stable/releasenotes\">release notes for Debian Lenny </ulink> before you start installing a system for production use. If you just want to give Debian Edu/Skolelinux a try, you don't have to though, it should just work <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"We recommend to read or at least take a look at the <ulink url=\"http://www."
+"debian.org/releases/stable/releasenotes\">release notes for Debian Lenny </"
+"ulink> before you start installing a system for production use. If you just "
+"want to give Debian Edu/Skolelinux a try, you don't have to though, it "
+"should just work <inlinemediaobject><imageobject><imagedata width=\"15\" "
+"fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/"
+"> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"We recommend to read or at least take a look at the <ulink url=\"http://www."
"debian.org/releases/lenny/releasenotes\">release notes for Debian Lenny </"
@@ -1361,20 +1306,29 @@ msgid ""
"should just work <inlinemediaobject><imageobject><imagedata width=\"15\" "
"fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/"
"> </imageobject>"
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:603
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "Even more <ulink url=\"http://www.debian.org/releases/stable/installmanual\">information about the Debian Lenny release </ulink> is available in its installation manual."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"Even more <ulink url=\"http://www.debian.org/releases/stable/installmanual"
+"\">information about the Debian Lenny release </ulink> is available in its "
+"installation manual."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"Even more <ulink url=\"http://www.debian.org/releases/lenny/installmanual"
"\">information about the Debian Lenny release </ulink> is available in its "
"installation manual."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><title>
#: debian-edu-lenny-manual.xml:609
-msgid ""
-"Download an installation media for Debian Edu 5.0.3+edu0 Codename \"Lenny\""
+msgid "Download an installation media for Debian Edu 5.0.3+edu0 Codename \"Lenny\""
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -1384,30 +1338,22 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:615
-msgid ""
-"The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of "
-"these methods:"
+msgid "The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of these methods:"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:617
-msgid ""
-"<computeroutput>ftp://ftp.skolelinux.org/cd-lenny-dvd/debian-edu-amd64-i386-"
-"DVD-1.iso </computeroutput>"
+msgid "<computeroutput>ftp://ftp.skolelinux.org/cd-lenny-dvd/debian-edu-amd64-i386-DVD-1.iso </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:620
-msgid ""
-"<computeroutput>http://ftp.skolelinux.org/cd-lenny-dvd/debian-edu-amd64-i386-"
-"DVD-1.iso </computeroutput>"
+msgid "<computeroutput>http://ftp.skolelinux.org/cd-lenny-dvd/debian-edu-amd64-i386-DVD-1.iso </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:623
-msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::cd-lenny-dvd/debian-edu-amd64-i386-"
-"DVD-1.iso </computeroutput>"
+msgid "<computeroutput>rsync ftp.skolelinux.org::cd-lenny-dvd/debian-edu-amd64-i386-DVD-1.iso </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -1417,32 +1363,22 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:630
-msgid ""
-"<computeroutput>ftp://ftp.skolelinux.org/cd-lenny-amd64-i386-powerpc-netinst/"
-"debian-edu-amd64-i386-powerpc-NETINST-1.iso </computeroutput>"
+msgid "<computeroutput>ftp://ftp.skolelinux.org/cd-lenny-amd64-i386-powerpc-netinst/debian-edu-amd64-i386-powerpc-NETINST-1.iso </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:633
-msgid ""
-"<computeroutput>http://ftp.skolelinux.org/cd-lenny-amd64-i386-powerpc-"
-"netinst/debian-edu-amd64-i386-powerpc-NETINST-1.iso </computeroutput>"
+msgid "<computeroutput>http://ftp.skolelinux.org/cd-lenny-amd64-i386-powerpc-netinst/debian-edu-amd64-i386-powerpc-NETINST-1.iso </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:636
-msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::cd-lenny-amd64-i386-powerpc-"
-"netinst/debian-edu-amd64-i386-powerpc-NETINST-1.iso </computeroutput>"
+msgid "<computeroutput>rsync ftp.skolelinux.org::cd-lenny-amd64-i386-powerpc-netinst/debian-edu-amd64-i386-powerpc-NETINST-1.iso </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:641
-msgid ""
-"The powerpc port has not been tested as much as the other architectures, "
-"though it should work just fine and has been reported to work. Still, we "
-"consider the port an experimental release of Debian Edu, which we might not "
-"be able to support as the other archs."
+msgid "The powerpc port has not been tested as much as the other architectures, though it should work just fine and has been reported to work. Still, we consider the port an experimental release of Debian Edu, which we might not be able to support as the other archs."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -1457,31 +1393,137 @@ msgstr ""
msgid "Request a CD/DVD by mail"
msgstr ""
-# type: Content of: <article><section><section><para><inlinemediaobject>
-#: debian-edu-lenny-manual.xml:652
-msgid ""
-"For those without a fast internet connection, we offer to send you a CD or "
-"DVD 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) "
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+# type: Content of: <article><section><section><para><inlinemediaobject>
+#: debian-edu-lenny-manual.xml:652
+msgid "For those without a fast internet connection, we offer to send you a CD or DVD 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) <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:657
+msgid "</inlinemediaobject> Remember to include the address you want the CD or DVD to be sent to in the email."
+msgstr ""
+
+# type: Content of: <article><section><section><title>
+#: debian-edu-lenny-manual.xml:662
+msgid "Installation options explained"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:664
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "The netinst installation will fetch some packages from the CD and the rest from the net. The amount of packages fetched from the net varies from profile to profile:"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:671
+msgid "Main server: 8 of 115 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:674
+msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:677
+msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:680
+msgid "Thin client server: 618 of 1052 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:683
+msgid "Workstation: 618 of 1051 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:686
+msgid "Standalone: 618 of 1020 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:689
+msgid "Barebone: 12 of 83 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:693
+msgid "The profiles are explained below."
+msgstr ""
+
+# type: Content of: <article><section><section><title>
+#: debian-edu-lenny-manual.xml:698
+msgid "Installation options"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:700
+msgid "When you do an Debian Edu installation you have a few options to choose. But don't be afraid, there aren't many. We have done a good job hiding the complexity of Debian during the installation and beyond. However, Debian Edu is Debian, and if you want there are more than 15000 packages to choose from and a billion configuration options. But for the majority of our users, our defaults should be fine."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"The netinst installation will fetch some packages from the CD and the rest "
+"from the net. The amount of packages fetched from the net varies from "
+"profile to profile:"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:671
+msgid "Main server: 8 of 115 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:674
+msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:677
+msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:680
+msgid "Thin client server: 618 of 1052 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:683
+msgid "Workstation: 618 of 1051 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:686
+msgid "Standalone: 618 of 1020 MiB downloaded."
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:689
+msgid "Barebone: 12 of 83 MiB downloaded."
msgstr ""
# type: Content of: <article><section><section><para>
-#: debian-edu-lenny-manual.xml:657
-msgid ""
-"</inlinemediaobject> Remember to include the address you want the CD or DVD "
-"to be sent to in the email."
+#: debian-edu-lenny-manual.xml:693
+msgid "The profiles are explained below."
msgstr ""
# type: Content of: <article><section><section><title>
-#: debian-edu-lenny-manual.xml:662
-msgid "Installation options explained"
+#: debian-edu-lenny-manual.xml:698
+msgid "Installation options"
msgstr ""
# type: Content of: <article><section><section><para>
-#: debian-edu-lenny-manual.xml:664
+#: debian-edu-lenny-manual.xml:700
+msgid ""
+"When you do an Debian Edu installation you have a few options to choose. But "
+"don't be afraid, there aren't many. We have done a good job hiding the "
+"complexity of Debian during the installation and beyond. However, Debian Edu "
+"is Debian, and if you want there are more than 15000 packages to choose from "
+"and a billion configuration options. But for the majority of our users, our "
+"defaults should be fine."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"When you do an Debian Edu installation you have a few options to choose. But "
"don't be afraid, there aren't many. We have done a good job hiding the "
@@ -1489,53 +1531,32 @@ msgid ""
"is Debian, and if you want there are more than 15000 packages to choose from "
"and a billion configuration options. But for the majority of our users, our "
"defaults should be fine."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:666
-msgid ""
-"Normal graphical installation is the default on i386 and amd64. The powerpc "
-"installer does not support graphical installation. Enter "
-"<computeroutput>install </computeroutput> at the boot prompt to do an i386 "
-"text-mode install."
+msgid "Normal graphical installation is the default on i386 and amd64. The powerpc installer does not support graphical installation. Enter <computeroutput>install </computeroutput> at the boot prompt to do an i386 text-mode install."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:669
-msgid ""
-"The <computeroutput>debian-edu-expert </computeroutput> boot-option adds the "
-"barebone profile to the profile options, and switches to manual "
-"partitioning. Enter <computeroutput>installgui debian-edu-expert </"
-"computeroutput> or <computeroutput>install debian-edu-expert </"
-"computeroutput> at the syslinux/yaboot prompt to enter expert mode."
+msgid "The <computeroutput>debian-edu-expert </computeroutput> boot-option adds the barebone profile to the profile options, and switches to manual partitioning. Enter <computeroutput>installgui debian-edu-expert </computeroutput> or <computeroutput>install debian-edu-expert </computeroutput> at the syslinux/yaboot prompt to enter expert mode."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:675
-msgid ""
-"If you want to boot the amd64 text mode with the multiarch DVD it would be "
-"<computeroutput>amd64-install </computeroutput>. Likewise you can choose "
-"<computeroutput>amd64-expertgui </computeroutput> to get the GUI version on "
-"amd64."
+msgid "If you want to boot the amd64 text mode with the multiarch DVD it would be <computeroutput>amd64-install </computeroutput>. Likewise you can choose <computeroutput>amd64-expertgui </computeroutput> to get the GUI version on amd64."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:680
-msgid ""
-"If you want to boot the i386 mode with the multiarch DVD on an amd64 machine "
-"you need to manually select <computeroutput>install </computeroutput> (text "
-"mode) or <computeroutput>expertgui </computeroutput> (graphical mode). The "
-"multiarch DVD defaults to use amd64-installgui on x86 64-bits machines, and "
-"installgui on x86 32-bits machines."
+msgid "If you want to boot the i386 mode with the multiarch DVD on an amd64 machine you need to manually select <computeroutput>install </computeroutput> (text mode) or <computeroutput>expertgui </computeroutput> (graphical mode). The multiarch DVD defaults to use amd64-installgui on x86 64-bits machines, and installgui on x86 32-bits machines."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:685
-msgid ""
-"If you have already installed the mainserver profile on a machine, you can "
-"use its http proxy service to speed up the following installations from CD. "
-"Add <computeroutput>d-i mirror/http/proxy string http://10.0.2.2:3128/ </"
-"computeroutput> as additional boot-option."
+msgid "If you have already installed the mainserver profile on a machine, you can use its http proxy service to speed up the following installations from CD. Add <computeroutput>d-i mirror/http/proxy string http://10.0.2.2:3128/ </computeroutput> as additional boot-option."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1565,11 +1586,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:705
-msgid ""
-"This is the main server (tjener) for your school providing the following "
-"services: file, print, intranet, proxy, DNS, DHCP, LDAP, backup, nagios, "
-"simesummary, munin. All services are pre-configured and working out of the "
-"box. You must only install one main server per school!"
+msgid "This is the main server (tjener) for your school providing the following services: file, print, intranet, proxy, DNS, DHCP, LDAP, backup, nagios, simesummary, munin. All services are pre-configured and working out of the box. You must only install one main server per school!"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1579,11 +1596,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:712
-msgid ""
-"A computer booting from its local hard drive, and running all software and "
-"devices locally like an ordinary computer, but the user login is "
-"authenticated by the main server, where the user's files and desktop profile "
-"are stored."
+msgid "A computer booting from its local hard drive, and running all software and devices locally like an ordinary computer, but the user login is authenticated by the main server, where the user's files and desktop profile are stored."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1593,14 +1606,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:719
-msgid ""
-"Thin client (and diskless workstation) server. Clients with no hard drive "
-"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. Out of "
-"the box, this profile installs a thin client server. To turn it into a "
-"diskless workstation server you need to follow <ulink url=\"http://wiki."
-"debian.org/DebianEdu/HowTo/LtspDisklessWorkstation\">this HowTo </ulink>. "
-"(Fixme: integrate this HowTo into this chapter of the manual.)"
+msgid "Thin client (and diskless workstation) server. Clients with no hard drive 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. Out of the box, this profile installs a thin client server. To turn it into a diskless workstation server you need to follow <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation\">this HowTo </ulink>. (Fixme: integrate this HowTo into this chapter of the manual.)"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1610,9 +1616,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:727
-msgid ""
-"An ordinary computer that can function without a main server, ie. doesn't "
-"need to be on the network. Includes laptops."
+msgid "An ordinary computer that can function without a main server, ie. doesn't need to be on the network. Includes laptops."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1622,26 +1626,17 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:734
-msgid ""
-"This profile is only available when using the 'debian-edu-expert' boot "
-"option. It will install the base packages and configure the machine to "
-"integrate into the Debian Edu network, but without any services and "
-"applications. It is useful as a platform for single services manually moved "
-"out from the main-server."
+msgid "This profile is only available when using the 'debian-edu-expert' boot option. It will install the base packages and configure the machine to integrate into the Debian Edu network, but without any services and applications. It is useful as a platform for single services manually moved out from the main-server."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:740
-msgid ""
-"The first 3 profiles can all be installed on the same machine. That means "
-"the main server can also be a thin client server and can be used as a "
-"workstation."
+msgid "The first 3 profiles can all be installed on the same machine. That means the main server can also be a thin client server and can be used as a workstation."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:743
-msgid ""
-"say yes to automatic partioning, it will destroy the data on the harddrives!"
+msgid "say yes to automatic partioning, it will destroy the data on the harddrives!"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1651,11 +1646,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:749
-msgid ""
-"please say yes to submit information to <ulink url=\"http://popcon."
-"skolelinux.org/\"/> - though you dont have to "
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+msgid "please say yes to submit information to <ulink url=\"http://popcon.skolelinux.org/\"/> - though you dont have to <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1683,13 +1674,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:771
-msgid ""
-"If you decide to do manual partitioning for the main-server, you need to "
-"make sure that the directory /skole/tjener/home0 exists, probably by "
-"mounting a partition there. If you don't create that directory you will only "
-"be able to login as root. The reason is that the user creation system "
-"require this directory to exist to be able to create users home directories, "
-"and without a users home directory the user can not log in."
+msgid "If you decide to do manual partitioning for the main-server, you need to make sure that the directory /skole/tjener/home0 exists, probably by mounting a partition there. If you don't create that directory you will only be able to login as root. The reason is that the user creation system require this directory to exist to be able to create users home directories, and without a users home directory the user can not log in."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -1699,22 +1684,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:778
-msgid ""
-"In principal it makes sense to either install notebooks with the workstation "
-"or with the standalone profile. But keep in mind, that the workstation "
-"profile uses LDAP for the user accounts and NFS for the home directories, so "
-"those workstations will only work while in the network where they can access "
-"the server. If you plan to use your laptop at home or on the road, choose "
-"the standalone profile."
+msgid "In principal it makes sense to either install notebooks with the workstation or with the standalone profile. But keep in mind, that the workstation profile uses LDAP for the user accounts and NFS for the home directories, so those workstations will only work while in the network where they can access the server. If you plan to use your laptop at home or on the road, choose the standalone profile."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:780
-msgid ""
-"It is possible to reconfigure workstations to cache authentication "
-"information and sync the home directories to local disk (and resync to the "
-"server when in the network) with <computeroutput>unison </computeroutput>, "
-"but there is currently no howto available for this."
+msgid "It is possible to reconfigure workstations to cache authentication information and sync the home directories to local disk (and resync to the server when in the network) with <computeroutput>unison </computeroutput>, but there is currently no howto available for this."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -1724,11 +1699,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:788
-msgid ""
-"If you install from a DVD <computeroutput>/etc/apt/sources.list </"
-"computeroutput> will only contain sources from the DVD. If you have an "
-"internet connection we strongly suggest to add the following lines to it, so "
-"that available (security) updates can be installed:"
+msgid "If you install from a DVD <computeroutput>/etc/apt/sources.list </computeroutput> will only contain sources from the DVD. If you have an internet connection we strongly suggest to add the following lines to it, so that available (security) updates can be installed:"
msgstr ""
# type: CDATA
@@ -1795,21 +1766,28 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:828
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "Creating custom CDs or DVDs is quite easily possible, since we use the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer </ulink>, which has a modular design and other nice features. [ <ulink url=\"http://wiki.debian.org/DebianInstaller/Preseed\"/> Preseeding] allows to define answers to the questions normally asked."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"Creating custom CDs or DVDs is quite easily possible, since we use the "
+"<ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer </"
+"ulink>, which has a modular design and other nice features. [ <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\"/> Preseeding] allows to "
+"define answers to the questions normally asked."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"Creating custom CDs or DVDs is quite easily possible, since we use the "
"<ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer </"
"ulink>, which has a modular design and other nice features. <ulink url="
"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding </ulink> "
"allows to define answers to the questions normally asked."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:832
-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="
-"\"http://wiki.debian.org/DebianInstaller/Modify/CD\">remaster the CD/DVD </"
-"ulink>."
+msgid "So all you need to do is to create a preseeding file with your answers (this is described in the appendix of the debian installer manual) and <ulink url=\"http://wiki.debian.org/DebianInstaller/Modify/CD\">remaster the CD/DVD </ulink>."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -1826,21 +1804,37 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:843
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "FIXME: describe PXE installation here, if its only two sentences, then they should be here."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"FIXME: describe PXE installation here, if its only two sentences, then they "
+"should be here."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"When clients (whether those are clients to be installed or diskless clients "
"of both kinds, thin clients or diskles workstations, doesn't matter) boot "
"via the network, a new PXE menu with installer and boot selection options is "
"displayed. Thin clients and diskless workstation still boot automatically as "
"before on the thin client network without such PXE menu."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:845
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "PXE installation requieres <emphasis role=\"strong\">tjener </emphasis>, the main server, to be installed and set up."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"PXE installation requieres <emphasis role=\"strong\">tjener </emphasis>, the "
+"main server, to be installed and set up."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"More information about network clients can be found in the <ulink url="
"\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/NetworkClients#"
"\">Network clients HowTo </ulink> chapter."
+<<<< 125968969722687
msgstr ""
"位於 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny\"/> 的"
"版本是一個 wiki 並隨時會更新。"
@@ -1852,16 +1846,22 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:852
-msgid ""
-"The PXE installation is using a debian-installer preseed file, and this file "
-"can be modified to ask for more packages to install."
+msgid "The PXE installation is using a debian-installer preseed file, and this file can be modified to ask for more packages to install."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:854
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "The line like the following needs to be added to <computeroutput> FIXME: path to preseed file location missing </computeroutput>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"The line like the following needs to be added to <computeroutput> FIXME: "
+"path to preseed file location missing </computeroutput>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"The line like the following needs to be added to <computeroutput>tjener:/etc/"
"debian-edu/www/debian-edu-install.dat </computeroutput>"
+<<<< 125968969722687
msgstr ""
# type: CDATA
@@ -1871,153 +1871,282 @@ msgid "d-i pkgsel/include string my-extra-package(s)]]"
msgstr ""
# type: Content of: <article><section><section><title>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:859
+msgid "Screenshot tour through an i386 main-server + thin-client-server installation"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:859
+msgid ""
+"Screenshot tour through an i386 main-server + thin-client-server installation"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:863
msgid "Screenshot tour"
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:865
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-bootopt.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"bootopt.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"Here is a screenshot tour through a main-server + thin-client-server "
"installation:"
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:867
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-lang.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lang.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-01-bootoption.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:873
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-region.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"region.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-02-language.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:879
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-keyboard.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"keyboard.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-03-location.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:885
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-profile-ms-tcs.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"profile-ms-tcs.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-04-keymap.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:891
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-autopartition.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"autopartition.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-05-timezone.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:897
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-popcon.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"popcon.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-06-profile.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:903
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-timezone.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"timezone.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-07-partitioning.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:909
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-rootpw.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"rootpw.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-08-popcon.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:915
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-baseinstall.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"baseinstall.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-09-rootpw.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:921
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-pkginstall-ms-tcs.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"pkginstall-ms-tcs.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-10-basesystem.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:927
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-finished.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"finished.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-11-software.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:933
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-grub.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"grub.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-12-finish.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:939
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-usplash.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"usplash.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-13-grub.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:945
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "The KDM login screen was manually adjusted to reduce the resolution for this screen shot."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"The KDM login screen was manually adjusted to reduce the resolution for this "
+"screen shot."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#, fuzzy
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-14-splash.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
@@ -2025,9 +2154,17 @@ msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:951
#, fuzzy
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-kdm-small.png\"/> </imageobject>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-kdm-"
+"small.png\"/> </imageobject>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
"lenny-15-kdm.png\"/> </imageobject>"
+<<<< 125968969722687
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-arch."
"png\"/> </imageobject>"
@@ -2039,6 +2176,13 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:967
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "This chapter describes the first steps you need to do after the installation to get started. The minimum you need to do is:"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"This chapter describes the first steps you need to do after the installation "
+"to get started. The minimum you need to do is:"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"</inlinemediaobject> FIXME: some new screenshots from the versions included "
"in lenny should be created."
@@ -2049,13 +2193,12 @@ msgstr ""
msgid ""
"This chapter describes the first steps you need to do after the installation "
"to get started. The minimum you need to do is:"
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:972
-msgid ""
-"adding workstations to host netgroups (for exporting home-directories via "
-"NFS)"
+msgid "adding workstations to host netgroups (for exporting home-directories via NFS)"
msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
@@ -2065,9 +2208,7 @@ msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:978
-msgid ""
-"it's advised to add the workstations to the dhcpd-config - LTSP-servers must "
-"be added."
+msgid "it's advised to add the workstations to the dhcpd-config - LTSP-servers must be added."
msgstr ""
# type: Content of: <article><section><para>
@@ -2077,25 +2218,17 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:984
-msgid ""
-"The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo#"
-"\">HowTo </ulink> chapter describes more tips and tricks and frequently "
-"asked questions, while this chapter describes the stuff everybody needs to "
-"do."
+msgid "The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo#\">HowTo </ulink> chapter describes more tips and tricks and frequently asked questions, while this chapter describes the stuff everybody needs to do."
msgstr ""
# type: Content of: <article><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:987
-msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/getting-"
-"started.png\"/> </imageobject>"
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/getting-started.png\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:998
-msgid ""
-"There are several services running on the main server which can be managed "
-"via a web management interface. We'll describe each service here."
+msgid "There are several services running on the main server which can be managed via a web management interface. We'll describe each service here."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2105,10 +2238,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1004
-msgid ""
-"Lwat is a web based management tool, that will help you manage some "
-"important parts of your Debian Edu setup. You can manage this four main "
-"groups (add, modify, delete):"
+msgid "Lwat is a web based management tool, that will help you manage some important parts of your Debian Edu setup. You can manage this four main groups (add, modify, delete):"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -2139,9 +2269,7 @@ msgstr "管理者"
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1022
-msgid ""
-"To access lwat point your webbrowser to <ulink url=\"https://www/lwat\"/>. "
-"You will get an error message, because of atleast 2 facts:"
+msgid "To access lwat point your webbrowser to <ulink url=\"https://www/lwat\"/>. You will get an error message, because of atleast 2 facts:"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -2156,19 +2284,12 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1030
-msgid ""
-"you may also get an error if the installation is more than one month old, "
-"since the certificate is only valid for one month."
+msgid "you may also get an error if the installation is more than one month old, since the certificate is only valid for one month."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1034
-msgid ""
-"When you have neglected the warnings (or fixed them...), you will see the "
-"page below with the menu fixed to the left part and the varying main part on "
-"the right. First you'll see a login screen where you can login with your "
-"admin account. If you visit this site the first time after installation, the "
-"loginname there is:"
+msgid "When you have neglected the warnings (or fixed them...), you will see the page below with the menu fixed to the left part and the varying main part on the right. First you'll see a login screen where you can login with your admin account. If you visit this site the first time after installation, the loginname there is:"
msgstr ""
# type: CDATA
@@ -2179,23 +2300,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1037
-msgid ""
-"and the password is the password you entered during the installation for the "
-"root account."
+msgid "and the password is the password you entered during the installation for the root account."
msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1039
-msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-login.png"
-"\"/> </imageobject>"
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-login.png\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1045
-msgid ""
-"After login the loginarea will disappear and you can choose a task in the "
-"menu."
+msgid "After login the loginarea will disappear and you can choose a task in the menu."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2205,27 +2320,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1052
-msgid ""
-"In Debian Edu account informations are stored in a LDAP directory and get "
-"used from there not only from the main server itself, but also from the "
-"workstations and thinclient server in the network. This way the information "
-"about students, pupils, teachers, ... only need to be entered once and are "
-"then available on all systems of the network."
+msgid "In Debian Edu account informations are stored in a LDAP directory and get used from there not only from the main server itself, but also from the workstations and thinclient server in the network. This way the information about students, pupils, teachers, ... only need to be entered once and are then available on all systems of the network."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1054
-msgid ""
-"To get the work done efficiently lwat will assist you on getting your users "
-"data entered to the LDAP directory."
+msgid "To get the work done efficiently lwat will assist you on getting your users data entered to the LDAP directory."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1056
-msgid ""
-"You can add users, group them in usergroups (for example to refer the "
-"members of a class more easily), update them and remove them again. The menu "
-"entries for this are the four topmost entries (in the two topmost groups)."
+msgid "You can add users, group them in usergroups (for example to refer the members of a class more easily), update them and remove them again. The menu entries for this are the four topmost entries (in the two topmost groups)."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -2235,6 +2340,20 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1062
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "To add users you only have to choose \"Add\" in the \"Users\" section of the menu. After choosing this entry you will see a form where you can enter the data of the user you want to add. The most important thing to add is the full name of your user (point one in the image). As you enter you will see, that lwat will generate a username automatically based on the realname. If you don't like the generated username you can change it later. Second you need to choose the role of your account, which is used by lwat to determine the privileges the user has for systemadministration. Currently lwat knows the following roles:"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"To add users you only have to choose \"Add\" in the \"Users\" section of the "
+"menu. After choosing this entry you will see a form where you can enter the "
+"data of the user you want to add. The most important thing to add is the "
+"full name of your user (point one in the image). As you enter you will see, "
+"that lwat will generate a username automatically based on the realname. If "
+"you don't like the generated username you can change it later. Second you "
+"need to choose the role of your account, which is used by lwat to determine "
+"the privileges the user has for systemadministration. Currently lwat knows "
+"the following roles:"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"To add users you only have to choose \"Add\" in the \"Users\" section of the "
"menu. After choosing this entry you will see a form where you can enter the "
@@ -2247,6 +2366,7 @@ msgid ""
"choose the role of your account, which is used by lwat to determine the "
"privileges the user has for systemadministration. Currently lwat knows the "
"following roles:"
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -2286,9 +2406,7 @@ msgstr ""
# type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
#: debian-edu-lenny-manual.xml:1090
-msgid ""
-"Same as Teachers, but can also change other user passwords (besides the ones "
-"of Admins)"
+msgid "Same as Teachers, but can also change other user passwords (besides the ones of Admins)"
msgstr ""
# type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -2298,37 +2416,37 @@ msgstr ""
# type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
#: debian-edu-lenny-manual.xml:1097
-msgid ""
-"Admins have ultimate privileges. They can add/modify/delete users/groups/"
-"machines/automounts and let windows systems join the Skolelinux domain"
+msgid "Admins have ultimate privileges. They can add/modify/delete users/groups/machines/automounts and let windows systems join the Skolelinux domain"
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1104
-msgid ""
-"After choosing a suitable role you can hit the \"Save\" button and the user "
-"is added."
+msgid "After choosing a suitable role you can hit the \"Save\" button and the user is added."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1106
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "You may miss the option to set a password, that has been deactivated, but you can set a own password by modifying the user added."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"You may miss the option to set a password, that has been deactivated, but "
+"you can set a own password by modifying the user added."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"You may miss the option to set a password, that has been deactivated, but "
"you can set an own password by modifying the user added (see below)."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1108
-msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-adduser."
-"png\"/> </imageobject>"
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-adduser.png\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1114
-msgid ""
-"If all went well, you will see a short notice at the end of page with the "
-"data added to the ldap directory (also the form gets reset):"
+msgid "If all went well, you will see a short notice at the end of page with the data added to the ldap directory (also the form gets reset):"
msgstr ""
# type: CDATA
@@ -2367,6 +2485,18 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1138
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "To modify or delete a user you need to first find her using the search menu entry. You will find a form (searcharea in the screenshot) where you can enter either the realname or the username of the user. The results will show up below the form (marked as resultarea in the image). On the left of every result line there is a checkbox you can use to delete or disable on or more user with the two buttons below. If you want to modify a user, just click on it, all result lines are links to the modify page."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"To modify or delete a user you need to first find her using the search menu "
+"entry. You will find a form (searcharea in the screenshot) where you can "
+"enter either the realname or the username of the user. The results will show "
+"up below the form (marked as resultarea in the image). On the left of every "
+"result line there is a checkbox you can use to delete or disable on or more "
+"user with the two buttons below. If you want to modify a user, just click on "
+"it, all result lines are links to the modify page."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"To modify or delete a user you need to first find her using the search menu "
"entry. You will find a form (searcharea in the screenshot) where you can "
@@ -2375,28 +2505,34 @@ msgid ""
"result line there is a checkbox you can use to delete or disable on or more "
"user with the two buttons below. If you want to modify a user, just click on "
"it, all resulting lines are links to the modify page."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1140
-msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-"
-"searchuser.png\"/> </imageobject>"
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-searchuser.png\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1146
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "A new page will show up where you can modify information directly belonging to a user, change the password of the user and modify the list of groups the user belongs to."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"A new page will show up where you can modify information directly belonging "
+"to a user, change the password of the user and modify the list of groups the "
+"user belongs to."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"A new page will show up where you can modify information directly belonging "
"to a user, change the password of the user (if you enabled that feature) and "
"modify the list of groups the user belongs to."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1148
-msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-edituser."
-"png\"/> </imageobject>"
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-edituser.png\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -2406,42 +2542,27 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1159
-msgid ""
-"It possible to mass-create users with <computeroutput>lwat </computeroutput> "
-"by using a .csv file, which can be created with any good spreadsheet "
-"software (for example <computeroutput>oocalc </computeroutput>)."
+msgid "It possible to mass-create users with <computeroutput>lwat </computeroutput> by using a .csv file, which can be created with any good spreadsheet software (for example <computeroutput>oocalc </computeroutput>)."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1163
-msgid ""
-"The import script expects a file formated with all data for one user on one "
-"row, with each field separated with a semicolon. The minimum information "
-"needed is the full name of the user. If fullname is not given, the script "
-"expects to have both Firstname and lastname. The maximum information it "
-"expects is \"User template; Fullname; Username; Password; Additional group "
-"membership\"."
+msgid "The import script expects a file formated with all data for one user on one row, with each field separated with a semicolon. The minimum information needed is the full name of the user. If fullname is not given, the script expects to have both Firstname and lastname. The maximum information it expects is \"User template; Fullname; Username; Password; Additional group membership\"."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1165
-msgid ""
-"If a password column is missing, an easy to remember, pronounceble password "
-"will be created."
+msgid "If a password column is missing, an easy to remember, pronounceble password will be created."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1167
-msgid ""
-"If users are put into groups, these groups have to exist, so you need to "
-"create them manually (with lwat, see below) before importing the users."
+msgid "If users are put into groups, these groups have to exist, so you need to create them manually (with lwat, see below) before importing the users."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1169
-msgid ""
-"It's a good idea to do some tests first, best with a .csv file with a few "
-"fictional users, which can be deleted later."
+msgid "It's a good idea to do some tests first, best with a .csv file with a few fictional users, which can be deleted later."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2451,34 +2572,23 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1177
-msgid ""
-"The mangement of groups is very similarly to the management of users. You "
-"can enter a name and a description per group. When be searching for groups "
-"you can also delete or disable all users of the groups found. From the "
-"modification page you can access all the users of that group."
+msgid "The mangement of groups is very similarly to the management of users. You can enter a name and a description per group. When be searching for groups you can also delete or disable all users of the groups found. From the modification page you can access all the users of that group."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1179
-msgid ""
-"The groups entered in the group management are also regular unix groups, so "
-"you can use them for file permissions too."
+msgid "The groups entered in the group management are also regular unix groups, so you can use them for file permissions too."
msgstr ""
# type: Content of: <article><section><section><caution><para>
#: debian-edu-lenny-manual.xml:1181
-msgid ""
-"Due to a bug in LWAT if you want your Windows computers to be aware of what "
-"groups users are in, you must create the groupmaps manually."
+msgid "Due to a bug in LWAT if you want your Windows computers to be aware of what groups users are in, you must create the groupmaps manually."
msgstr ""
# type: Content of: <article><section><section><para>
#. Warning: Probably not emitting right sort of linebreak
#: debian-edu-lenny-manual.xml:1184
-msgid ""
-"<remark>This is <ulink url=\"http://bugs.skolelinux.no/cgi-bin/bugzilla/"
-"show_bug.cgi?id=1270\">bug#1270 </ulink> FIXME: remove when bug is closed </"
-"remark> Here's how:"
+msgid "<remark>This is <ulink url=\"http://bugs.skolelinux.no/cgi-bin/bugzilla/show_bug.cgi?id=1270\">bug#1270 </ulink> FIXME: remove when bug is closed </remark> Here's how:"
msgstr ""
# type: CDATA
@@ -2495,11 +2605,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1196
-msgid ""
-"This is explained in more detail in the <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Documentation/Lenny/HowTo/"
-"NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration"
-"\">HowTo/NetworkClients </ulink> chapter of this manual."
+msgid "This is explained in more detail in the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration\">HowTo/NetworkClients </ulink> chapter of this manual."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -2509,17 +2615,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1203
-msgid ""
-"Using lwat it's easy to put users in a specifig group (for example named "
-"after the year they enter or finish school) and to create all their home "
-"directories in a dedicated directory."
+msgid "Using lwat it's easy to put users in a specifig group (for example named after the year they enter or finish school) and to create all their home directories in a dedicated directory."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1205
-msgid ""
-"To achieve that, add a stanza like the following to the file "
-"<computeroutput>/etc/lwat/admin.ini </computeroutput>:"
+msgid "To achieve that, add a stanza like the following to the file <computeroutput>/etc/lwat/admin.ini </computeroutput>:"
msgstr ""
# type: CDATA
@@ -2537,16 +2638,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1215
-msgid ""
-"To make this work the 2009 group has to be created before adding these users."
+msgid "To make this work the 2009 group has to be created before adding these users."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1217
-msgid ""
-"The above stanza simply adds then on top off home0, if you want them "
-"somewhere else, using another automount, then you use lwat to add that "
-"automount, and change the homeDirectory string in admini.ini corespondingly."
+msgid "The above stanza simply adds then on top off home0, if you want them somewhere else, using another automount, then you use lwat to add that automount, and change the homeDirectory string in admini.ini corespondingly."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2556,21 +2653,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1225
-msgid ""
-"With the machine management you can basically manage all IP based devices in "
-"your Debian Edu network. Every machine added to the LDAP directory using "
-"lwat has a Hostname, an IP-address, an MAC-address and a domain name which "
-"usually is \"intern\". For a more verbose description about the Debian Edu "
-"architecture see the <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Lenny/Architecture#\">architecture </ulink> chapter of this "
-"manual."
+msgid "With the machine management you can basically manage all IP based devices in your Debian Edu network. Every machine added to the LDAP directory using lwat has a Hostname, an IP-address, an MAC-address and a domain name which usually is \"intern\". For a more verbose description about the Debian Edu architecture see the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/Architecture#\">architecture </ulink> chapter of this manual."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1228
-msgid ""
-"If you add a machine, you can use an ip/hostname from the preconfigured "
-"address space. The following ip ranges are predefined:"
+msgid "If you add a machine, you can use an ip/hostname from the preconfigured address space. The following ip ranges are predefined:"
msgstr ""
# type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -2600,8 +2688,7 @@ msgstr ""
# type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
#: debian-edu-lenny-manual.xml:1249
-msgid ""
-"ltspserver<emphasis><emphasis role=\"strong\">xx </emphasis> </emphasis>"
+msgid "ltspserver<emphasis><emphasis role=\"strong\">xx </emphasis> </emphasis>"
msgstr ""
# type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -2636,37 +2723,151 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1282
-msgid ""
-"The addresses from 10.0.2.100 till 10.0.2.255 and 10.0.3.0 till 10.0.3.243 "
-"are reserved for dhcp and are assigned dynamically."
+msgid "The addresses from 10.0.2.100 till 10.0.2.255 and 10.0.3.0 till 10.0.3.243 are reserved for dhcp and are assigned dynamically."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1284
-msgid ""
-"To assign a host with the MAC-address 00:40:05:AF:4E:C6 a static IP-address "
-"you only have to enter the MAC-address and the hostname static00, the "
-"remaining fields will be filled automatically according to the predefined "
-"configuration."
+msgid "To assign a host with the MAC-address 00:40:05:AF:4E:C6 a static IP-address you only have to enter the MAC-address and the hostname static00, the remaining fields will be filled automatically according to the predefined configuration."
msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1286
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-addmachine.png\"/> </imageobject>"
+msgstr ""
+
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:1268
+msgid "</inlinemediaobject> This will not configure the dhcp server. You need to configure the host statically or edit the configuration of the dhcp server by hand as shown directly below."
+msgstr ""
+
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:1268
+msgid ""
+"</inlinemediaobject> This will not configure the dhcp server. You need to "
+"configure the host statically or edit the configuration of the dhcp server "
+"by hand as shown directly below."
+msgstr ""
+
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+<<<< 125968969722687
+# type: Content of: <article><section><section><section><title>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:1272
+msgid "Assign static ip addresses with dhcp"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:1274
+msgid "To assign a static ip address to a host which you added to the ldap tree via lwat, you need to edit <computeroutput>/etc/dhcp3/dhcpd.conf </computeroutput> and run <computeroutput>/etc/init.d/dhcp3-server restart </computeroutput> as root."
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:1278
+msgid "For our example above you would, after open /etc/dhcpd3/dhcpd.conf in your favourite editor, search for the configuration section of the host <emphasis>static00 </emphasis>. You should find something exactly like this:"
+msgstr ""
+
+# type: CDATA
+#: debian-edu-lenny-manual.xml:1280
+#, no-wrap
+msgid ""
+"host static00 {\n"
+" hardware ethernet 00:00:00:00:00:00;\n"
+" fixed-address static00;\n"
+"}]]"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:1285
+msgid "You need to replace the all-zero MAC-address with the correct one of your static host. For our example host it will look like this:"
+msgstr ""
+
+# type: CDATA
+#: debian-edu-lenny-manual.xml:1286
+#, no-wrap
+msgid ""
+"host static00 {\n"
+" hardware ethernet 00:40:05:AF:4E:C6;\n"
+" fixed-address static00;\n"
+"}]]"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:1295
+msgid "</inlinemediaobject> Don't forget to restart the dhcpd as described above whenever you have changed the configuration."
+msgstr ""
+
+# type: Content of: <article><section><section><section><title>
+#: debian-edu-lenny-manual.xml:1300
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:1272
+msgid "Assign static ip addresses with dhcp"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:1274
+msgid ""
+"To assign a static ip address to a host which you added to the ldap tree via "
+"lwat, you need to edit <computeroutput>/etc/dhcp3/dhcpd.conf </"
+"computeroutput> and run <computeroutput>/etc/init.d/dhcp3-server restart </"
+"computeroutput> as root."
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:1278
+msgid ""
+"For our example above you would, after open /etc/dhcpd3/dhcpd.conf in your "
+"favourite editor, search for the configuration section of the host "
+"<emphasis>static00 </emphasis>. You should find something exactly like this:"
+msgstr ""
+
+# type: CDATA
+#: debian-edu-lenny-manual.xml:1280
+#, no-wrap
+msgid ""
+"host static00 {\n"
+" hardware ethernet 00:00:00:00:00:00;\n"
+" fixed-address static00;\n"
+"}]]"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:1285
+msgid ""
+"You need to replace the all-zero MAC-address with the correct one of your "
+"static host. For our example host it will look like this:"
+msgstr ""
+
+# type: CDATA
+#: debian-edu-lenny-manual.xml:1286
+#, no-wrap
+msgid ""
+"host static00 {\n"
+" hardware ethernet 00:40:05:AF:4E:C6;\n"
+" fixed-address static00;\n"
+"}]]"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:1295
msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-"
-"addmachine.png\"/> </imageobject>"
+"</inlinemediaobject> Don't forget to restart the dhcpd as described above "
+"whenever you have changed the configuration."
msgstr ""
# type: Content of: <article><section><section><section><title>
+#: debian-edu-lenny-manual.xml:1300
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:1294
+<<<< 125968969722687
msgid "Search and delete machines"
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1296
-msgid ""
-"Searching for and deleting machines is quite similar to searching and "
-"deleting users, so that information is not repeated here."
+msgid "Searching for and deleting machines is quite similar to searching and deleting users, so that information is not repeated here."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -2676,69 +2877,37 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1303
-msgid ""
-"After adding a machine to the ldap tree using lwat, you can modify its "
-"properties using the search functionality and clicking on the right entry "
-"(as you would with users)."
+msgid "After adding a machine to the ldap tree using lwat, you can modify its properties using the search functionality and clicking on the right entry (as you would with users)."
msgstr ""
# type: Content of: <article><section><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1305
-msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-"
-"editmachine.png\"/> </imageobject>"
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-editmachine.png\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1311
-msgid ""
-"The form that is behind this machine links is in one way similar to the one "
-"you already know from modifying user entries, but in an other way the "
-"informations do mean different things in this context."
+msgid "The form that is behind this machine links is in one way similar to the one you already know from modifying user entries, but in an other way the informations do mean different things in this context."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1313
-msgid ""
-"For example, adding a machine to a <computeroutput>NetGroup </"
-"computeroutput> does not modify the permissions one machine (or the users "
-"logged into that machine) has on accessing files or programs on the server. "
-"It is more that it restricts the services a machine can use on your main-"
-"server."
+msgid "For example, adding a machine to a <computeroutput>NetGroup </computeroutput> does not modify the permissions one machine (or the users logged into that machine) has on accessing files or programs on the server. It is more that it restricts the services a machine can use on your main-server."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1316
-msgid ""
-"The default installation provides the four <computeroutput>NetGroups </"
-"computeroutput> printer-hosts, workstation-hosts, ltsp-server-hosts and "
-"server-hosts. Currently the <computeroutput>NetGroup </computeroutput> "
-"functionality is used only for NFS. The homedirs are exported by the main-"
-"server to be mounted by the workstations and the ltsp-servers. Because of "
-"security reasons only hosts within the workstation-hosts, ltsp-server-hosts "
-"and server-hosts <computeroutput>NetGroups </computeroutput> can mount the "
-"exported NFS shares. So it is rather important to remember to configure this "
-"kinds of machines properly in the ldap tree using lwat and configuring them "
-"to use the static IPs from ldap."
+msgid "The default installation provides the four <computeroutput>NetGroups </computeroutput> printer-hosts, workstation-hosts, ltsp-server-hosts and server-hosts. Currently the <computeroutput>NetGroup </computeroutput> functionality is used only for NFS. The homedirs are exported by the main-server to be mounted by the workstations and the ltsp-servers. Because of security reasons only hosts within the workstation-hosts, ltsp-server-hosts and server-hosts <computeroutput>NetGroups </computeroutput> can mount the exported NFS shares. So it is rather important to remember to configure this kinds of machines properly in the ldap tree using lwat and configuring them to use the static IPs from ldap."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1325
-msgid ""
-"</inlinemediaobject> Remember to configure workstations and ldap-servers "
-"properly with lwat, or you users can't access their homedirs."
+msgid "</inlinemediaobject> Remember to configure workstations and ldap-servers properly with lwat, or you users can't access their homedirs."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1327
-msgid ""
-"Another important part of the machine configuration is the 'Samba host' flag "
-"(in the 'Host information' area). If you plan to add existing Windows "
-"systems to the Skolelinux Samba domain, you have to add the Windows host to "
-"the ldap tree and set this flag to be able to join the Windows host to the "
-"domain. For more information about adding Windows hosts to the Skolelinux "
-"network see FIXME: add link to more information about adding Windows hosts "
-"to the Skolelinux network or describe it right there."
+msgid "Another important part of the machine configuration is the 'Samba host' flag (in the 'Host information' area). If you plan to add existing Windows systems to the Skolelinux Samba domain, you have to add the Windows host to the ldap tree and set this flag to be able to join the Windows host to the domain. For more information about adding Windows hosts to the Skolelinux network see FIXME: add link to more information about adding Windows hosts to the Skolelinux network or describe it right there."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2761,10 +2930,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1347
-msgid ""
-"The full documentation for lwat can be found at <computeroutput>/usr/share/"
-"doc/lwat/ </computeroutput> on the main server or <ulink url=\"http://bzz.no/"
-"lwat/download/doc/\">online </ulink>."
+msgid "The full documentation for lwat can be found at <computeroutput>/usr/share/doc/lwat/ </computeroutput> on the main server or <ulink url=\"http://bzz.no/lwat/download/doc/\">online </ulink>."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2774,20 +2940,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1357
-msgid ""
-"For Printer Management point your webbrowser to <ulink url=\"https://www:631"
-"\"/> This is the normal cups management site where you can add/delete/modfiy "
-"your printers and can clean up the printing queue. For changes where you "
-"have to login as root with your root password, you will be forced to use ssl "
-"encryption."
+msgid "For Printer Management point your webbrowser to <ulink url=\"https://www:631\"/> This is the normal cups management site where you can add/delete/modfiy your printers and can clean up the printing queue. For changes where you have to login as root with your root password, you will be forced to use ssl encryption."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1359
-msgid ""
-"If you connect the printer for the first time, we suggest to run "
-"<computeroutput>printconf </computeroutput> as root. FIXME: explain what to "
-"do when printconf does not accomplish anything."
+msgid "If you connect the printer for the first time, we suggest to run <computeroutput>printconf </computeroutput> as root. FIXME: explain what to do when printconf does not accomplish anything."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2797,26 +2955,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1368
-msgid ""
-"The default configuraiton in Debian Edu is to keep the clocks on all "
-"machines synchronous but not necessarily correct. NTP is used to update the "
-"time. The clocks will not be synchronized with an external source by "
-"default, to make sure the machines to not use external network connections "
-"active all the time. This was configured like this after a school "
-"discovered their ISDN network was up all the time, giving them a nasty extra "
-"phone bill."
+msgid "The default configuraiton in Debian Edu is to keep the clocks on all machines synchronous but not necessarily correct. NTP is used to update the time. The clocks will not be synchronized with an external source by default, to make sure the machines to not use external network connections active all the time. This was configured like this after a school discovered their ISDN network was up all the time, giving them a nasty extra phone bill."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1370
-msgid ""
-"To enable synchronization with an external clock, the file /etc/ntp.conf on "
-"the main-server need to be modified. The comments in front of the "
-"<computeroutput>server </computeroutput> entries need to be removed. After "
-"this, the ntp server need to be restarted by running <computeroutput>/etc/"
-"init.d/ntp restart </computeroutput> as root. To test if the server is "
-"using the external clock sources, run <computeroutput>ntpq -c lpeer </"
-"computeroutput>."
+msgid "To enable synchronization with an external clock, the file /etc/ntp.conf on the main-server need to be modified. The comments in front of the <computeroutput>server </computeroutput> entries need to be removed. After this, the ntp server need to be restarted by running <computeroutput>/etc/init.d/ntp restart </computeroutput> as root. To test if the server is using the external clock sources, run <computeroutput>ntpq -c lpeer </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2826,13 +2970,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1380
-msgid ""
-"Because of a bug in the automatic partition, some partitions might be too "
-"full after installation. To extend the full partitions, run "
-"<computeroutput>debian-edu-fsautoresize -n </computeroutput> as root. See "
-"the \"Resize Partitions\" HowTo in the <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Documentation/Lenny/HowTo/Administration#\">administration howto "
-"chapter </ulink> for more information."
+msgid "Because of a bug in the automatic partition, some partitions might be too full after installation. To extend the full partitions, run <computeroutput>debian-edu-fsautoresize -n </computeroutput> as root. See the \"Resize Partitions\" HowTo in the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/Administration#\">administration howto chapter </ulink> for more information."
msgstr ""
# type: Content of: <article><section><title>
@@ -2847,50 +2985,32 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1394
-msgid ""
-"This section explains how to use <computeroutput>aptitude upgrade </"
-"computeroutput> and kde-update-notifier."
+msgid "This section explains how to use <computeroutput>aptitude upgrade </computeroutput> and kde-update-notifier."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1397
-msgid ""
-"Using <computeroutput>aptitude </computeroutput> is really simply. To update "
-"a system you need to execute two commands on the command line as root: "
-"<computeroutput>aptitude update </computeroutput> (updates the lists of "
-"available packages) and <computeroutput>aptitude upgrade </computeroutput> "
-"(upgrades the packages for which an upgrade is available)."
+msgid "Using <computeroutput>aptitude </computeroutput> is really simply. To update a system you need to execute two commands on the command line as root: <computeroutput>aptitude update </computeroutput> (updates the lists of available packages) and <computeroutput>aptitude upgrade </computeroutput> (upgrades the packages for which an upgrade is available)."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1402
-msgid ""
-"Instead of using the command line you can also use kde-update-notifier. "
-"FIXME: Explain how to use kde-update-notifier, best with screenshots."
+msgid "Instead of using the command line you can also use kde-update-notifier. FIXME: Explain how to use kde-update-notifier, best with screenshots."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1405
-msgid ""
-"It is also a good idea to install <computeroutput>cron-apt </computeroutput> "
-"and <computeroutput>apt-listchanges </computeroutput> and configure them to "
-"send mail to an address you are reading."
+msgid "It is also a good idea to install <computeroutput>cron-apt </computeroutput> and <computeroutput>apt-listchanges </computeroutput> and configure them to send mail to an address you are reading."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1409
-msgid ""
-"<computeroutput>cron-apt </computeroutput> will notify you once a day via "
-"email, which packages need an update. It does not install these updates, but "
-"downloads them (usually in the night), so you don't have to wait for the "
-"download, when you do <computeroutput>aptitude upgrade </computeroutput>."
+msgid "<computeroutput>cron-apt </computeroutput> will notify you once a day via email, which packages need an update. It does not install these updates, but downloads them (usually in the night), so you don't have to wait for the download, when you do <computeroutput>aptitude upgrade </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1413
-msgid ""
-"<computeroutput>apt-listchanges </computeroutput> can send new changelog "
-"entries to you."
+msgid "<computeroutput>apt-listchanges </computeroutput> can send new changelog entries to you."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2900,42 +3020,27 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1421
-msgid ""
-"For the backup management point your browser to <ulink url=\"https://www/"
-"slbackup-php\"/>. Please note that you have 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."
+msgid "For the backup management point your browser to <ulink url=\"https://www/slbackup-php\"/>. Please note that you have 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 ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1423
-msgid ""
-"Per default the tjener will backup <computeroutput>/skole/tjener/home0 </"
-"computeroutput>, <computeroutput>/etc/ </computeroutput>, <computeroutput>/"
-"root/.svk </computeroutput> and the ldap to /skole/backup which is in the "
-"lvm. If you only want to have things twice (if you delete something) this "
-"setup should be fine for you."
+msgid "Per default the tjener will backup <computeroutput>/skole/tjener/home0 </computeroutput>, <computeroutput>/etc/ </computeroutput>, <computeroutput>/root/.svk </computeroutput> and the ldap to /skole/backup which is in the lvm. If you only want to have things twice (if you delete something) this setup should be fine for you."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1432
-msgid ""
-"</inlinemediaobject> Be aware that this backup doesn't protect you from "
-"failing harddrives."
+msgid "</inlinemediaobject> Be aware that this backup doesn't protect you from failing harddrives."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1434
-msgid ""
-"If you want to backup your data to an external server, a tape device or "
-"another harddrive you'll have to modify the existing configuration a bit."
+msgid "If you want to backup your data to an external server, a tape device or another harddrive you'll have to modify the existing configuration a bit."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1436
-msgid ""
-"If you want to restore a complete folder, your best option is to use the "
-"command-line:"
+msgid "If you want to restore a complete folder, your best option is to use the command-line:"
msgstr ""
# type: CDATA
@@ -2949,24 +3054,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1441
-msgid ""
-"this will leave the content from <computeroutput>/skole/tjener/home0/user </"
-"computeroutput> from <computeroutput><date> </computeroutput> in the "
-"folder <computeroutput>/skole/tjener/home0/user_<date> </"
-"computeroutput>"
+msgid "this will leave the content from <computeroutput>/skole/tjener/home0/user </computeroutput> from <computeroutput><date> </computeroutput> in the folder <computeroutput>/skole/tjener/home0/user_<date> </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1446
-msgid ""
-"If you want to restore a single file, then you should be able to select the "
-"file (and the version) from the web-interface, and download only that file."
+msgid "If you want to restore a single file, then you should be able to select the file (and the version) from the web-interface, and download only that file."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1449
-msgid ""
-"FIXME: continue description of slbackup-php usage, maybe with screenshots"
+msgid "FIXME: continue description of slbackup-php usage, maybe with screenshots"
msgstr ""
# type: Content of: <article><section><section><title>
@@ -2981,32 +3079,17 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1462
-msgid ""
-"Munin trend reporting system is available from <ulink url=\"https://www/"
-"munin/\"/>. It provides system status measurement graphis on a daily, "
-"weekly, monthly and yearly basis, and allow the system administrator help "
-"when looking for bottlenecks and the source of system problems."
+msgid "Munin trend reporting system is available from <ulink url=\"https://www/munin/\"/>. It provides system status measurement graphis on a daily, weekly, monthly and yearly basis, and allow the system administrator help when looking for bottlenecks and the source of system problems."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1464
-msgid ""
-"The list of machines being monitored using munin is generated automatically "
-"based on the list of hosts reporting to sitesummary. All hosts with the "
-"package munin-node installed is registered for munin monitoring. It will "
-"normally take two days from a machine is installed until munin monitoring "
-"start, because of the order the cron jobs are executed. To speed up the "
-"process, run <computeroutput>/etc/cron.daily/sitesummary-client </"
-"computeroutput> as root on the freshly installed machine, and "
-"<computeroutput>/etc/cron.daily/sitesummary </computeroutput> as root on the "
-"sitesummary server (normally the main-server)."
+msgid "The list of machines being monitored using munin is generated automatically based on the list of hosts reporting to sitesummary. All hosts with the package munin-node installed is registered for munin monitoring. It will normally take two days from a machine is installed until munin monitoring start, because of the order the cron jobs are executed. To speed up the process, run <computeroutput>/etc/cron.daily/sitesummary-client </computeroutput> as root on the freshly installed machine, and <computeroutput>/etc/cron.daily/sitesummary </computeroutput> as root on the sitesummary server (normally the main-server)."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1468
-msgid ""
-"Information about the munin system is available from <ulink url=\"http://"
-"munin.projects.linpro.no/\"/> ."
+msgid "Information about the munin system is available from <ulink url=\"http://munin.projects.linpro.no/\"/> ."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -3016,18 +3099,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1475
-msgid ""
-"Nagios system and service monitoring is available from <ulink url=\"https://"
-"www/nagios3/\"/>."
+msgid "Nagios system and service monitoring is available from <ulink url=\"https://www/nagios3/\"/>."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1477
-msgid ""
-"The username is nagiosadmin and the password is undefined, you must set your "
-"own password before you can login and use nagios. For security reasons, "
-"avoid using the same password as root. To change the password you can run "
-"the following command as root:"
+msgid "The username is nagiosadmin and the password is undefined, you must set your own password before you can login and use nagios. For security reasons, avoid using the same password as root. To change the password you can run the following command as root:"
msgstr ""
# type: CDATA
@@ -3038,20 +3115,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1480
-msgid ""
-"By default from Debian-Edu 3.0r1 Nagios does not send email. This can be "
-"changed by replacing <computeroutput>notify-by-nothing </computeroutput> "
-"with <computeroutput>host-notify-by-email </computeroutput> and "
-"<computeroutput>notify-by-email </computeroutput> in the file "
-"<computeroutput>/etc/nagios3/debian-edu/contacts.cfg </computeroutput>."
+msgid "By default from Debian-Edu 3.0r1 Nagios does not send email. This can be changed by replacing <computeroutput>notify-by-nothing </computeroutput> with <computeroutput>host-notify-by-email </computeroutput> and <computeroutput>notify-by-email </computeroutput> in the file <computeroutput>/etc/nagios3/debian-edu/contacts.cfg </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1486
-msgid ""
-"Information about the nagios system is available from <ulink url=\"http://"
-"www.nagios.org/\"/> or in the <computeroutput>nagios3-doc </computeroutput> "
-"package."
+msgid "Information about the nagios system is available from <ulink url=\"http://www.nagios.org/\"/> or in the <computeroutput>nagios3-doc </computeroutput> package."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -3061,16 +3130,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1494
-msgid ""
-"A simple report from sitesummary is available from <ulink url=\"https://www/"
-"sitesummary/\"/>."
+msgid "A simple report from sitesummary is available from <ulink url=\"https://www/sitesummary/\"/>."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1496
-msgid ""
-"Some documentation on sitesummary is available from <ulink url=\"http://wiki."
-"debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+msgid "Some documentation on sitesummary is available from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
msgstr ""
# type: Content of: <article><section><title>
@@ -3080,40 +3145,22 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:1505
-msgid ""
-"Before explaining how to upgrade, please note, that you do this update on "
-"your productive server on your own risk. <emphasis role=\"strong\">Debian "
-"Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by "
-"applicable law. </emphasis> Please read this chapter completly before "
-"attempting to upgrade."
+msgid "Before explaining how to upgrade, please note, that you do this update on your productive server on your own risk. <emphasis role=\"strong\">Debian Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by applicable law. </emphasis> Please read this chapter completly before attempting to upgrade."
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:1508
-msgid ""
-"More <ulink url=\"http://www.debian.org/releases/stable/installmanual"
-"\">information about the Debian lenny release </ulink> is available in its "
-"installation manual."
+msgid "More <ulink url=\"http://www.debian.org/releases/stable/installmanual\">information about the Debian lenny release </ulink> is available in its installation manual."
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:1511
-msgid ""
-"If you want to be sure that after the upgrade everything works like before , "
-"you should test the upgrade on a test server, which is configured the same "
-"way as your production server. There you can test the upgrade without risk "
-"and see if everything works as it should."
+msgid "If you want to be sure that after the upgrade everything works like before , you should test the upgrade on a test server, which is configured the same way as your production server. There you can test the upgrade without risk and see if everything works as it should."
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:1513
-msgid ""
-"Also it might be wise to wait a bit and keep running etch for some more "
-"weeks, so that others can test the upgrade, experience problems and document "
-"them here. Debian Edu etch will receive continued support for some time in "
-"the future, but when Debian <ulink url=\"http://www.debian.org/security/"
-"faq#lifespan\">ceases support for etch </ulink>, Debian Edu will (have to) "
-"do that too. This is expected to happen sometime in 2010."
+msgid "Also it might be wise to wait a bit and keep running etch for some more weeks, so that others can test the upgrade, experience problems and document them here. Debian Edu etch will receive continued support for some time in the future, but when Debian <ulink url=\"http://www.debian.org/security/faq#lifespan\">ceases support for etch </ulink>, Debian Edu will (have to) do that too. This is expected to happen sometime in 2010."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -3128,34 +3175,22 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1527
-msgid ""
-"how to add dns and dhcp to existing ldap. "
-"<inlinemediaobject><imageobject><imagedata width=\"20\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/checkmark.png\" depth=\"15\"/> </"
-"imageobject>"
+msgid "how to add dns and dhcp to existing ldap. <inlinemediaobject><imageobject><imagedata width=\"20\" fileref=\"http://wiki.debian.org/htdocs/modern/img/checkmark.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1534
-msgid ""
-"changes to slapd.conf. <inlinemediaobject><imageobject><imagedata width=\"16"
-"\" fileref=\"http://wiki.debian.org/htdocs/modern/img/icon-info.png\" depth="
-"\"16\"/> </imageobject>"
+msgid "changes to slapd.conf. <inlinemediaobject><imageobject><imagedata width=\"16\" fileref=\"http://wiki.debian.org/htdocs/modern/img/icon-info.png\" depth=\"16\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:1541
-msgid ""
-"how to generate the new indexes. <inlinemediaobject><imageobject><imagedata "
-"width=\"20\" fileref=\"http://wiki.debian.org/htdocs/modern/img/checkmark.png"
-"\" depth=\"15\"/> </imageobject>"
+msgid "how to generate the new indexes. <inlinemediaobject><imageobject><imagedata width=\"20\" fileref=\"http://wiki.debian.org/htdocs/modern/img/checkmark.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1549
-msgid ""
-"Upgrading the <computeroutput>debian-edu-config </computeroutput> package on "
-"tjener is likely to disrupt some services, please list these here."
+msgid "Upgrading the <computeroutput>debian-edu-config </computeroutput> package on tjener is likely to disrupt some services, please list these here."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
@@ -3187,16 +3222,12 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1568
-msgid ""
-"And searching <computeroutput>/var/log/syslog </computeroutput> yelds "
-"something like:"
+msgid "And searching <computeroutput>/var/log/syslog </computeroutput> yelds something like:"
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1571
-msgid ""
-"<computeroutput>tjener slapd[8894]: could not stat config file \"/etc/ldap/"
-"schema/dnsdomain2.schema\": No such file or directory (2) </computeroutput>"
+msgid "<computeroutput>tjener slapd[8894]: could not stat config file \"/etc/ldap/schema/dnsdomain2.schema\": No such file or directory (2) </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
@@ -3206,10 +3237,7 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1576
-msgid ""
-"Comment out the line <computeroutput>include /etc/ldap/schema/dnsdomain2."
-"schema </computeroutput> in <computeroutput>/etc/ldap/slapd.conf </"
-"computeroutput>."
+msgid "Comment out the line <computeroutput>include /etc/ldap/schema/dnsdomain2.schema </computeroutput> in <computeroutput>/etc/ldap/slapd.conf </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
@@ -3223,7 +3251,14 @@ msgid "<emphasis role=\"strong\">dhcp3-server wouldn't start. </emphasis>"
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:1584
+#: debian-edu-lenny-manual.xml:1616
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:1584 debian-edu-lenny-manual.xml:1616
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:1590 debian-edu-lenny-manual.xml:1622
+<<<< 125968969722687
msgid "If starting <computeroutput>dhcp3-server </computeroutput> gives:"
msgstr ""
@@ -3259,9 +3294,7 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1617
-msgid ""
-"Then installing <computeroutput>dhcp3-server-ldap </computeroutput> is "
-"needed install it. Use your favorite package management front-end or run:"
+msgid "Then installing <computeroutput>dhcp3-server-ldap </computeroutput> is needed install it. Use your favorite package management front-end or run:"
msgstr ""
# type: CDATA
@@ -3302,45 +3335,27 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1641
-msgid ""
-"Locate the appropriate dhcp.conf, the last one should be in <computeroutput>/"
-"etc/dhcp3/dhcpd-debian-edu.conf.dpkg-old </computeroutput> or get one from "
-"backups."
+msgid "Locate the appropriate dhcp.conf, the last one should be in <computeroutput>/etc/dhcp3/dhcpd-debian-edu.conf.dpkg-old </computeroutput> or get one from backups."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1645
-msgid ""
-"Extract <computeroutput>/usr/share/doc/dhcp3-server-ldap/dhcpd-conf-to-ldap."
-"pl.gz </computeroutput>"
+msgid "Extract <computeroutput>/usr/share/doc/dhcp3-server-ldap/dhcpd-conf-to-ldap.pl.gz </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1649
-msgid ""
-"Set <computeroutput>/usr/share/doc/dhcp3-server-ldap/dhcpd-conf-to-ldap.pl </"
-"computeroutput> executable."
+msgid "Set <computeroutput>/usr/share/doc/dhcp3-server-ldap/dhcpd-conf-to-ldap.pl </computeroutput> executable."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1653
-msgid ""
-"Run <computeroutput>/usr/share/doc/dhcp3-server-ldap/dhcpd-conf-to-ldap.pl </"
-"computeroutput>, optionaly with <computeroutput>--help </computeroutput> "
-"first or read the comments in code."
+msgid "Run <computeroutput>/usr/share/doc/dhcp3-server-ldap/dhcpd-conf-to-ldap.pl </computeroutput>, optionaly with <computeroutput>--help </computeroutput> first or read the comments in code."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1658
-msgid ""
-"View and check the resulting ldif file. Though DHCP is likely to function "
-"fine with this file, to keep as close as possible to the default "
-"configuration it is probably best to keep the entries for the configured "
-"individual hosts and replace the general entries (i.e. "
-"<computeroutput>dhcpService </computeroutput>, "
-"<computeroutput>dhcpSharedNetwork </computeroutput>, "
-"<computeroutput>dhcpSubnet </computeroutput>, etc.) with those from "
-"<computeroutput>etc/ldap/dhcp.ldif </computeroutput>."
+msgid "View and check the resulting ldif file. Though DHCP is likely to function fine with this file, to keep as close as possible to the default configuration it is probably best to keep the entries for the configured individual hosts and replace the general entries (i.e. <computeroutput>dhcpService </computeroutput>, <computeroutput>dhcpSharedNetwork </computeroutput>, <computeroutput>dhcpSubnet </computeroutput>, etc.) with those from <computeroutput>etc/ldap/dhcp.ldif </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
@@ -3397,11 +3412,7 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1707
-msgid ""
-"If there are only few configured host and adding them later to the "
-"configuration is no bother just run <computeroutput>ldapadd -xZWD 'cn=admin,"
-"ou=People,dc=skole,dc=skolelinux,dc=no' -f /etc/ldap/dhcp.ldif </"
-"computeroutput>"
+msgid "If there are only few configured host and adding them later to the configuration is no bother just run <computeroutput>ldapadd -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -f /etc/ldap/dhcp.ldif </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
@@ -3432,16 +3443,12 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1725
-msgid ""
-"To keep the old <computeroutput>/etc/squid/squid.conf </computeroutput> just "
-"comment-out or remove the offending line <computeroutput>http_access allow "
-"localnet </computeroutput>."
+msgid "To keep the old <computeroutput>/etc/squid/squid.conf </computeroutput> just comment-out or remove the offending line <computeroutput>http_access allow localnet </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1730
-msgid ""
-"To stay current copy the new squid.conf distributed in the squid package:"
+msgid "To stay current copy the new squid.conf distributed in the squid package:"
msgstr ""
# type: CDATA
@@ -3455,47 +3462,27 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1735
-msgid ""
-"To have the default Debian Edu configuration run <computeroutput>cfengine-"
-"debian-edu </computeroutput>"
+msgid "To have the default Debian Edu configuration run <computeroutput>cfengine-debian-edu </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1739
-msgid ""
-"Any customized settings in the old configuration should be copyed from the "
-"old file ( dropping lines <computeroutput>acl schoolnet* </computeroutput>, "
-"<computeroutput>acl ltspnet* </computeroutput>, <computeroutput>http_access "
-"allow schoolnet </computeroutput> and <computeroutput>http_access allow "
-"ltspnet </computeroutput> these were replaced by the <computeroutput>acl "
-"localnet* </computeroutput> and <computeroutput>*access allow localnet </"
-"computeroutput> lines)."
+msgid "Any customized settings in the old configuration should be copyed from the old file ( dropping lines <computeroutput>acl schoolnet* </computeroutput>, <computeroutput>acl ltspnet* </computeroutput>, <computeroutput>http_access allow schoolnet </computeroutput> and <computeroutput>http_access allow ltspnet </computeroutput> these were replaced by the <computeroutput>acl localnet* </computeroutput> and <computeroutput>*access allow localnet </computeroutput> lines)."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1752
-msgid ""
-"<emphasis role=\"strong\">Users can't login from Windows machines. </"
-"emphasis>"
+msgid "<emphasis role=\"strong\">Users can't login from Windows machines. </emphasis>"
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1755
-msgid ""
-"A change in Samba that has become apparent in Lenny (see <ulink url=\"http://"
-"bugs.debian.org/532859\">532859 </ulink>) prevents users login to Samba "
-"unless <computeroutput>sambaPwdLastSet </computeroutput> attribute is set "
-"other than zero in their LDAP entry."
+msgid "A change in Samba that has become apparent in Lenny (see <ulink url=\"http://bugs.debian.org/532859\">532859 </ulink>) prevents users login to Samba unless <computeroutput>sambaPwdLastSet </computeroutput> attribute is set other than zero in their LDAP entry."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1759
-msgid ""
-"To add the '<computeroutput>sambaPwdLastSet </computeroutput>' attribute for "
-"new users to be created in LWAT make sure <computeroutput>/etc/lwat/admin."
-"ini </computeroutput> contain the line '<computeroutput>sambaPwdLastSet = 1 "
-"</computeroutput>' for each group. See also: <ulink url=\"http://bugs."
-"skolelinux.org/show_bug.cgi?id=1364\">bug#1364 </ulink>."
+msgid "To add the '<computeroutput>sambaPwdLastSet </computeroutput>' attribute for new users to be created in LWAT make sure <computeroutput>/etc/lwat/admin.ini </computeroutput> contain the line '<computeroutput>sambaPwdLastSet = 1 </computeroutput>' for each group. See also: <ulink url=\"http://bugs.skolelinux.org/show_bug.cgi?id=1364\">bug#1364 </ulink>."
msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
@@ -3511,16 +3498,17 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1770
-msgid ""
-"To add the '<computeroutput>sambaPwdLastSet </computeroutput>' attribute to "
-"users where it isn't set try:"
+msgid "To add the '<computeroutput>sambaPwdLastSet </computeroutput>' attribute to users where it isn't set try:"
msgstr ""
# type: CDATA
#: debian-edu-lenny-manual.xml:1772
#, no-wrap
msgid ""
-"ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b 'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /etc/ldap/fixamba.ldif\n"
+"ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b 'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a\\changetype: modify\\n"
+"add:sambaPwdLastSet\\n"
+"sambaPwdLastSet: 2\\n"
+"-' > /etc/ldap/fixamba.ldif\n"
"\n"
"ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
" -f /etc/ldap/fixamba.ldif]]"
@@ -3528,16 +3516,17 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1778
-msgid ""
-"If users with '<computeroutput>sambaPwdLastSet = 0 </computeroutput>' were "
-"found and allowing them to login is desired, try:"
+msgid "If users with '<computeroutput>sambaPwdLastSet = 0 </computeroutput>' were found and allowing them to login is desired, try:"
msgstr ""
# type: CDATA
#: debian-edu-lenny-manual.xml:1780
#, no-wrap
msgid ""
-"ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b 'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /etc/ldap/fixamba.ldif\n"
+"ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b 'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a\\changetype: modify\\n"
+"replace:sambaPwdLastSet\\n"
+"sambaPwdLastSet: 2\\n"
+"-' > /etc/ldap/fixamba.ldif\n"
"\n"
"ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' \\\n"
" -f /etc/ldap/fixamba.ldif]]"
@@ -3545,9 +3534,7 @@ msgstr ""
# type: Content of: <article><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1785
-msgid ""
-"See also <ulink url=\"http://wiki.debian.org/DebianEdu/Status/Lenny/"
-"SambaLDAP#\">SambaLDAP </ulink>."
+msgid "See also <ulink url=\"http://wiki.debian.org/DebianEdu/Status/Lenny/SambaLDAP#\">SambaLDAP </ulink>."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -3562,9 +3549,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:1800
-msgid ""
-"If you want to continue running bind, you must add the RFC 2782 entries in /"
-"etc/bind/debian-edu/db.intern"
+msgid "If you want to continue running bind, you must add the RFC 2782 entries in /etc/bind/debian-edu/db.intern"
msgstr ""
# type: CDATA
@@ -3588,10 +3573,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1812
-msgid ""
-"install the packages <computeroutput>pdns-server </computeroutput>, "
-"<computeroutput>pdns-recursor </computeroutput> and <computeroutput>pdns-"
-"backend-ldap </computeroutput>."
+msgid "install the packages <computeroutput>pdns-server </computeroutput>, <computeroutput>pdns-recursor </computeroutput> and <computeroutput>pdns-backend-ldap </computeroutput>."
msgstr ""
# type: CDATA
@@ -3609,16 +3591,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1823
-msgid ""
-"Uncomment the line <computeroutput>include /etc/ldap/schema/dnsdomain2."
-"schema </computeroutput>, if it was commented-out earlier (1.1)."
+msgid "Uncomment the line <computeroutput>include /etc/ldap/schema/dnsdomain2.schema </computeroutput>, if it was commented-out earlier (1.1)."
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1827
-msgid ""
-"It's recommended to index <computeroutput>associatedDomain </"
-"computeroutput>, at the indices area add the lines:"
+msgid "It's recommended to index <computeroutput>associatedDomain </computeroutput>, at the indices area add the lines:"
msgstr ""
# type: CDATA
@@ -3631,15 +3609,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1835
-msgid ""
-"Restart slapd <computeroutput>invoke-rc.d slapd restart </computeroutput>."
+msgid "Restart slapd <computeroutput>invoke-rc.d slapd restart </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1839
-msgid ""
-"Load the DNS data into LDAP either using the default Debian Edu or the "
-"existing Bind9 configuration:"
+msgid "Load the DNS data into LDAP either using the default Debian Edu or the existing Bind9 configuration:"
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><para>
@@ -3649,10 +3624,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1843
-msgid ""
-"Add the contents of <computeroutput>/etc/ldap/dns_skole.ldif </"
-"computeroutput> and <computeroutput>/etc/ldap/dns_arpa.ldif </"
-"computeroutput> using <computeroutput>ldapadd </computeroutput>."
+msgid "Add the contents of <computeroutput>/etc/ldap/dns_skole.ldif </computeroutput> and <computeroutput>/etc/ldap/dns_arpa.ldif </computeroutput> using <computeroutput>ldapadd </computeroutput>."
msgstr ""
# type: CDATA
@@ -3667,19 +3639,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1855
-msgid ""
-"To <ulink url=\"http://www.linuxnetworks.de/doc/index.php/"
-"PowerDNS_LDAP_Backend/Migration\">migrate </ulink> Bind's configuration:"
+msgid "To <ulink url=\"http://www.linuxnetworks.de/doc/index.php/PowerDNS_LDAP_Backend/Migration\">migrate </ulink> Bind's configuration:"
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1858
-msgid ""
-"There is a utility called <computeroutput>zone2ldap </computeroutput> "
-"provided in the PowerDNS distribution which convert zone files used by BIND "
-"to the ldif format, it is broken in Lenny (<ulink url=\"http://bugs.debian."
-"org/504061\">504061 </ulink>) and currently also in unstable and "
-"experimental."
+msgid "There is a utility called <computeroutput>zone2ldap </computeroutput> provided in the PowerDNS distribution which convert zone files used by BIND to the ldif format, it is broken in Lenny (<ulink url=\"http://bugs.debian.org/504061\">504061 </ulink>) and currently also in unstable and experimental."
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
@@ -3689,16 +3654,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1864
-msgid ""
-"Download <ulink url=\"http://packages.debian.org/etch/i386/pdns-backend-ldap/"
-"download\">etch-i386-pdns-backend-ldap </ulink>."
+msgid "Download <ulink url=\"http://packages.debian.org/etch/i386/pdns-backend-ldap/download\">etch-i386-pdns-backend-ldap </ulink>."
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1868
-msgid ""
-"Unpack it using dpkg or dpkg-deb and replace the faulty <computeroutput>/usr/"
-"bin/zone2ldap </computeroutput>:"
+msgid "Unpack it using dpkg or dpkg-deb and replace the faulty <computeroutput>/usr/bin/zone2ldap </computeroutput>:"
msgstr ""
# type: CDATA
@@ -3712,19 +3673,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1875
-msgid ""
-"Apparently PowerDNS in Lenny (2.9.21.2) doesn't understand <ulink url="
-"\"http://www.nabble.com/Re%3A-2.9.21.2%28debian%29-ldap-problem-p21287511."
-"html\">AFSDB records </ulink> same for `zone2ldap', when reading an AFSDB "
-"record it will quit with an error message."
+msgid "Apparently PowerDNS in Lenny (2.9.21.2) doesn't understand <ulink url=\"http://www.nabble.com/Re%3A-2.9.21.2%28debian%29-ldap-problem-p21287511.html\">AFSDB records </ulink> same for `zone2ldap', when reading an AFSDB record it will quit with an error message."
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1878
-msgid ""
-"To workaround this limitation comment-out (with ' ; ') AFSDB records in the "
-"named db.* files, <computeroutput>grep -rl AFSDB /etc/bind/* </"
-"computeroutput> will disclose them."
+msgid "To workaround this limitation comment-out (with ' ; ') AFSDB records in the named db.* files, <computeroutput>grep -rl AFSDB /etc/bind/* </computeroutput> will disclose them."
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
@@ -3743,9 +3697,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1890
-msgid ""
-"Before the data in the new ldif file can be added to the database the "
-"\"basedn\" must be created:"
+msgid "Before the data in the new ldif file can be added to the database the \"basedn\" must be created:"
msgstr ""
# type: CDATA
@@ -3763,9 +3715,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><orderedlist><listitem><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1900
-msgid ""
-"The format of the ldif file created by <computeroutput>zone2ldap </"
-"computeroutput> is suitable for `ldapmodify':"
+msgid "The format of the ldif file created by <computeroutput>zone2ldap </computeroutput> is suitable for `ldapmodify':"
msgstr ""
# type: CDATA
@@ -3778,10 +3728,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1910
-msgid ""
-"Time to stop <computeroutput>bind9 </computeroutput> and start "
-"<computeroutput>pdns </computeroutput> and <computeroutput>pdns-recursor </"
-"computeroutput>:"
+msgid "Time to stop <computeroutput>bind9 </computeroutput> and start <computeroutput>pdns </computeroutput> and <computeroutput>pdns-recursor </computeroutput>:"
msgstr ""
# type: CDATA
@@ -3795,8 +3742,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1919
-msgid ""
-"After testing the new PowerDNS setup Bind9 may be disabled/removed/purged."
+msgid "After testing the new PowerDNS setup Bind9 may be disabled/removed/purged."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -3806,9 +3752,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1929
-msgid ""
-"Some new indexes have been added to openldap's configuration. in order to "
-"benefit from these you need to regenerate indexes:"
+msgid "Some new indexes have been added to openldap's configuration. in order to benefit from these you need to regenerate indexes:"
msgstr ""
# type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -3828,8 +3772,7 @@ msgstr ""
# type: Content of: <article><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1942
-msgid ""
-"start slapd with <computeroutput> invoke-rc.d slapd start </computeroutput>"
+msgid "start slapd with <computeroutput> invoke-rc.d slapd start </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -3839,12 +3782,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1952
-msgid ""
-"The nagios3 configuration will already be installed and functional, though "
-"the nagios2 configuration won't be functional anymore. If you changed the "
-"nagios2 configuration, your changes will be saved in .dpkg-old files, but "
-"the changes will not be applied to the nagios3 configuration. So these "
-"changes have to be redone manually."
+msgid "The nagios3 configuration will already be installed and functional, though the nagios2 configuration won't be functional anymore. If you changed the nagios2 configuration, your changes will be saved in .dpkg-old files, but the changes will not be applied to the nagios3 configuration. So these changes have to be redone manually."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -3854,20 +3792,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1960
-msgid ""
-"Please read this chapter completly before you start upgrading your systems."
+msgid "Please read this chapter completly before you start upgrading your systems."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:1962
-msgid ""
-"In case of problems you could also read the <ulink url=\"http://www.debian."
-"org/releases/stable/releasenotes\">releasenotes for Debian etch </ulink>. "
-"(Debian Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
-"if you are running a 2.4 kernel, you <emphasis>should </emphasis> read the "
-"<ulink url=\"http://www.debian.org/releases/stable/i386/release-notes/ch-"
-"information.en.html#s-upgrade-to-2.6\">notes on upgrading from kernel 2.4 to "
-"2.6 </ulink> before you upgrade!)"
+msgid "In case of problems you could also read the <ulink url=\"http://www.debian.org/releases/stable/releasenotes\">releasenotes for Debian etch </ulink>. (Debian Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but if you are running a 2.4 kernel, you <emphasis>should </emphasis> read the <ulink url=\"http://www.debian.org/releases/stable/i386/release-notes/ch-information.en.html#s-upgrade-to-2.6\">notes on upgrading from kernel 2.4 to 2.6 </ulink> before you upgrade!)"
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -3877,10 +3807,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1971
-msgid ""
-"The main problem upgrading from the sarge-based Release to Terra is that the "
-"Partition Scheme changed completly. The sarge-based Release has two volume "
-"Groups:"
+msgid "The main problem upgrading from the sarge-based Release to Terra is that the Partition Scheme changed completly. The sarge-based Release has two volume Groups:"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3895,21 +3822,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1980
-msgid ""
-"But the etch based release has only 1 Volume Group due to internal changes "
-"of the Installer."
+msgid "But the etch based release has only 1 Volume Group due to internal changes of the Installer."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1982
-msgid ""
-"The main problem is that the vg_system volumegroup is quite small since the "
-"data in this partition is mostly static. When trying the upgrade on a "
-"virtual machine with an 8GB harddrive, the upgrade failed since it was not "
-"possible to free more space on the vg_sytem. Please note that you should "
-"have about 1,5GB free space on /var and about 600MB free space on /usr. If "
-"this is not the case the upgrade will fail because of too little free space "
-"on the device."
+msgid "The main problem is that the vg_system volumegroup is quite small since the data in this partition is mostly static. When trying the upgrade on a virtual machine with an 8GB harddrive, the upgrade failed since it was not possible to free more space on the vg_sytem. Please note that you should have about 1,5GB free space on /var and about 600MB free space on /usr. If this is not the case the upgrade will fail because of too little free space on the device."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -3919,17 +3837,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:1989
-msgid ""
-"If you have enough space in the vg_system volumegroup but not in the lv_var "
-"partition, you have to resize this partition:"
+msgid "If you have enough space in the vg_system volumegroup but not in the lv_var partition, you have to resize this partition:"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:1991
-msgid ""
-"1.) Umount the <computeroutput>/var </computeroutput> partition, you 'll "
-"have to umount the <computeroutput>/var/spool/squid </computeroutput> "
-"partition for this to work, too:"
+msgid "1.) Umount the <computeroutput>/var </computeroutput> partition, you 'll have to umount the <computeroutput>/var/spool/squid </computeroutput> partition for this to work, too:"
msgstr ""
# type: CDATA
@@ -3990,9 +3903,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2024
-msgid ""
-"Now modify <computeroutput>/etc/apt/sources.list </computeroutput> to "
-"contain these lines"
+msgid "Now modify <computeroutput>/etc/apt/sources.list </computeroutput> to contain these lines"
msgstr ""
# type: CDATA
@@ -4024,22 +3935,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2043
-msgid ""
-"Here we can give you some hints, what you should answer to the debconf "
-"question during the upgrade. But please note: This upgrade HowTo is based on "
-"a very plain fresh installation of an mainserver + terminalserver."
+msgid "Here we can give you some hints, what you should answer to the debconf question during the upgrade. But please note: This upgrade HowTo is based on a very plain fresh installation of an mainserver + terminalserver."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2045
-msgid ""
-"Which questions exactly raise up in addition to the ones described here "
-"depends on what is additionally installed on your system. (Additionally to "
-"what is installed as default in the sarge based Debian Edu release). So if "
-"there are any questions which you don't know how to answer, don't hesitate "
-"to ask us at the mailinglist (<ulink url=\"mailto:debian-edu at lists.debian.org"
-"\">debian-edu at lists.debian.org </ulink>) or at IRC (irc.oftc.net): #debian-"
-"edu."
+msgid "Which questions exactly raise up in addition to the ones described here depends on what is additionally installed on your system. (Additionally to what is installed as default in the sarge based Debian Edu release). So if there are any questions which you don't know how to answer, don't hesitate to ask us at the mailinglist (<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian.org </ulink>) or at IRC (irc.oftc.net): #debian-edu."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -4049,9 +3950,7 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2050
-msgid ""
-"Here you have to enter a password for the <emphasis>nagiosadmin </emphasis> "
-"user."
+msgid "Here you have to enter a password for the <emphasis>nagiosadmin </emphasis> user."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -4091,10 +3990,7 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2075
-msgid ""
-"If you choose \"yes\", this will help us improve Debian Edu. (We'll get an "
-"weekly report which programs are how often used). The data is gathered "
-"anonymously and you have the option to say \"no\"."
+msgid "If you choose \"yes\", this will help us improve Debian Edu. (We'll get an weekly report which programs are how often used). The data is gathered anonymously and you have the option to say \"no\"."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -4109,8 +4005,7 @@ msgstr ""
# type: Content of: <article><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2085
-msgid ""
-"Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
+msgid "Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
msgstr ""
# type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -4130,9 +4025,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2097
-msgid ""
-"These are the debconf questions you will see if you have no additional "
-"packages installed."
+msgid "These are the debconf questions you will see if you have no additional packages installed."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -4142,11 +4035,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2101
-msgid ""
-"Please note: You will be asked several times if you want to keep your old "
-"modified version of a configfile or if you want to get the latest. The "
-"default is to keep your modified one. Unless you really have modified "
-"something, please always choose: \"Install the latest one\"."
+msgid "Please note: You will be asked several times if you want to keep your old modified version of a configfile or if you want to get the latest. The default is to keep your modified one. Unless you really have modified something, please always choose: \"Install the latest one\"."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -4166,12 +4055,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2109
-msgid ""
-"To fix this you have to edit these two files: <emphasis>/var/lib/dpkg/info/"
-"mozilla-firefox-locale-it.postrm </emphasis> and <emphasis>/var/lib/dpkg/"
-"info/mozilla-firefox-local-el.postrm </emphasis> and comment out in both the "
-"line containing: <emphasis>update-mozilla-firefox-chrome </emphasis>. Then "
-"restart the upgrade process with:"
+msgid "To fix this you have to edit these two files: <emphasis>/var/lib/dpkg/info/mozilla-firefox-locale-it.postrm </emphasis> and <emphasis>/var/lib/dpkg/info/mozilla-firefox-local-el.postrm </emphasis> and comment out in both the line containing: <emphasis>update-mozilla-firefox-chrome </emphasis>. Then restart the upgrade process with:"
msgstr ""
# type: CDATA
@@ -4211,11 +4095,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2128
-msgid ""
-"In order to fix this, rename this directory: <emphasis>/var/backups/dc=skole,"
-"dc=skolelinux,dc=no-2.2.23-8.ldapdb </emphasis> and since openldap now runs "
-"as user <emphasis>openldap </emphasis> (instead of as root) the permissions "
-"of the configuration files have to be changed:"
+msgid "In order to fix this, rename this directory: <emphasis>/var/backups/dc=skole,dc=skolelinux,dc=no-2.2.23-8.ldapdb </emphasis> and since openldap now runs as user <emphasis>openldap </emphasis> (instead of as root) the permissions of the configuration files have to be changed:"
msgstr ""
# type: CDATA
@@ -4228,10 +4108,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2134
-msgid ""
-"Then the installation should finish <emphasis role=\"strong\">without </"
-"emphasis> an error. Since now many packages are not upgrades please restart "
-"the dist-upgrade process again with:"
+msgid "Then the installation should finish <emphasis role=\"strong\">without </emphasis> an error. Since now many packages are not upgrades please restart the dist-upgrade process again with:"
msgstr ""
# type: CDATA
@@ -4267,15 +4144,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2147
-msgid ""
-"and wait until it is finished.Then restart the dist-upgrade process again."
+msgid "and wait until it is finished.Then restart the dist-upgrade process again."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2149
-msgid ""
-"If you have only the default packages installed the upgrade process should "
-"now finish without raising more errors."
+msgid "If you have only the default packages installed the upgrade process should now finish without raising more errors."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -4285,9 +4159,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2156
-msgid ""
-"The only remaining upgrade issue is that the user of bind9 has changed, so "
-"you'll have to chown all bind-configuration files."
+msgid "The only remaining upgrade issue is that the user of bind9 has changed, so you'll have to chown all bind-configuration files."
msgstr ""
# type: CDATA
@@ -4298,9 +4170,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2159
-msgid ""
-"See <ulink url=\"http://bugs.debian.org/386791\">386791 </ulink> for more "
-"information."
+msgid "See <ulink url=\"http://bugs.debian.org/386791\">386791 </ulink> for more information."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -4310,20 +4180,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2167
-msgid ""
-"There has been a change in how samba handles groupmaps between sarge and "
-"etch. Samba in sarge handled groupmaps internally, so a unix group was also "
-"a samba group. In etch samba keeps groupmap information in the LDAP "
-"database. Unfortunatly this issue was discovered too late for our LDAP admin "
-"tool \"lwat\" to be aware of the situation."
+msgid "There has been a change in how samba handles groupmaps between sarge and etch. Samba in sarge handled groupmaps internally, so a unix group was also a samba group. In etch samba keeps groupmap information in the LDAP database. Unfortunatly this issue was discovered too late for our LDAP admin tool \"lwat\" to be aware of the situation."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2169
-msgid ""
-"When you upgrade your LDAP from a sarge installation, you must make sure to "
-"create the Domain Admins account, neccessary for correct samba domain "
-"operation. Create the Domain Admins account with the command:"
+msgid "When you upgrade your LDAP from a sarge installation, you must make sure to create the Domain Admins account, neccessary for correct samba domain operation. Create the Domain Admins account with the command:"
msgstr ""
# type: CDATA
@@ -4337,12 +4199,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2174
-msgid ""
-"If you want your Windows computers to be aware of what groups users are in, "
-"you must create the groupmaps in LDAP manually, this is explained in more "
-"detail in the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Etch/HowTo/NetworkClients#\">HowTo/NetworkClients </ulink> chapter of this "
-"manual."
+msgid "If you want your Windows computers to be aware of what groups users are in, you must create the groupmaps in LDAP manually, this is explained in more detail in the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Etch/HowTo/NetworkClients#\">HowTo/NetworkClients </ulink> chapter of this manual."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -4352,18 +4209,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2183
-msgid ""
-"Upgrades from the woody based Debian Edu / Skolelinux installation are not "
-"supported. Upgrade to the sarge based version first, a howto can be found at "
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0\"/>. Then "
-"upgrade to Terrra (etch-based Release)."
+msgid "Upgrades from the woody based Debian Edu / Skolelinux installation are not supported. Upgrade to the sarge based version first, a howto can be found at <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/UpgradeFrom1.0\"/>. Then upgrade to Terrra (etch-based Release)."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2185
-msgid ""
-"<ulink url=\"http://wiki.debian.org/CategoryPermalink#\">CategoryPermalink </"
-"ulink>"
+msgid "<ulink url=\"http://wiki.debian.org/CategoryPermalink#\">CategoryPermalink </ulink>"
msgstr ""
# type: Content of: <article><section><title>
@@ -4373,37 +4224,27 @@ msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2194
-msgid ""
-"HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"HowTo/Administration#\">general administration </ulink>"
+msgid "HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/Administration#\">general administration </ulink>"
msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2198
-msgid ""
-"HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"HowTo/Desktop#\">the desktop </ulink>"
+msgid "HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/Desktop#\">the desktop </ulink>"
msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2202
-msgid ""
-"HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"HowTo/NetworkClients#\">networked clients </ulink>"
+msgid "HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/NetworkClients#\">networked clients </ulink>"
msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2206
-msgid ""
-"HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"HowTo/TeachAndLearn#\">teaching and learning </ulink>"
+msgid "HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/TeachAndLearn#\">teaching and learning </ulink>"
msgstr ""
# type: Content of: <article><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2210
-msgid ""
-"HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"HowTo/Users#\">Users </ulink>"
+msgid "HowTos for <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/Users#\">Users </ulink>"
msgstr ""
# type: Content of: <article><section><title>
@@ -4413,6 +4254,17 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:2220
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/GettingStarted#\">Getting Started </ulink> and <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/Maintainance#\">DebianEdu/Documentation/Lenny/Maintainance </ulink> chapters describe how to get started with Debian Edu and how to do the basic maintainance work. The howtos in this chapter are already \"advanced\" tipps and tricks."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
+"GettingStarted#\">Getting Started </ulink> and <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Documentation/Lenny/Maintainance#\">DebianEdu/"
+"Documentation/Lenny/Maintainance </ulink> chapters describe how to get "
+"started with Debian Edu and how to do the basic maintainance work. The "
+"howtos in this chapter are already \"advanced\" tipps and tricks."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
"GettingStarted#\">Getting Started </ulink> and <ulink url=\"http://wiki."
@@ -4420,31 +4272,159 @@ msgid ""
"Documentation/Lenny/Maintainance </ulink> chapters describe how to get "
"started with Debian Edu and how to do the basic maintainance work. The "
"howtos in this chapter have some more \"advanced\" tips and tricks."
+<<<< 125968969722687
+msgstr ""
+
+# type: Content of: <article><section><section><title>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:2220
+msgid "Automatic cleanup of left-over process"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2222
+msgid "<computeroutput>killer </computeroutput> is is a perl script that gets rid of background jobs. Background jobs are defined as processes that belong to users who are not currently logged into the machine. It's run by cron job once an hour."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2229
+msgid "</inlinemediaobject> Due to (<ulink url=\"http://bugs.debian.org/551753\">551753 </ulink>) (also documented as <ulink url=\"http://bugs.skolelinux.org/show_bug.cgi?id=1373\"/>) <computeroutput>killer </computeroutput> should not be installed on thin-client servers when long usernames are used!"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2233
+msgid "To install it run the following command as root:"
+msgstr ""
+
+# type: CDATA
+#: debian-edu-lenny-manual.xml:2234
+#, no-wrap
+msgid "apt-get install killer]]"
+msgstr ""
+
+# type: Content of: <article><section><section><title>
+#: debian-edu-lenny-manual.xml:2239
+msgid "Installing single service machines for spreading the load from main-server"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2242
+msgid "FIXME: this is so generic its almost useless"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2244
+msgid "barebone install using debian-edu-expert"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2247
+msgid "install the packages for the service"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2250
+msgid "configure the service"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2253
+msgid "disable the service on main-server"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2256
+msgid "update DNS on main-server"
+msgstr ""
+
+# type: Content of: <article><section><section><title>
+#: debian-edu-lenny-manual.xml:2263
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:2220
+msgid "Automatic cleanup of left-over process"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2222
+msgid ""
+"<computeroutput>killer </computeroutput> is is a perl script that gets rid "
+"of background jobs. Background jobs are defined as processes that belong to "
+"users who are not currently logged into the machine. It's run by cron job "
+"once an hour."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2229
+msgid ""
+"</inlinemediaobject> Due to (<ulink url=\"http://bugs.debian.org/551753"
+"\">551753 </ulink>) (also documented as <ulink url=\"http://bugs.skolelinux."
+"org/show_bug.cgi?id=1373\"/>) <computeroutput>killer </computeroutput> "
+"should not be installed on thin-client servers when long usernames are used!"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2233
+msgid "To install it run the following command as root:"
+msgstr ""
+
+# type: CDATA
+#: debian-edu-lenny-manual.xml:2234
+#, no-wrap
+msgid "apt-get install killer]]"
+msgstr ""
+
+# type: Content of: <article><section><section><title>
+#: debian-edu-lenny-manual.xml:2239
+msgid ""
+"Installing single service machines for spreading the load from main-server"
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2242
+msgid "FIXME: this is so generic its almost useless"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2244
+msgid "barebone install using debian-edu-expert"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2247
+msgid "install the packages for the service"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2250
+msgid "configure the service"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2253
+msgid "disable the service on main-server"
+msgstr ""
+
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#: debian-edu-lenny-manual.xml:2256
+msgid "update DNS on main-server"
msgstr ""
# type: Content of: <article><section><section><title>
+#: debian-edu-lenny-manual.xml:2263
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:2226
+<<<< 125968969722687
msgid "Tracking /etc/ using the svk version control system"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2228
-msgid ""
-"With the introduction of the <computeroutput>debian-edu-etc-svk </"
-"computeroutput> script in Debian Edu, all files in <computeroutput>/etc/ </"
-"computeroutput> are tracked using <ulink url=\"http://svk.bestpractical.com"
-"\">svk </ulink> as a version control system. This make it possible to see "
-"when a file added, changed and removed, as well as what was changed if the "
-"file is a text file. The svk repository is stored in <computeroutput>~root/."
-"svk/ </computeroutput>."
+msgid "With the introduction of the <computeroutput>debian-edu-etc-svk </computeroutput> script in Debian Edu, all files in <computeroutput>/etc/ </computeroutput> are tracked using <ulink url=\"http://svk.bestpractical.com\">svk </ulink> as a version control system. This make it possible to see when a file added, changed and removed, as well as what was changed if the file is a text file. The svk repository is stored in <computeroutput>~root/.svk/ </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2234
-msgid ""
-"This feature is activated automatically in the Etch and Lenny based versions "
-"of Debian Edu, and all changes done during installation are registered. "
-"Changes in <computeroutput>/etc/ </computeroutput> are commited every hour."
+msgid "This feature is activated automatically in the Etch and Lenny based versions of Debian Edu, and all changes done during installation are registered. Changes in <computeroutput>/etc/ </computeroutput> are commited every hour."
msgstr ""
# type: Content of: <article><section><section><para>
@@ -4470,9 +4450,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2248
-msgid ""
-"In a freshly installed system try this to see all changes done since the "
-"system was installed:"
+msgid "In a freshly installed system try this to see all changes done since the system was installed:"
msgstr ""
# type: CDATA
@@ -4494,9 +4472,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2254
-msgid ""
-"Here check revision numbers by date and time, Then to see all changes done "
-"since revision N say:"
+msgid "Here check revision numbers by date and time, Then to see all changes done since revision N say:"
msgstr ""
# type: CDATA
@@ -4507,9 +4483,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2257
-msgid ""
-"To see the changes done to a specific file between specific revisions, "
-"specify the file and both revisions:"
+msgid "To see the changes done to a specific file between specific revisions, specify the file and both revisions:"
msgstr ""
# type: CDATA
@@ -4520,9 +4494,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2260
-msgid ""
-"To revert a change, use the diff command to look at the change, and edit the "
-"file to undo the change, or use a command like this to do it automatically:"
+msgid "To revert a change, use the diff command to look at the change, and edit the file to undo the change, or use a command like this to do it automatically:"
msgstr ""
# type: CDATA
@@ -4533,8 +4505,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2263
-msgid ""
-"To manually commit a file, because you don't want to wait up to an hour:"
+msgid "To manually commit a file, because you don't want to wait up to an hour:"
msgstr ""
# type: CDATA
@@ -4545,11 +4516,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:2266
-msgid ""
-"If you don't want a specific file to be tracked in svk, you can tell to "
-"ignore it. But this is rarely useful "
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+msgid "If you don't want a specific file to be tracked in svk, you can tell to ignore it. But this is rarely useful <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: CDATA
@@ -4565,10 +4532,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2278
-msgid ""
-"/etc in svk was introduced with the etch based release of Debian Edu. If you "
-"installed your system prior to this, you need to initialize svk once with "
-"the following command run as root:"
+msgid "/etc in svk was introduced with the etch based release of Debian Edu. If you installed your system prior to this, you need to initialize svk once with the following command run as root:"
msgstr ""
# type: CDATA
@@ -4579,9 +4543,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2281
-msgid ""
-"This adds all files in /etc to svk and also activates the hourly commit "
-"cronjob."
+msgid "This adds all files in /etc to svk and also activates the hourly commit cronjob."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -4591,37 +4553,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2289
-msgid ""
-"Most partitions in Debian Edu are logical LVM volumes. Only the /boot/ "
-"partition is not. With the Debian/Etch release of Debian Edu, it is possible "
-"to extend partitions while they are mounted. This is a feature of the Linux "
-"kernel since version 2.6.10. Shrinking partitions still need to happen "
-"while the partition is unmounted."
+msgid "Most partitions in Debian Edu are logical LVM volumes. Only the /boot/ partition is not. With the Debian/Etch release of Debian Edu, it is possible to extend partitions while they are mounted. This is a feature of the Linux kernel since version 2.6.10. Shrinking partitions still need to happen while the partition is unmounted."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2291
-msgid ""
-"It is a good idea to avoid creating very large partitions, as large "
-"partitions will take a long time to restore from backup if the need should "
-"arise, and file system check take a very long time for large partitions. A "
-"good limit can be 20 GiB. It is better, if possible, to create several "
-"smaller partitions than one very large one."
+msgid "It is a good idea to avoid creating very large partitions, as large partitions will take a long time to restore from backup if the need should arise, and file system check take a very long time for large partitions. A good limit can be 20 GiB. It is better, if possible, to create several smaller partitions than one very large one."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2293
-msgid ""
-"To make it easier to extend full partitions, the <computeroutput>debian-edu-"
-"fsautoresize </computeroutput> script is provided. When invoked, it reads "
-"the configuration from <computeroutput>/usr/share/debian-edu-config/"
-"fsautoresizetab </computeroutput>, <computeroutput>/site/etc/fsautoresizetab "
-"</computeroutput> and <computeroutput>/etc/fsautoresizetab </"
-"computeroutput>, and based on the rules provided in these files propose to "
-"extend partitions with too little free space. Without any arguments, it "
-"will only write the commands needed to extend the file system, and the "
-"argument <computeroutput>-n </computeroutput> is needed to actually extend "
-"the file systems."
+msgid "To make it easier to extend full partitions, the <computeroutput>debian-edu-fsautoresize </computeroutput> script is provided. When invoked, it reads the configuration from <computeroutput>/usr/share/debian-edu-config/fsautoresizetab </computeroutput>, <computeroutput>/site/etc/fsautoresizetab </computeroutput> and <computeroutput>/etc/fsautoresizetab </computeroutput>, and based on the rules provided in these files propose to extend partitions with too little free space. Without any arguments, it will only write the commands needed to extend the file system, and the argument <computeroutput>-n </computeroutput> is needed to actually extend the file systems."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -4631,18 +4573,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2304
-msgid ""
-"Logical Volumne Management (LVM) enables resizing the partitions while they "
-"are mounted and in use. You can learn more about LVM in the <ulink url="
-"\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo </ulink>."
+msgid "Logical Volumne Management (LVM) enables resizing the partitions while they are mounted and in use. You can learn more about LVM in the <ulink url=\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo </ulink>."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2307
-msgid ""
-"To extend a logical volume manually you simply tell the "
-"<computeroutput>lvextend </computeroutput> command how large you want it to "
-"grow to."
+msgid "To extend a logical volume manually you simply tell the <computeroutput>lvextend </computeroutput> command how large you want it to grow to."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -4663,6 +4599,24 @@ msgstr ""
msgid "Using volatile.debian.org"
msgstr ""
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2357
+msgid "Since <ulink url=\"http://volatile.debian.org\">volatile.debian.org </ulink> is a relativly new service, introduced with Debian Etch, it's not enabled on default installations. FIXME: check if volatile is enabled on new installs automatically"
+msgstr ""
+
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2357
+msgid ""
+"Since <ulink url=\"http://volatile.debian.org\">volatile.debian.org </ulink> "
+"is a relativly new service, introduced with Debian Etch, it's not enabled on "
+"default installations. FIXME: check if volatile is enabled on new installs "
+"automatically"
+msgstr ""
+
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+<<<< 125968969722687
# type: Content of: <article><section><section><section><title>
#: debian-edu-lenny-manual.xml:2322
msgid "What is debian-volatile?"
@@ -4675,14 +4629,7 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2327
-msgid ""
-"Some packages aim at fast moving targets, such as spam filtering and virus "
-"scanning, and even when using updated data patterns, they do not really work "
-"for the full time of a stable release. The main goal of volatile is allowing "
-"system administrators to update their systems in a nice, consistent way, "
-"without getting the drawbacks of using unstable, even without getting the "
-"drawbacks for the selected packages. So debian-volatile will only contain "
-"changes to stable programs that are necessary to keep them functional."
+msgid "Some packages aim at fast moving targets, such as spam filtering and virus scanning, and even when using updated data patterns, they do not really work for the full time of a stable release. The main goal of volatile is allowing system administrators to update their systems in a nice, consistent way, without getting the drawbacks of using unstable, even without getting the drawbacks for the selected packages. So debian-volatile will only contain changes to stable programs that are necessary to keep them functional."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -4692,10 +4639,49 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2336
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "Since the volatile archive key is included in the <computeroutput>debian-archive-keyring </computeroutput> package, which is installed by default, you do not have to add this key manually to roots keyring anymore. Just add the following line to <computeroutput>/etc/apt/sources.list </computeroutput>:"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"Since the volatile archive key is included in the <computeroutput>debian-"
+"archive-keyring </computeroutput> package, which is installed by default, "
+"you do not have to add this key manually to roots keyring anymore. Just add "
+"the following line to <computeroutput>/etc/apt/sources.list </"
+"computeroutput>:"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"Since the Lenny release, the volatile archive is enabled and used by default."
+<<<< 125968969722687
+msgstr ""
+
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+# type: CDATA
+#: debian-edu-lenny-manual.xml:2380
+#, no-wrap
+msgid "deb http://volatile.debian.org/debian-volatile lenny/volatile main]]"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2382
+msgid "And run <computeroutput>aptitude update && aptitude upgrade </computeroutput>."
+msgstr ""
+
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+# type: CDATA
+#: debian-edu-lenny-manual.xml:2380
+#, no-wrap
+msgid "deb http://volatile.debian.org/debian-volatile lenny/volatile main]]"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2382
+msgid ""
+"And run <computeroutput>aptitude update && aptitude upgrade </"
+"computeroutput>."
msgstr ""
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+<<<< 125968969722687
# type: Content of: <article><section><section><title>
#: debian-edu-lenny-manual.xml:2342
msgid "Using backports.org to install newer software"
@@ -4703,32 +4689,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2344
-msgid ""
-"You are running Debian Edu, because you prefer the stability of Debian Edu. "
-"It runs great, there is just one problem: sometimes software is a little bit "
-"more outdated as you like. This is where backports.org steps in."
+msgid "You are running Debian Edu, because you prefer the stability of Debian Edu. It runs great, there is just one problem: sometimes software is a little bit more outdated as you like. This is where backports.org steps in."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2346
-msgid ""
-"Backports are recompiled packages from Debian testing (mostly) and Debian "
-"unstable (in a few cases only, e.g. security updates), so they will run "
-"without new libraries (wherever it is possible) on a stable Debian "
-"distribution like Debian Edu. <emphasis role=\"strong\">We recommend you to "
-"pick out single backports which fits your needs, and not to use all "
-"backports available there. </emphasis> Please follow the instructions on "
-"<ulink url=\"http://www.backports.org\"/> to use these backports."
+msgid "Backports are recompiled packages from Debian testing (mostly) and Debian unstable (in a few cases only, e.g. security updates), so they will run without new libraries (wherever it is possible) on a stable Debian distribution like Debian Edu. <emphasis role=\"strong\">We recommend you to pick out single backports which fits your needs, and not to use all backports available there. </emphasis> Please follow the instructions on <ulink url=\"http://www.backports.org\"/> to use these backports."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2349
-msgid ""
-"You will need to add the backports.org archive key to root's "
-"<computeroutput>gpg </computeroutput> keyring, so that <computeroutput>apt </"
-"computeroutput> can use this repository <ulink url=\"http://wiki.debian.org/"
-"SecureApt\">securily </ulink>. This is done by running these commands as "
-"root:"
+msgid "You will need to add the backports.org archive key to root's <computeroutput>gpg </computeroutput> keyring, so that <computeroutput>apt </computeroutput> can use this repository <ulink url=\"http://wiki.debian.org/SecureApt\">securily </ulink>. This is done by running these commands as root:"
msgstr ""
# type: CDATA
@@ -4749,21 +4720,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2364
-msgid ""
-"Then you can either use <computeroutput>aptitude -t lenny-backports install "
-"<packagename> </computeroutput> to install or update packages once, or "
-"you can configure a package to be always installed from backports.org though "
-"<computeroutput>/etc/apt/preferences </computeroutput> which is described in "
-"the <ulink url=\"http://www.backports.org/dokuwiki/doku.php?id=instructions"
-"\">instructions on backports.org </ulink>."
+msgid "Then you can either use <computeroutput>aptitude -t lenny-backports install <packagename> </computeroutput> to install or update packages once, or you can configure a package to be always installed from backports.org though <computeroutput>/etc/apt/preferences </computeroutput> which is described in the <ulink url=\"http://www.backports.org/dokuwiki/doku.php?id=instructions\">instructions on backports.org </ulink>."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2369
-msgid ""
-"The second variant has the advantage, that updates to backports are "
-"installed automatically when they are available. With the first variant you "
-"need to update manually."
+msgid "The second variant has the advantage, that updates to backports are installed automatically when they are available. With the first variant you need to update manually."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -4773,22 +4735,78 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2380
-msgid ""
-"</inlinemediaobject> FIXME: Should we recommend openjdk-6-* from main "
-"instead documenting sun-java6-jre? Not sure if a plugin is available..."
+msgid "</inlinemediaobject> FIXME: Should we recommend openjdk-6-* from main instead documenting sun-java6-jre? Not sure if a plugin is available..."
msgstr ""
# type: Content of: <article><section><section><para>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:2436
+msgid "A boot script <computeroutput>open-backdoor </computeroutput> is provided in the <computeroutput>debian-edu-config </computeroutput> package to \"break out\" from behind a firewall. It is useful for system administrators responsible for several Debian Edu installations. It set up an SSH tunnel to another machine, allowing ssh login from the outside of the firewall."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:2436
+msgid ""
+"A boot script <computeroutput>open-backdoor </computeroutput> is provided in "
+"the <computeroutput>debian-edu-config </computeroutput> package to \"break "
+"out\" from behind a firewall. It is useful for system administrators "
+"responsible for several Debian Edu installations. It set up an SSH tunnel "
+"to another machine, allowing ssh login from the outside of the firewall."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:2383
msgid "To install JAVA from Sun run this command:"
+<<<< 125968969722687
+msgstr ""
+
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2440
+msgid "To enable it, create a ssh key without a password, create a user on a remote host to use for ssh login, copy the public key into ~/.ssh/authorized_keys for the remote user used for and specify the login information in <computeroutput>/etc/default/backdoor </computeroutput>."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2443
+msgid "Content of <computeroutput>/etc/default/backdoor </computeroutput> should be similar to this:"
+msgstr ""
+
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2440
+msgid ""
+"To enable it, create a ssh key without a password, create a user on a remote "
+"host to use for ssh login, copy the public key into ~/.ssh/authorized_keys "
+"for the remote user used for and specify the login information in "
+"<computeroutput>/etc/default/backdoor </computeroutput>."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2443
+msgid ""
+"Content of <computeroutput>/etc/default/backdoor </computeroutput> should be "
+"similar to this:"
msgstr ""
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+<<<< 125968969722687
# type: CDATA
#: debian-edu-lenny-manual.xml:2384
#, no-wrap
msgid "apt-get install sun-java6-plugin sun-java6-jre sun-java6-fonts]]"
msgstr ""
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2450
+msgid "FIXME: paragraph about access from outside need to be completed and tested."
+msgstr ""
+
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+# type: Content of: <article><section><section><para>
+#: debian-edu-lenny-manual.xml:2450
+msgid ""
+"FIXME: paragraph about access from outside need to be completed and tested."
+msgstr ""
+
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+<<<< 125968969722687
# type: Content of: <article><section><section><title>
#: debian-edu-lenny-manual.xml:2389
msgid "Creating folders in the home directories of all users"
@@ -4796,17 +4814,22 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2391
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "With this script the administrator can create a folder in each users home directory and set access permissions and Ownership."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"With this script the administrator can create a folder in each users home "
+"directory and set access permissions and Ownership."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"With this script the administrator can create a folder in each users home "
"directory and set access permissions and ownership."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2393
-msgid ""
-"In the example shown below with group=teachers and permissions=2770 a user "
-"can hand in an assignment by saving the file to the folder \"assignments\" "
-"where teachers are given write access to be able to make comments."
+msgid "In the example shown below with group=teachers and permissions=2770 a user can hand in an assignment by saving the file to the folder \"assignments\" where teachers are given write access to be able to make comments."
msgstr ""
# type: CDATA
@@ -4828,7 +4851,8 @@ msgid ""
" chown $user:$group $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" . echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
+" . echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n"
+"\"\n"
" . fi\n"
"done\n"
"echo \"$created_dir folders has been created\"]]"
@@ -4841,19 +4865,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2419
-msgid ""
-"When users insert a usb or cdrom into a <ulink url=\"http://wiki.debian.org/"
-"ThinClient#\">ThinClient </ulink> there is no popup window like they are "
-"used to from their usual Desktop. Instead they have to browse to the /media/"
-"$user folder. This is too difficult for non experienced users."
+msgid "When users insert a usb or cdrom into a <ulink url=\"http://wiki.debian.org/ThinClient#\">ThinClient </ulink> there is no popup window like they are used to from their usual Desktop. Instead they have to browse to the /media/$user folder. This is too difficult for non experienced users."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2422
-msgid ""
-"With the following script the symlink \"Media\" is created for all users in "
-"the home folder for easy access to USB-keys, CDROM or whatever media is "
-"connected to the thin client."
+msgid "With the following script the symlink \"Media\" is created for all users in the home folder for easy access to USB-keys, CDROM or whatever media is connected to the thin client."
msgstr ""
# type: CDATA
@@ -4865,13 +4882,22 @@ msgid ""
" if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
" ln -s /media/$home $home_path/$home/$shared_folder ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n"
+"\"\n"
" fi\n"
"done\n"
"echo \"$created_dir folders has been created\"]]"
msgstr ""
# type: Content of: <article><section><section><title>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:2502
+#: debian-edu-lenny-manual.xml:3212
+#: debian-edu-lenny-manual.xml:3295
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:2502 debian-edu-lenny-manual.xml:3212
+#: debian-edu-lenny-manual.xml:3295
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:2436
msgid "Automatic cleanup of left-over processes"
msgstr ""
@@ -5115,18 +5141,23 @@ msgstr ""
# type: Content of: <article><section><section><title>
#: debian-edu-lenny-manual.xml:2561 debian-edu-lenny-manual.xml:3282
#: debian-edu-lenny-manual.xml:3365
+<<<< 125968969722687
msgid "HowTos from wiki.debian.org"
msgstr ""
# type: Content of: <article><section><section><para>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:2504
+#: debian-edu-lenny-manual.xml:3214
+#: debian-edu-lenny-manual.xml:3297
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:2504 debian-edu-lenny-manual.xml:3214
+#: debian-edu-lenny-manual.xml:3297
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:2563 debian-edu-lenny-manual.xml:3284
#: debian-edu-lenny-manual.xml:3367
-msgid ""
-"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
-"either user- or developer-specific. Let's move the user-specific HowTos over "
-"here (and delete them over there)! (But first ask the authors (see the "
-"history of those pages to find them) if they are fine with moving the howto "
-"and putting it under the GPL.)"
+<<<< 125968969722687
+msgid "The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are either user- or developer-specific. Let's move the user-specific HowTos over here (and delete them over there)! (But first ask the authors (see the history of those pages to find them) if they are fine with moving the howto and putting it under the GPL.)"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -5151,9 +5182,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2577
-msgid ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
-"\"/>"
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication\"/>"
msgstr ""
# type: Content of: <article><section><title>
@@ -5173,9 +5202,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2593
-msgid ""
-"<emphasis role=\"strong\">debian_edu_pupils </emphasis> (enabled for members "
-"of the students file group)"
+msgid "<emphasis role=\"strong\">debian_edu_pupils </emphasis> (enabled for members of the students file group)"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -5185,9 +5212,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2599
-msgid ""
-"makes sure that the programs behind the desktop icons also show up in the "
-"kde panel"
+msgid "makes sure that the programs behind the desktop icons also show up in the kde panel"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -5207,37 +5232,22 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2612
-msgid ""
-"<emphasis role=\"strong\">debian_edu_root </emphasis> (enabled for the root "
-"user and members of the admins file group)"
+msgid "<emphasis role=\"strong\">debian_edu_root </emphasis> (enabled for the root user and members of the admins file group)"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2615
-msgid ""
-"adds a desktop icon to connect to the local webserver on tjener to provide "
-"easy access to all the administration programs"
+msgid "adds a desktop icon to connect to the local webserver on tjener to provide easy access to all the administration programs"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2619
-msgid ""
-"<emphasis role=\"strong\">Note: </emphasis>: modifications to the profiles "
-"can be done using <computeroutput>kiosktool </computeroutput>. However, "
-"unless you follow the step below, your changes will be overwritten by "
-"upgrades. FIXME: this is broken and a bug should be filed: kiosktool "
-"upgrades restore default desktop icons"
+msgid "<emphasis role=\"strong\">Note: </emphasis>: modifications to the profiles can be done using <computeroutput>kiosktool </computeroutput>. However, unless you follow the step below, your changes will be overwritten by upgrades. FIXME: this is broken and a bug should be filed: kiosktool upgrades restore default desktop icons"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2624
-msgid ""
-"If you want to modify the kiosk profiles, you can either copy the existing "
-"ones and modify them, or create new kiosk profiles in (for example) "
-"<computeroutput>/etc/kde3/kioskprofiles/ </computeroutput> and enable them "
-"in <computeroutput>/etc/kde-user-profile </computeroutput>. The kiosk tool "
-"will do this for you if you click \"profile properties\" and browse to a new "
-"folder."
+msgid "If you want to modify the kiosk profiles, you can either copy the existing ones and modify them, or create new kiosk profiles in (for example) <computeroutput>/etc/kde3/kioskprofiles/ </computeroutput> and enable them in <computeroutput>/etc/kde-user-profile </computeroutput>. The kiosk tool will do this for you if you click \"profile properties\" and browse to a new folder."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -5247,18 +5257,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2633
-msgid ""
-"After you have made changes to the kioskmode settings with kiosktool like "
-"described above, you will have to copy some files inside the chroot used by "
-"the diskless workstation."
+msgid "After you have made changes to the kioskmode settings with kiosktool like described above, you will have to copy some files inside the chroot used by the diskless workstation."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2635
-msgid ""
-"Assuming the diskless workstations are running <computeroutput>i386 </"
-"computeroutput>, the following commands must be executed on the workstation "
-"server(s):"
+msgid "Assuming the diskless workstations are running <computeroutput>i386 </computeroutput>, the following commands must be executed on the workstation server(s):"
msgstr ""
# type: CDATA
@@ -5274,10 +5278,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2643
-msgid ""
-"Else replace <computeroutput>i386 </computeroutput> with "
-"<computeroutput>amd64 </computeroutput> or <computeroutput>powerpc </"
-"computeroutput> as applicable."
+msgid "Else replace <computeroutput>i386 </computeroutput> with <computeroutput>amd64 </computeroutput> or <computeroutput>powerpc </computeroutput> as applicable."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -5287,10 +5288,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2652
-msgid ""
-"If you don't want to use kioskmode, either just remove the file "
-"<computeroutput>/etc/kderc </computeroutput>. Or, if you just want to "
-"temporarily disable kioskmode, comment out all entries in there."
+msgid "If you don't want to use kioskmode, either just remove the file <computeroutput>/etc/kderc </computeroutput>. Or, if you just want to temporarily disable kioskmode, comment out all entries in there."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -5300,17 +5298,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2661
-msgid ""
-"In Debian/Etch, the way to customize the kdm login screen was changed. Now, "
-"it is done by adding a file in <computeroutput>/etc/default/kdm.d/ </"
-"computeroutput> specifying variables to override the default."
+msgid "In Debian/Etch, the way to customize the kdm login screen was changed. Now, it is done by adding a file in <computeroutput>/etc/default/kdm.d/ </computeroutput> specifying variables to override the default."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2664
-msgid ""
-"Here is one example used to activate the theme in the "
-"<computeroutput>desktop-base </computeroutput> package:"
+msgid "Here is one example used to activate the theme in the <computeroutput>desktop-base </computeroutput> package:"
msgstr ""
# type: CDATA
@@ -5323,9 +5316,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2669
-msgid ""
-"See the code in <computeroutput>/etc/init.d/kdm </computeroutput> for "
-"information on how these variables are used."
+msgid "See the code in <computeroutput>/etc/init.d/kdm </computeroutput> for information on how these variables are used."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -5335,10 +5326,19 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2677
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "To install the Adobe Flash Player web browser plugin, install the <computeroutput>flashplugin-nonfree </computeroutput> debian package from backports.org."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"To install the Adobe Flash Player web browser plugin, install the "
+"<computeroutput>flashplugin-nonfree </computeroutput> debian package from "
+"backports.org."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"To install the (non-free) Adobe Flash Player web browser plugin, install the "
"<computeroutput>flashplugin-nonfree </computeroutput> debian package from "
"backports.org."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><para>
@@ -5348,19 +5348,12 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2682
-msgid ""
-"add backports.org to <computeroutput>/etc/apt/sources.list </computeroutput> "
-"as decribed in the <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Lenny/HowTo/Administration#\">general adminstration howtos </"
-"ulink>"
+msgid "add backports.org to <computeroutput>/etc/apt/sources.list </computeroutput> as decribed in the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/HowTo/Administration#\">general adminstration howtos </ulink>"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2687
-msgid ""
-"add the following lines to <computeroutput>/etc/apt/preferences </"
-"computeroutput> (the file probably does not exist, so you might have to "
-"create it):"
+msgid "add the following lines to <computeroutput>/etc/apt/preferences </computeroutput> (the file probably does not exist, so you might have to create it):"
msgstr ""
# type: CDATA
@@ -5374,11 +5367,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:2695
-msgid ""
-"as the <computeroutput>flashplugin-nonfree </computeroutput> package is only "
-"an installer-package (and does not contain the flashplugin itself, for legal "
-"reasons), it also requires a working internet connection as it will download "
-"the precompiled binary from Adobes website."
+msgid "as the <computeroutput>flashplugin-nonfree </computeroutput> package is only an installer-package (and does not contain the flashplugin itself, for legal reasons), it also requires a working internet connection as it will download the precompiled binary from Adobes website."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -5388,12 +5377,81 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2704
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "FIXME: \"Sound with Flash on thin clients\" needs to be updated for lenny..."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"FIXME: \"Sound with Flash on thin clients\" needs to be updated for lenny..."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"Additionally to the <computeroutput>flashplugin-nonfree </computeroutput> "
"package (see above) you just need to install the <computeroutput>flashplayer-"
"nonfree-extrasound </computeroutput> package."
+<<<< 125968969722687
+msgstr ""
+
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2651
+msgid "You need to install this as root:"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2653
+msgid "and make one change in /etc/apt/sources.list"
+msgstr ""
+
+# type: CDATA
+#: debian-edu-lenny-manual.xml:2654
+#, no-wrap
+msgid "deb http://ftp.skolelinux.org/skolelinux/ lenny-test local]]"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2656
+msgid "And that followed by <computeroutput>apt-get update </computeroutput> and <computeroutput>apt-get install flashplayer-nonfree-extrasound </computeroutput>"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2660
+msgid "remeber to remove <computeroutput>deb http://ftp.skolelinux.org/skolelinux/ lenny-test local </computeroutput> from source list after that and run <computeroutput>apt-get update </computeroutput> again."
+msgstr ""
+
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2651
+msgid "You need to install this as root:"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2653
+msgid "and make one change in /etc/apt/sources.list"
+msgstr ""
+
+# type: CDATA
+#: debian-edu-lenny-manual.xml:2654
+#, no-wrap
+msgid "deb http://ftp.skolelinux.org/skolelinux/ lenny-test local]]"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2656
+msgid ""
+"And that followed by <computeroutput>apt-get update </computeroutput> and "
+"<computeroutput>apt-get install flashplayer-nonfree-extrasound </"
+"computeroutput>"
+msgstr ""
+
+# type: Content of: <article><section><section><section><para>
+#: debian-edu-lenny-manual.xml:2660
+msgid ""
+"remeber to remove <computeroutput>deb http://ftp.skolelinux.org/skolelinux/ "
+"lenny-test local </computeroutput> from source list after that and run "
+"<computeroutput>apt-get update </computeroutput> again."
msgstr ""
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+<<<< 125968969722687
# type: Content of: <article><section><section><title>
#: debian-edu-lenny-manual.xml:2712
msgid "Other useful plugins"
@@ -5417,11 +5475,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2722
-msgid ""
-"libdvdcss is needed for playing most commercial! DVDs. For legal reasons "
-"it's not included in Debian (Edu). If you are legally allowed to use it, "
-"you can use the packages from debian-multimedia.org. Add the multimedia "
-"repository and install multimedia and dvd libraries:"
+msgid "libdvdcss is needed for playing most commercial! DVDs. For legal reasons it's not included in Debian (Edu). If you are legally allowed to use it, you can use the packages from debian-multimedia.org. Add the multimedia repository and install multimedia and dvd libraries:"
msgstr ""
# type: CDATA
@@ -5463,11 +5517,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2747
-msgid ""
-"The package <computeroutput>ttf-linex </computeroutput> (which is installed "
-"by default) installs the font \"Abecedario\" which is a nice handwriting "
-"font for kids. The font has several forms to be used with kids: dotted, and "
-"with lines."
+msgid "The package <computeroutput>ttf-linex </computeroutput> (which is installed by default) installs the font \"Abecedario\" which is a nice handwriting font for kids. The font has several forms to be used with kids: dotted, and with lines."
msgstr ""
# type: Content of: <article><section><title>
@@ -5526,10 +5576,19 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2778
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "Instructions on how to enable diskless workstations / stateless workstations / lowfat clients / half-thick clients are available from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation\"/>"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"Instructions on how to enable diskless workstations / stateless "
+"workstations / lowfat clients / half-thick clients are available from <ulink "
+"url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation\"/>"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"FIXME: describe how to set up and configure diskless workstations. For Etch "
"this is documented in <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/"
"LtspDisklessWorkstation\"/> but that is outdated"
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><title>
@@ -5555,28 +5614,17 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2797
-msgid ""
-"To make special adaptations and configurations for specific thinclients, you "
-"can edit the file <computeroutput>/opt/ltsp/i386/etc/lts.conf </"
-"computeroutput>. Have a look at <computeroutput>/opt/ltsp/i386/usr/share/doc/"
-"ltsp-client/examples/lts.conf </computeroutput> to see examples and what "
-"parameters you can specify."
+msgid "To make special adaptations and configurations for specific thinclients, you can edit the file <computeroutput>/opt/ltsp/i386/etc/lts.conf </computeroutput>. Have a look at <computeroutput>/opt/ltsp/i386/usr/share/doc/ltsp-client/examples/lts.conf </computeroutput> to see examples and what parameters you can specify."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2801
-msgid ""
-"The default values is defined under <computeroutput>[default] </"
-"computeroutput>, to configure one client, specify which client using the "
-"client mac adress or ipadress like this <computeroutput>[192.168.0.10] </"
-"computeroutput>."
+msgid "The default values is defined under <computeroutput>[default] </computeroutput>, to configure one client, specify which client using the client mac adress or ipadress like this <computeroutput>[192.168.0.10] </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2805
-msgid ""
-"Example: To make the thinclient ltsp010 use 1280x1024 resolution, add "
-"something like this:"
+msgid "Example: To make the thinclient ltsp010 use 1280x1024 resolution, add something like this:"
msgstr ""
# type: CDATA
@@ -5596,18 +5644,12 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2813
-msgid ""
-"Depending on what changes you make, it may be necessary to restart X on the "
-"client (by pressing alt+ctrl+backspace) or restart the client."
+msgid "Depending on what changes you make, it may be necessary to restart X on the client (by pressing alt+ctrl+backspace) or restart the client."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2815
-msgid ""
-"To use ipadresses in <computeroutput>lts.conf </computeroutput> you should "
-"add the client mac-address to your dhcp-server. Otherwise you should use the "
-"client mac-address directly in you <computeroutput>lts.conf </"
-"computeroutput> file."
+msgid "To use ipadresses in <computeroutput>lts.conf </computeroutput> you should add the client mac-address to your dhcp-server. Otherwise you should use the client mac-address directly in you <computeroutput>lts.conf </computeroutput> file."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -5627,39 +5669,22 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2830
-msgid ""
-"It is possible to set up the clients to connect to one of several servers "
-"for load balancing. This is done by providing /opt/ltsp/i386/usr/lib/ltsp/"
-"get_hosts as a script printing one or more servers for LDM to connect to. In "
-"addition to this, each ltsp chroot need to include the ssh host key for each "
-"of the servers."
+msgid "It is possible to set up the clients to connect to one of several servers for load balancing. This is done by providing /opt/ltsp/i386/usr/lib/ltsp/get_hosts as a script printing one or more servers for LDM to connect to. In addition to this, each ltsp chroot need to include the ssh host key for each of the servers."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2832
-msgid ""
-"First of all, you must choose one LTSP server to be the loadbalancing "
-"server. All the clients will PXE-boot from this server and load the "
-"Skolelinux image. After the image is loaded, LDM chooses which server to "
-"connect to by using the \"get_hosts\" script. How this is done you decide "
-"later on."
+msgid "First of all, you must choose one LTSP server to be the loadbalancing server. All the clients will PXE-boot from this server and load the Skolelinux image. After the image is loaded, LDM chooses which server to connect to by using the \"get_hosts\" script. How this is done you decide later on."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2834
-msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
-"10.0.2.0 network. This is because when you use loadbalancing, the clients "
-"should have direct access to the server LDM chooses. If you leave your "
-"clients on the 192.168.1.0 network, all of the clients traffic will go "
-"through that server before it reaches the chosen LDM server."
+msgid "Now you have to move your clients from the 192.168.1.0 network to the 10.0.2.0 network. This is because when you use loadbalancing, the clients should have direct access to the server LDM chooses. If you leave your clients on the 192.168.1.0 network, all of the clients traffic will go through that server before it reaches the chosen LDM server."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2836
-msgid ""
-"To get the clients working on the 10.0.2.0 network, you have to edit /etc/"
-"dhcp3/dhcpd.conf on the main-server (tjener). Where it says:"
+msgid "To get the clients working on the 10.0.2.0 network, you have to edit /etc/dhcp3/dhcpd.conf on the main-server (tjener). Where it says:"
msgstr ""
# type: CDATA
@@ -5689,10 +5714,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2848
-msgid ""
-"Next-server should be the IP-address or hostname of the server you chose to "
-"be the loadbalancing server. If you use hostname you must have a working "
-"DNS. Remember to restart the dhcp service."
+msgid "Next-server should be the IP-address or hostname of the server you chose to be the loadbalancing server. If you use hostname you must have a working DNS. Remember to restart the dhcp service."
msgstr ""
# type: Content of: <article><section><section><section><section><title>
@@ -5702,12 +5724,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2855
-msgid ""
-"Now you have to make a \"get_hosts\" script that prints a server for LDM to "
-"connect to. The parameter LDM_SERVER overrides this script. In consequence, "
-"this parameter must not be defined if the get_hosts is going to be used. The "
-"get_hosts script writes on the standard output each server IP address or "
-"host names, in the random order."
+msgid "Now you have to make a \"get_hosts\" script that prints a server for LDM to connect to. The parameter LDM_SERVER overrides this script. In consequence, this parameter must not be defined if the get_hosts is going to be used. The get_hosts script writes on the standard output each server IP address or host names, in the random order."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
@@ -5723,10 +5740,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2860
-msgid ""
-"Replace xxxx with either the IP or hostname of the servers, list must be "
-"space separated. Then, put the following script in /opt/ltsp/i386/usr/lib/"
-"ltsp/get_hosts on the server you chose to be the loadbalancing server."
+msgid "Replace xxxx with either the IP or hostname of the servers, list must be space separated. Then, put the following script in /opt/ltsp/i386/usr/lib/ltsp/get_hosts on the server you chose to be the loadbalancing server."
msgstr ""
# type: CDATA
@@ -5739,7 +5753,8 @@ msgid ""
"for i in $MY_SERVER_LIST; do\n"
"rank=$RANDOM\n"
"let \"rank %= 100\"\n"
-"TMP_LIST=\"$TMP_LIST\\n${rank}_$i\"\n"
+"TMP_LIST=\"$TMP_LIST\\n"
+"${rank}_$i\"\n"
"done\n"
"TMP_LIST=$(echo -e $TMP_LIST | sort)\n"
"for i in $TMP_LIST; do\n"
@@ -5755,31 +5770,17 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2880
-msgid ""
-"Now that you've made the \"get_hosts\" script, it's time to make the ssh "
-"host key for the ltsp chroots. This can be done by making a file containing "
-"the content of /opt/ltsp/i386/etc/ssh/ssh_known_hosts from all the ltsp "
-"servers that will be loadbalanced. Save this file as /etc/ltsp/"
-"ssh_known_hosts.extra on all loadbalance servers. The last step is very "
-"important because ltsp-update-sshkeys runs every time a server is booted, "
-"and /etc/ltsp/ssh_known_hosts.extra is included if it exists."
+msgid "Now that you've made the \"get_hosts\" script, it's time to make the ssh host key for the ltsp chroots. This can be done by making a file containing the content of /opt/ltsp/i386/etc/ssh/ssh_known_hosts from all the ltsp servers that will be loadbalanced. Save this file as /etc/ltsp/ssh_known_hosts.extra on all loadbalance servers. The last step is very important because ltsp-update-sshkeys runs every time a server is booted, and /etc/ltsp/ssh_known_hosts.extra is included if it exists."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2886
-msgid ""
-"</inlinemediaobject> If you save your new host file as /opt/ltsp/i386/etc/"
-"ssh/ssh_known_hosts, it will be erased when you reboot the server."
+msgid "</inlinemediaobject> If you save your new host file as /opt/ltsp/i386/etc/ssh/ssh_known_hosts, it will be erased when you reboot the server."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:2888
-msgid ""
-"There is some obvious weaknesses with this setup. All clients get their "
-"image from the same server, this causes high loads on the server if many "
-"clients are booted at the same time. Also the clients require that server to "
-"always be available, without it they cannot boot or get a LDM server. "
-"Therefore this setup is very dependent on one server, which isn't very good."
+msgid "There is some obvious weaknesses with this setup. All clients get their image from the same server, this causes high loads on the server if many clients are booted at the same time. Also the clients require that server to always be available, without it they cannot boot or get a LDM server. Therefore this setup is very dependent on one server, which isn't very good."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
@@ -5794,11 +5795,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2898
-msgid ""
-"If the client has sound hardware support and alsa is used (currently, this "
-"is the default sound system in Debian), module snd-pcm-oss should be loaded "
-"by the client hardware to assure esd can find /dev/dsp. If it's not done "
-"automatically, this line:"
+msgid "If the client has sound hardware support and alsa is used (currently, this is the default sound system in Debian), module snd-pcm-oss should be loaded by the client hardware to assure esd can find /dev/dsp. If it's not done automatically, this line:"
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -5818,10 +5815,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2909
-msgid ""
-"It is useful to upgrade the LTSP environment with new packages fairly often, "
-"to make sure security fixes and improvements are made available. To "
-"upgrade, run these commands as user root on each LTSP server:"
+msgid "It is useful to upgrade the LTSP environment with new packages fairly often, to make sure security fixes and improvements are made available. To upgrade, run these commands as user root on each LTSP server:"
msgstr ""
# type: CDATA
@@ -5837,11 +5831,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2920
-msgid ""
-"</inlinemediaobject> Note that this is a slightly risky operation, if one of "
-"the upgraded packages break. To reduce the risk, it is a good idea to copy "
-"the content of /opt/ltsp/i386 to be able to revert to the original "
-"environment if the new one fail to work."
+msgid "</inlinemediaobject> Note that this is a slightly risky operation, if one of the upgraded packages break. To reduce the risk, it is a good idea to copy the content of /opt/ltsp/i386 to be able to revert to the original environment if the new one fail to work."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -5851,14 +5841,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2927
-msgid ""
-"Skolelinux has added several security features on the client network "
-"preventing unauthorised super user access, stopping password sniffing and "
-"other tricks which may be used on a local network. One such security "
-"measures is secure login using ssh wich is default with LDM. This can slow "
-"down some client machines which are older than 10 years, having as little as "
-"160 MHz processor and 32 MB RAM. Even if not recomended, you can add the "
-"\"True\" value in ..."
+msgid "Skolelinux has added several security features on the client network preventing unauthorised super user access, stopping password sniffing and other tricks which may be used on a local network. One such security measures is secure login using ssh wich is default with LDM. This can slow down some client machines which are older than 10 years, having as little as 160 MHz processor and 32 MB RAM. Even if not recomended, you can add the \"True\" value in ..."
msgstr ""
# type: CDATA
@@ -5869,28 +5852,17 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2930
-msgid ""
-"should be added to the server in the {{{/opt/ltsp/i386/etc/lts.conf]]] file."
+msgid "should be added to the server in the {{{/opt/ltsp/i386/etc/lts.conf]]] file."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2936
-msgid ""
-"</inlinemediaobject> <emphasis role=\"strong\">Warning </emphasis>: Above "
-"protects initial login but all activities after that use unencrypted XDMCP. "
-"Passwords (except the initial one) will travel in cleartext over the "
-"network, as well as anything else."
+msgid "</inlinemediaobject> <emphasis role=\"strong\">Warning </emphasis>: Above protects initial login but all activities after that use unencrypted XDMCP. Passwords (except the initial one) will travel in cleartext over the network, as well as anything else."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2939
-msgid ""
-"Note: Since such 10 year old thin clients may also get trouble with running "
-"never versions of <ulink url=\"http://wiki.debian.org/OpenOffice#"
-"\">OpenOffice </ulink>.org and Firefox/Iceweasel due to pixmap caching "
-"issues, you may consider running thin clients with at least 128 MB RAM, or "
-"upgrade to hardware, which will also give you the benefit of being able to "
-"use them as diskless workstations."
+msgid "Note: Since such 10 year old thin clients may also get trouble with running never versions of <ulink url=\"http://wiki.debian.org/OpenOffice#\">OpenOffice </ulink>.org and Firefox/Iceweasel due to pixmap caching issues, you may consider running thin clients with at least 128 MB RAM, or upgrade to hardware, which will also give you the benefit of being able to use them as diskless workstations."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -5900,25 +5872,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2948
-msgid ""
-"Skolelinux 3.0 is running LDM as a login manager. It uses a secure ssh "
-"tunnel to log in. When using KDM a switch to XDMCP is neccesary. XDMCP uses "
-"less CPU ressources on the clients and on the server."
+msgid "Skolelinux 3.0 is running LDM as a login manager. It uses a secure ssh tunnel to log in. When using KDM a switch to XDMCP is neccesary. XDMCP uses less CPU ressources on the clients and on the server."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2954
-msgid ""
-"</inlinemediaobject> <emphasis role=\"strong\">Warning </emphasis>: XDMCP "
-"does not use encryption. Passwords will travel in cleartext over the "
-"network, as well as anything else."
+msgid "</inlinemediaobject> <emphasis role=\"strong\">Warning </emphasis>: XDMCP does not use encryption. Passwords will travel in cleartext over the network, as well as anything else."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2961
-msgid ""
-"</inlinemediaobject> Note: local devices with <computeroutput>ltspfs </"
-"computeroutput> will stop working without LDM."
+msgid "</inlinemediaobject> Note: local devices with <computeroutput>ltspfs </computeroutput> will stop working without LDM."
msgstr ""
# type: Content of: <article><section><section><para>
@@ -5945,16 +5909,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2970
-msgid ""
-"The goal is to let your \"real\" thin client to contact the xdmcp-server on "
-"the 192.168.0.254 net (given a standard Skolelinux configuration)."
+msgid "The goal is to let your \"real\" thin client to contact the xdmcp-server on the 192.168.0.254 net (given a standard Skolelinux configuration)."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:2972
-msgid ""
-"If by some reason xdmcp is accessible on your server which runs KDM , please "
-"add the following to /etc/kde3/kdm/Xaccess"
+msgid "If by some reason xdmcp is accessible on your server which runs KDM , please add the following to /etc/kde3/kdm/Xaccess"
msgstr ""
# type: CDATA
@@ -5965,10 +5925,7 @@ msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:2975
-msgid ""
-"The star before the comment '#' is important, rest is a comment of course "
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+msgid "The star before the comment '#' is important, rest is a comment of course <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><para>
@@ -6010,35 +5967,22 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:2998
-msgid ""
-"For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
-"enables Windows clients to store profiles and userdata and also "
-"authenticates the users during the login."
+msgid "For Windows clients the Windows domain \"SKOLELINUX\" is available to be joined. A special service called Samba, installed on the main-server tjener, enables Windows clients to store profiles and userdata and also authenticates the users during the login."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3000
-msgid ""
-"In order to make Windows clients join the domain some (few) steps are "
-"required:"
+msgid "In order to make Windows clients join the domain some (few) steps are required:"
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3002
-msgid ""
-"1. Create a user with membership in the \"admins\" group (if not already "
-"existing)"
+msgid "1. Create a user with membership in the \"admins\" group (if not already existing)"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3004
-msgid ""
-"In order to be able to join the \"SKOLELINUX\" domain a member of the admins "
-"group needs to authorize the process. If not yet existing, a user with that "
-"membership needs to be added (for more information see <link to lwat "
-"docu>). The user \"root\" will <emphasis role=\"strong\">not </emphasis> "
-"work, because there is no password for root in Samba."
+msgid "In order to be able to join the \"SKOLELINUX\" domain a member of the admins group needs to authorize the process. If not yet existing, a user with that membership needs to be added (for more information see <link to lwat docu>). The user \"root\" will <emphasis role=\"strong\">not </emphasis> work, because there is no password for root in Samba."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -6048,29 +5992,17 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3011
-msgid ""
-"When joining a samba domain some special data is stored on the domain "
-"controller (tjener). This data is needed to recognize the Windows client "
-"later as being allowed to authenticate users. In order to enable Samba to "
-"store this data, Samba requires an static host configuration to be present. "
-"This could be added by using the LWAT web interface (see also <link to "
-"lwat>). When adding the static host configuration it is important to "
-"check the \"Samba host\" option, otherwise will lack the required data to be "
-"able to join the domain."
+msgid "When joining a samba domain some special data is stored on the domain controller (tjener). This data is needed to recognize the Windows client later as being allowed to authenticate users. In order to enable Samba to store this data, Samba requires an static host configuration to be present. This could be added by using the LWAT web interface (see also <link to lwat>). When adding the static host configuration it is important to check the \"Samba host\" option, otherwise will lack the required data to be able to join the domain."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3015
-msgid ""
-"3. On the Windows client: Make sure the network and system configuration "
-"matches the data stored on tjener (hostname and ip configuration)."
+msgid "3. On the Windows client: Make sure the network and system configuration matches the data stored on tjener (hostname and ip configuration)."
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3017
-msgid ""
-"It's really important, that the Windows hosts have the same data, otherwise "
-"Samba will not find the host added in step 2."
+msgid "It's really important, that the Windows hosts have the same data, otherwise Samba will not find the host added in step 2."
msgstr ""
# type: Content of: <article><section><section><section><para>
@@ -6080,26 +6012,12 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3023
-msgid ""
-"Depending on the version and language of you Windows installation, you "
-"should find the configuration about the domain or workgroup of your system "
-"somewhere in the system properties. A freshly installed Windows system "
-"should belong to a default workgroup. You can join the domain by selecting "
-"\"Domain\" instead of \"Workgroup\" and entering SKOLELINUX as new domain. "
-"Pressing enter will then open a new window, where the login data of the user "
-"created in step 1. can be entered. After some time the Windows client opens "
-"a popup window with a welcome message. After the obligatory reboot the "
-"loginscreen offers a option to login into the domain."
+msgid "Depending on the version and language of you Windows installation, you should find the configuration about the domain or workgroup of your system somewhere in the system properties. A freshly installed Windows system should belong to a default workgroup. You can join the domain by selecting \"Domain\" instead of \"Workgroup\" and entering SKOLELINUX as new domain. Pressing enter will then open a new window, where the login data of the user created in step 1. can be entered. After some time the Windows client opens a popup window with a welcome message. After the obligatory reboot the loginscreen offers a option to login into the domain."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3027
-msgid ""
-"Windows will sync the profile of domain users on every login and logout. "
-"Depending on how much data stored in the profile this could take some time. "
-"To minimize the time needed, one should deactivate things like local cache "
-"in browsers (you could use the squid proxycache installed on tjener instead) "
-"and save file into the H: volume instead of \"Own files\"."
+msgid "Windows will sync the profile of domain users on every login and logout. Depending on how much data stored in the profile this could take some time. To minimize the time needed, one should deactivate things like local cache in browsers (you could use the squid proxycache installed on tjener instead) and save file into the H: volume instead of \"Own files\"."
msgstr ""
# type: Content of: <article><section><section><section><section><title>
@@ -6109,13 +6027,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3033
-msgid ""
-"Groupmaps must also be added for any other user groups you add through "
-"<computeroutput>lwat </computeroutput>. If you want your user groups to be "
-"available in Windows, eg for netlogon scripts or other group dependant "
-"actions, you can add them using variations of the following command. Samba "
-"will function without these groupmaps, but Windows machines won't be group "
-"aware."
+msgid "Groupmaps must also be added for any other user groups you add through <computeroutput>lwat </computeroutput>. If you want your user groups to be available in Windows, eg for netlogon scripts or other group dependant actions, you can add them using variations of the following command. Samba will function without these groupmaps, but Windows machines won't be group aware."
msgstr ""
# type: CDATA
@@ -6129,18 +6041,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3040
-msgid ""
-"FIXME: should user groups in windows better be explained with lwat first, "
-"and then with an example for the command line?"
+msgid "FIXME: should user groups in windows better be explained with lwat first, and then with an example for the command line?"
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3042
-msgid ""
-"If you want to check user groups on Windows, you need to download the tool "
-"<computeroutput>IFMEMBER.EXE </computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
-"<computeroutput>/etc/samba/netlogon/LOGON.BAT </computeroutput>."
+msgid "If you want to check user groups on Windows, you need to download the tool <computeroutput>IFMEMBER.EXE </computeroutput> from Microsoft. Then you can use this for example in the logon script which resides on tjener in <computeroutput>/etc/samba/netlogon/LOGON.BAT </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -6150,11 +6056,7 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3052
-msgid ""
-"Users bringing in their XP home laptop can still connect to Tjener using "
-"their skolelinux credentials, provided the workgroup is set to SKOLELINUX. "
-"However, they may need to disable the windows firewall before Tjener will "
-"appear in Network Neighbourhood (or whatever its called now)."
+msgid "Users bringing in their XP home laptop can still connect to Tjener using their skolelinux credentials, provided the workgroup is set to SKOLELINUX. However, they may need to disable the windows firewall before Tjener will appear in Network Neighbourhood (or whatever its called now)."
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -6164,44 +6066,22 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3059
-msgid ""
-"Roaming profiles contain user work environments, which include the desktop "
-"items and settings. Some examples of these environments are personal files, "
-"desktop icons and menus, screen colors, mouse settings, window size and "
-"position, application configurations and network and printer connections. "
-"Roaming profiles are available wherever the user logs on, provided the "
-"server is available."
+msgid "Roaming profiles contain user work environments, which include the desktop items and settings. Some examples of these environments are personal files, desktop icons and menus, screen colors, mouse settings, window size and position, application configurations and network and printer connections. Roaming profiles are available wherever the user logs on, provided the server is available."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3061
-msgid ""
-"Since the profile is copied from the server to the machine during logon, and "
-"copied back to the server during logout, a large profile can make windows "
-"login/logout painfully slow. There can be many reasons for a large profile, "
-"but the most common problems is that users save their files on the windows "
-"desktop or in the My Documents folder instead of in their homedir. Also some "
-"badly designed programs use the profile for scratch space, and other data."
+msgid "Since the profile is copied from the server to the machine during logon, and copied back to the server during logout, a large profile can make windows login/logout painfully slow. There can be many reasons for a large profile, but the most common problems is that users save their files on the windows desktop or in the My Documents folder instead of in their homedir. Also some badly designed programs use the profile for scratch space, and other data."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3063
-msgid ""
-"<emphasis role=\"strong\">The educational approach </emphasis>: One way to "
-"deal with to large profiles is to explain the situation for the users. Tell "
-"them not to store huge files on the desktop and if they fail to listen it's "
-"their own fault when login is slow."
+msgid "<emphasis role=\"strong\">The educational approach </emphasis>: One way to deal with to large profiles is to explain the situation for the users. Tell them not to store huge files on the desktop and if they fail to listen it's their own fault when login is slow."
msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3066
-msgid ""
-"<emphasis role=\"strong\">Tweaking the profile </emphasis>: A different way "
-"to deal with the problem is to remove parts of the profile, and redirect "
-"other parts to regular file storage. This moves the work load from the users "
-"to the administrator, while adding complexity to the installation. There are "
-"at least three ways to edit the parts that are removed from the roaming "
-"profile."
+msgid "<emphasis role=\"strong\">Tweaking the profile </emphasis>: A different way to deal with the problem is to remove parts of the profile, and redirect other parts to regular file storage. This moves the work load from the users to the administrator, while adding complexity to the installation. There are at least three ways to edit the parts that are removed from the roaming profile."
msgstr ""
# type: Content of: <article><section><section><section><section><title>
@@ -6211,21 +6091,18 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3073
-msgid ""
-"Already delivered while installation, you can find an example smb.conf "
-"hopefully in your prefered language. You can find the config example files "
-"on your tjener under <emphasis><emphasis role=\"strong\">/usr/share/debian-"
-"edu-config/examples/ </emphasis> </emphasis>. The source file is in English "
-"and is called <emphasis><emphasis role=\"strong\">smb-roaming-profiles-en."
-"conf </emphasis> </emphasis>. If it is translated to German for example, it "
-"is named <emphasis><emphasis role=\"strong\">smb-roaming-profiles-de.conf </"
-"emphasis> </emphasis>. So if you search a file translated to your prefered "
-"language, look at the country code part in the filename. Inside the config "
-"file are a lot of explanations, so you should have a look at."
+msgid "Already delivered while installation, you can find an example smb.conf hopefully in your prefered language. You can find the config example files on your tjener under <emphasis><emphasis role=\"strong\">/usr/share/debian-edu-config/examples/ </emphasis> </emphasis>. The source file is in English and is called <emphasis><emphasis role=\"strong\">smb-roaming-profiles-en.conf </emphasis> </emphasis>. If it is translated to German for example, it is named <emphasis><emphasis role=\"strong\">smb-roaming-profiles-de.conf </emphasis> </emphasis>. So if you search a file translated to your prefered language, look at the country code part in the filename. Inside the config file are a lot of explanations, so you should have a look at."
msgstr ""
# type: Content of: <article><section><section><section><section><title>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:3014
+#: debian-edu-lenny-manual.xml:3128
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:3014 debian-edu-lenny-manual.xml:3128
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:3084 debian-edu-lenny-manual.xml:3198
+<<<< 125968969722687
msgid "Using machine policies"
msgstr ""
@@ -6241,13 +6118,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3091
-msgid ""
-"Under the selection User Configuration -> Administrative Templates -> "
-"System -> User Profiles -> Exclude directories in roaming profile, you "
-"can enter a semicolon separated string of directories to exclude from the "
-"profile, the directories are internationalized and must be written in your "
-"own language the way they are in the profile. Example of directories to "
-"exclude are"
+msgid "Under the selection User Configuration -> Administrative Templates -> System -> User Profiles -> Exclude directories in roaming profile, you can enter a semicolon separated string of directories to exclude from the profile, the directories are internationalized and must be written in your own language the way they are in the profile. Example of directories to exclude are"
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -6261,7 +6132,14 @@ msgid "Locale settings"
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:3029
+#: debian-edu-lenny-manual.xml:3038
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:3029 debian-edu-lenny-manual.xml:3038
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:3099 debian-edu-lenny-manual.xml:3108
+<<<< 125968969722687
msgid "Temporary Internet Files"
msgstr ""
@@ -6282,72 +6160,59 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3116
-msgid ""
-"Copy <computeroutput>c:\\windows\\system32\\GroupPolicy </computeroutput> to "
-"all other windows machines."
+msgid "Copy <computeroutput>c:\\windows\\system32\\GroupPolicy </computeroutput> to all other windows machines."
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3119
-msgid ""
-"It's a good idea to copy it to your windows os deployment system to have it "
-"included at install time."
+msgid "It's a good idea to copy it to your windows os deployment system to have it included at install time."
msgstr ""
# type: Content of: <article><section><section><section><section><title>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:3058
+#: debian-edu-lenny-manual.xml:3144
+#: debian-edu-lenny-manual.xml:3170
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:3058 debian-edu-lenny-manual.xml:3144
+#: debian-edu-lenny-manual.xml:3170
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:3128 debian-edu-lenny-manual.xml:3214
#: debian-edu-lenny-manual.xml:3240
+<<<< 125968969722687
msgid "Using global policies"
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3130
-msgid ""
-"By using the legacy windows policy editor (<computeroutput>poledit.exe </"
-"computeroutput>), you can can create a Policy file (NTConfig.pol) file and "
-"put it in your netlogon share on tjener. This has the advantage of working "
-"almost instantly on all windows machines."
+msgid "By using the legacy windows policy editor (<computeroutput>poledit.exe </computeroutput>), you can can create a Policy file (NTConfig.pol) file and put it in your netlogon share on tjener. This has the advantage of working almost instantly on all windows machines."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3133
-msgid ""
-"Since some time the policy editor standalone download has been removed from "
-"the Microsoft website, but it's still available as part of the ORK Tools."
+msgid "Since some time the policy editor standalone download has been removed from the Microsoft website, but it's still available as part of the ORK Tools."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3135
-msgid ""
-"With poledit.exe you can create .pol files. If you put such a file on tjener "
-"as <computeroutput>/etc/samba/netlogon/NTLOGON.POL </computeroutput> it will "
-"be read by the windows machine automatically and temporarily overwrite the "
-"registry, thus applying the changes."
+msgid "With poledit.exe you can create .pol files. If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/NTLOGON.POL </computeroutput> it will be read by the windows machine automatically and temporarily overwrite the registry, thus applying the changes."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3138
-msgid ""
-"To make sensible use of poledit.exe you also need to download appriate .adm "
-"files for your operating system and applications, otherwise you cannot "
-"define many settings in poledit.exe."
+msgid "To make sensible use of poledit.exe you also need to download appriate .adm files for your operating system and applications, otherwise you cannot define many settings in poledit.exe."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#. transclusion is not implemented in DocBook formatter
#. transclusion is not implemented in DocBook formatter
#: debian-edu-lenny-manual.xml:3140
-msgid ""
-"Be aware that the new group policy tools, gpedit.msc} and "
-"<computeroutput>gpmc.msc </computeroutput> cannot create .pol files, they "
-"either only work for the local machine or need an active directory server."
+msgid "Be aware that the new group policy tools, gpedit.msc} and <computeroutput>gpmc.msc </computeroutput> cannot create .pol files, they either only work for the local machine or need an active directory server."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3143
-msgid ""
-"If you understand german, <ulink url=\"http://gruppenrichtlinien.de\"/> is a "
-"very good website on this topic."
+msgid "If you understand german, <ulink url=\"http://gruppenrichtlinien.de\"/> is a very good website on this topic."
msgstr ""
# type: Content of: <article><section><section><section><section><title>
@@ -6357,9 +6222,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3150
-msgid ""
-"You can edit the registry of the local computer, and copy this registry key "
-"to other computers"
+msgid "You can edit the registry of the local computer, and copy this registry key to other computers"
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
@@ -6369,16 +6232,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3155
-msgid ""
-"Navigate to <computeroutput>HKEY_CURRENT_USER\\Software\\Microsoft\\Windows "
-"NT\\CurrentVersion\\Winlogon </computeroutput>"
+msgid "Navigate to <computeroutput>HKEY_CURRENT_USER\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3159
-msgid ""
-"Use the menu <computeroutput>Edit menu->New->String Value </"
-"computeroutput>."
+msgid "Use the menu <computeroutput>Edit menu->New->String Value </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
@@ -6388,17 +6247,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3167
-msgid ""
-"Enter a semicolon sepatated string of paths to exclude. (same way as machine "
-"policy)"
+msgid "Enter a semicolon sepatated string of paths to exclude. (same way as machine policy)"
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3171
-msgid ""
-"Now you can choose to export this registry key as a .reg file, Mark a "
-"selection, right click and select export. Save the file and you can double "
-"click it, or add it to a script to spread it to other machines."
+msgid "Now you can choose to export this registry key as a .reg file, Mark a selection, right click and select export. Save the file and you can double click it, or add it to a script to spread it to other machines."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
@@ -6408,16 +6262,12 @@ msgstr ""
# type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3175
-msgid ""
-"<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/"
-"featured/gp/default.mspx\"/>"
+msgid "<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/featured/gp/default.mspx\"/>"
msgstr ""
# type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3178
-msgid ""
-"<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"
-"PolicyMgmt.html\"/>"
+msgid "<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/PolicyMgmt.html\"/>"
msgstr ""
# type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -6437,50 +6287,32 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: debian-edu-lenny-manual.xml:3194
-msgid ""
-"Sometimes just removing the directory from the profile is not enough. You "
-"may experience that users loose files because they mistakenly save things "
-"into my documents, when this is not saved in the profiles. Also you may want "
-"to redirect the directories some badly programed applications use to normal "
-"network shares."
+msgid "Sometimes just removing the directory from the profile is not enough. You may experience that users loose files because they mistakenly save things into my documents, when this is not saved in the profiles. Also you may want to redirect the directories some badly programed applications use to normal network shares."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3200
-msgid ""
-"Everything under Using machine policies above applies. You edit using gpedit."
-"msc and copy the Policy to all machines The redirection should be available "
-"under User Configuration -> Windows Settings->Folder Redirection "
-"Things that can be nice to redirect are Desktop or My Documents."
+msgid "Everything under Using machine policies above applies. You edit using gpedit.msc and copy the Policy to all machines The redirection should be available under User Configuration -> Windows Settings->Folder Redirection Things that can be nice to redirect are Desktop or My Documents."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3202
-msgid ""
-"One thing to remember is that if you enable folder redirection, those "
-"folders are automatically added to the syncroniced folders list. If you do "
-"not want this, you should also disable that in following"
+msgid "One thing to remember is that if you enable folder redirection, those folders are automatically added to the syncroniced folders list. If you do not want this, you should also disable that in following"
msgstr ""
# type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3204
-msgid ""
-"User Configuration -> Administrative Templates -> Network -> "
-"Offline Files"
+msgid "User Configuration -> Administrative Templates -> Network -> Offline Files"
msgstr ""
# type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3207
-msgid ""
-"Computer Configuration -> Administrative Templates -> Network -> "
-"Offline Files"
+msgid "Computer Configuration -> Administrative Templates -> Network -> Offline Files"
msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3217
-msgid ""
-"FIXME explain how to use profiles from global policies for windows machines "
-"in the skolelinux network"
+msgid "FIXME explain how to use profiles from global policies for windows machines in the skolelinux network"
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -6495,10 +6327,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3229
-msgid ""
-"Using local policies you can disable roaming profile on individual machines. "
-"This is often wanted on special machines, for instance on dedicated "
-"machines, or machines that have lower then usual bandwith."
+msgid "Using local policies you can disable roaming profile on individual machines. This is often wanted on special machines, for instance on dedicated machines, or machines that have lower then usual bandwith."
msgstr ""
# type: Content of: <article><section><section><section><section><para>
@@ -6508,9 +6337,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3233
-msgid ""
-"Administrative Templates -> system -> User Profiles -> Only allow "
-"local profiles"
+msgid "Administrative Templates -> system -> User Profiles -> Only allow local profiles"
msgstr ""
# type: Content of: <article><section><section><section><section><para>
@@ -6525,12 +6352,7 @@ msgstr ""
# type: Content of: <article><section><section><section><section><para>
#: debian-edu-lenny-manual.xml:3250
-msgid ""
-"By editing the samba config you can disable roaming profiles for the entire "
-"network. Perhaps everyone have their own dedicated machine? and nobody else "
-"is allowed to touch it. To disable the roaming profiles for the entire "
-"network you can alter the smb.conf file on tjener and unset the logon path "
-"and logon home variables, and restart samba."
+msgid "By editing the samba config you can disable roaming profiles for the entire network. Perhaps everyone have their own dedicated machine? and nobody else is allowed to touch it. To disable the roaming profiles for the entire network you can alter the smb.conf file on tjener and unset the logon path and logon home variables, and restart samba."
msgstr ""
# type: CDATA
@@ -6548,53 +6370,37 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3261
-msgid ""
-"Some municipalities provide a remote desktop solution so that students and "
-"teachers can access Skolelinux from their home computer running Windows, Mac "
-"or Linux."
+msgid "Some municipalities provide a remote desktop solution so that students and teachers can access Skolelinux from their home computer running Windows, Mac or Linux."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3263
-msgid ""
-"RDP - the easiest way to access Windows terminal server. Just install the "
-"<computeroutput>rdesktop </computeroutput> package."
+msgid "RDP - the easiest way to access Windows terminal server. Just install the <computeroutput>rdesktop </computeroutput> package."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3267
-msgid ""
-"VNC client (Virtual Network Computer) gives access to Skolelinux remotely. "
-"Just install the <computeroutput>xvncviewer </computeroutput> package."
+msgid "VNC client (Virtual Network Computer) gives access to Skolelinux remotely. Just install the <computeroutput>xvncviewer </computeroutput> package."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3271
-msgid ""
-"NX graphical client gives students and teachers access to Skolelinux "
-"remotely on Windows, Mac or Linux PC. One municipality in Norway has "
-"provided NX support to all their students since 2005. They report that the "
-"solution is stable."
+msgid "NX graphical client gives students and teachers access to Skolelinux remotely on Windows, Mac or Linux PC. One municipality in Norway has provided NX support to all their students since 2005. They report that the solution is stable."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3274
-msgid ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/CitrixApps\">Citrix ICA "
-"client HowTo </ulink> to access Windows terminal server from Skolelinux."
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/CitrixApps\">Citrix ICA client HowTo </ulink> to access Windows terminal server from Skolelinux."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3286
-msgid ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3289
-msgid ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation"
-"\"/>"
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation\"/>"
msgstr ""
# type: Content of: <article><section><title>
@@ -6609,27 +6415,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3303
-msgid ""
-"Run <computeroutput>aptitude install moodle </computeroutput> as root to "
-"install moodle."
+msgid "Run <computeroutput>aptitude install moodle </computeroutput> as root to install moodle."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3306
-msgid ""
-"Moodle is a course management system (CMS) - a free, Open Source software "
-"package designed using sound pedagogical principles, to help educators "
-"create effective online learning communities. You can download and use it on "
-"any computer you have handy (including webhosts), yet it can scale from a "
-"single-teacher site to a University with 200,000 students. Some schools in "
-"France use moodle to keep track of students' facilities and credit points."
+msgid "Moodle is a course management system (CMS) - a free, Open Source software package designed using sound pedagogical principles, to help educators create effective online learning communities. You can download and use it on any computer you have handy (including webhosts), yet it can scale from a single-teacher site to a University with 200,000 students. Some schools in France use moodle to keep track of students' facilities and credit points."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3309
-msgid ""
-"FIXME: more examples where moodle is used, how it can be used and a link to "
-"a good starter documentation is missing here"
+msgid "FIXME: more examples where moodle is used, how it can be used and a link to a good starter documentation is missing here"
msgstr ""
# type: Content of: <article><section><section><para>
@@ -6644,16 +6440,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3318
-msgid ""
-"Some schools use control tools like Controlaula or Italc to supervise their "
-"students."
+msgid "Some schools use control tools like Controlaula or Italc to supervise their students."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3320
-msgid ""
-"Take a look at their wiki: <ulink url=\"http://italc.sourceforge.net/wiki/"
-"index.php?title=Main_Page\"/>"
+msgid "Take a look at their wiki: <ulink url=\"http://italc.sourceforge.net/wiki/index.php?title=Main_Page\"/>"
msgstr ""
# type: Content of: <article><section><section><para>
@@ -6669,9 +6461,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3330
-msgid ""
-"</inlinemediaobject> <emphasis role=\"strong\">Warning </emphasis>: "
-"monitoring humans might be unethical and illegal in your jurisdiction."
+msgid "</inlinemediaobject> <emphasis role=\"strong\">Warning </emphasis>: monitoring humans might be unethical and illegal in your jurisdiction."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -6681,17 +6471,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3338
-msgid ""
-"Some schools use squidguard or dansguardian to restrict internet access. "
-"FIXME: explain how to install and use squidgard and/or dansguardian"
+msgid "Some schools use squidguard or dansguardian to restrict internet access. FIXME: explain how to install and use squidgard and/or dansguardian"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3345
-msgid ""
-"</inlinemediaobject> <emphasis role=\"strong\">Warning </emphasis>: "
-"restricting access to information or freedom of speech might be unethical "
-"and illegal in your jurisdiction."
+msgid "</inlinemediaobject> <emphasis role=\"strong\">Warning </emphasis>: restricting access to information or freedom of speech might be unethical and illegal in your jurisdiction."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -6701,21 +6486,12 @@ msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:3353
-msgid ""
-"<computeroutput>swi-prolog </computeroutput> was available in sarge, but was "
-"not part of etch, but it was possible to install the sarge version on etch. "
-"Lenny again ships <computeroutput>swi-prolog </computeroutput> so installing "
-"is very easy. Just <computeroutput>apt-get install swi-prolog </"
-"computeroutput> and be done <inlinemediaobject><imageobject><imagedata width="
-"\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth="
-"\"15\"/> </imageobject>"
+msgid "<computeroutput>swi-prolog </computeroutput> was available in sarge, but was not part of etch, but it was possible to install the sarge version on etch. Lenny again ships <computeroutput>swi-prolog </computeroutput> so installing is very easy. Just <computeroutput>apt-get install swi-prolog </computeroutput> and be done <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3369
-msgid ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep\"/> - "
-"incomplete but interesting"
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep\"/> - incomplete but interesting"
msgstr ""
# type: Content of: <article><section><title>
@@ -6730,19 +6506,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3383
-msgid ""
-"Every student should use the shorcut on their Desktop, which should point to "
-"something like <computeroutput>https://ldap/lwat/chguserpw.php?username=$(id "
-"-un) </computeroutput>. (On Windows they have to manually put in their "
-"username.)"
+msgid "Every student should use the shorcut on their Desktop, which should point to something like <computeroutput>https://ldap/lwat/chguserpw.php?username=$(id -un) </computeroutput>. (On Windows they have to manually put in their username.)"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3386
-msgid ""
-"Using <computeroutput>lwat </computeroutput> to change their password, "
-"ensures that linux (userPassword) and samba (sabmaNTPassword and "
-"smbaLMPassword) passwords are the same."
+msgid "Using <computeroutput>lwat </computeroutput> to change their password, ensures that linux (userPassword) and samba (sabmaNTPassword and smbaLMPassword) passwords are the same."
msgstr ""
# type: Content of: <article><section><title>
@@ -6757,30 +6526,17 @@ msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:3399
-msgid ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/worldmap.png\"/"
-"> </imageobject>"
+msgid "<inlinemediaobject><imageobject><imagedata fileref=\"./images/worldmap.png\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:3405
-msgid ""
-"There are Debian Edu users all over the world. A very easy form of "
-"contribution is to let us know you exist and use Debian Edu - this motivates "
-"us very much and therefore is already a valuable contribution. "
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+msgid "There are Debian Edu users all over the world. A very easy form of contribution is to let us know you exist and use Debian Edu - this motivates us very much and therefore is already a valuable contribution. <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3411
-msgid ""
-"The Debian Edu projects provide a database of schools and users of the "
-"system to help the users find each other, and also to have an idea about "
-"where the users of the distribution are located. Please let us know about "
-"your installation, by registering in this database. To register your "
-"school, <ulink url=\"http://wiki.debian.org/DebianEdu/ReferenceSchools\">use "
-"this web form </ulink>."
+msgid "The Debian Edu projects provide a database of schools and users of the system to help the users find each other, and also to have an idea about where the users of the distribution are located. Please let us know about your installation, by registering in this database. To register your school, <ulink url=\"http://wiki.debian.org/DebianEdu/ReferenceSchools\">use this web form </ulink>."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -6790,19 +6546,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3419
-msgid ""
-"Currently there are local teams in Norway, Germany, the region of "
-"Extremadura in Spain, Taiwan and France. \"Isolated\" contributors and users "
-"exist in Greece, the Netherlands, Japan and elsewhere."
+msgid "Currently there are local teams in Norway, Germany, the region of Extremadura in Spain, Taiwan and France. \"Isolated\" contributors and users exist in Greece, the Netherlands, Japan and elsewhere."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3421
-msgid ""
-"The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"Support#\">support chapter </ulink> explains and links to localized "
-"ressources, as <emphasis>contribute </emphasis> and <emphasis>support </"
-"emphasis> are two sides of the same coin."
+msgid "The <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/Support#\">support chapter </ulink> explains and links to localized ressources, as <emphasis>contribute </emphasis> and <emphasis>support </emphasis> are two sides of the same coin."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -6812,13 +6561,20 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3431
-msgid ""
-"Internationally we are organized in <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Teams/\">different teams </ulink> working on different subjects."
+msgid "Internationally we are organized in <ulink url=\"http://wiki.debian.org/DebianEdu/Teams/\">different teams </ulink> working on different subjects."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3434
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "The <ulink url=\"http://lists.debian.org/debian-edu\">developer mailing list </ulink> is most of the time our main medium for communication, though we have monthly meetings on IRC on #debian-edu on irc.debian.org and less frequently even real gatherings, where we meet each other in person."
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"The <ulink url=\"http://lists.debian.org/debian-edu\">developer mailing list "
+"</ulink> is most of the time our main medium for communication, though we "
+"have monthly meetings on IRC on #debian-edu on irc.debian.org and less "
+"frequently even real gatherings, where we meet each other in person."
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"The <ulink url=\"http://lists.debian.org/debian-edu\">developer mailing list "
"</ulink> is most of the time our main medium for communication, though we "
@@ -6827,14 +6583,12 @@ msgid ""
"url=\"http://wiki.debian.org/DebianEdu/NewContributor\">New contributors </"
"ulink> should read our <ulink url=\"http://wiki.debian.org/DebianEdu/"
"ArchivePolicy\"/>."
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3438
-msgid ""
-"A good way to learn what is happening in the development of Debian Edu is to "
-"subscribe to the <ulink url=\"http://lists.alioth.debian.org/mailman/"
-"listinfo/debian-edu-commits\">commit mailinglist </ulink>."
+msgid "A good way to learn what is happening in the development of Debian Edu is to subscribe to the <ulink url=\"http://lists.alioth.debian.org/mailman/listinfo/debian-edu-commits\">commit mailinglist </ulink>."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -6844,31 +6598,17 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3446
-msgid ""
-"This document needs your help! First and foremost, it is not finished yet: "
-"If you read it, you will notice various FIXMEs within the text. If you "
-"happen to know (a bit of) what needs to be explained there, please consider "
-"sharing your knowledge with us."
+msgid "This document needs your help! First and foremost, it is not finished yet: If you read it, you will notice various FIXMEs within the text. If you happen to know (a bit of) what needs to be explained there, please consider sharing your knowledge with us."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3449
-msgid ""
-"The source of the text is a wiki and can be edited with a simple webbrowser. "
-"Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
-"\"/> and you can contribute easily. Note: An user account is needed to edit "
-"the pages, you need to <ulink url=\"http://wiki.debian.org/UserPreferences"
-"\">create a wiki user </ulink> first."
+msgid "The source of the text is a wiki and can be edited with a simple webbrowser. Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/\"/> and you can contribute easily. Note: An user account is needed to edit the pages, you need to <ulink url=\"http://wiki.debian.org/UserPreferences\">create a wiki user </ulink> first."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3452
-msgid ""
-"Another very good way to contribute and to help users is by translating "
-"software and documentation. Information how to translate this document can "
-"be found in the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Lenny/Translations#\">translation chapter </ulink> of this book. Please "
-"consider to help the translation effort of this book!"
+msgid "Another very good way to contribute and to help users is by translating software and documentation. Information how to translate this document can be found in the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Lenny/Translations#\">translation chapter </ulink> of this book. Please consider to help the translation effort of this book!"
msgstr ""
# type: Content of: <article><section><title>
@@ -6893,18 +6633,12 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3472
-msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+msgid "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss\"/> - support mailing list"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:3475
-msgid ""
-"#debian-edu on irc.debian.org - IRC channel, mostly development related, do "
-"not expect real time support even though it frequently happens "
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
+msgid "#debian-edu on irc.debian.org - IRC channel, mostly development related, do not expect real time support even though it frequently happens <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/smile.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -6914,17 +6648,12 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3488
-msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+msgid "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/> - support mailing list"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3491
-msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailinglist for the development member organisation in "
-"Norway (FRISK)"
+msgid "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/linuxiskolen\"/> - mailinglist for the development member organisation in Norway (FRISK)"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6939,15 +6668,12 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3503
-msgid ""
-"<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> - support "
-"mailing list"
+msgid "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> - support mailing list"
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3506
-msgid ""
-"<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
+msgid "<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6962,9 +6688,7 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3518
-msgid ""
-"<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - support "
-"mailinglist"
+msgid "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - support mailinglist"
msgstr ""
# type: Content of: <article><section><section><section><title>
@@ -6984,9 +6708,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3537
-msgid ""
-"Lists of companies providing professional support are available from <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/>."
+msgid "Lists of companies providing professional support are available from <ulink url=\"http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/>."
msgstr ""
# type: Content of: <article><section><title>
@@ -6996,6 +6718,18 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3545
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+msgid "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009), Petter Reinholdtsen (2007, 2008), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008) Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009), Oded Naveh (2009) and Philipp Hübner (2009) and is released under the GPL2 or any later version. Enjoy!"
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+msgid ""
+"This document is written and copyrighted by Holger Levsen (2007, 2008, "
+"2009), Petter Reinholdtsen (2007, 2008), Daniel Heß (2007), Patrick Winnertz "
+"(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), "
+"Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008) Nigel Barker "
+"(2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg "
+"(2008), Jürgen Leibner (2009), Oded Naveh (2009) and Philipp Hübner (2009) "
+"and is released under the GPL2 or any later version. Enjoy!"
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
msgid ""
"This document is written and copyrighted by Holger Levsen (2007, 2008, "
"2009), Petter Reinholdtsen (2007, 2008, 2009), Daniel Heß (2007), Patrick "
@@ -7004,15 +6738,12 @@ msgid ""
"Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim "
"Seeberg (2008), Jürgen Leibner (2009), Oded Naveh (2009) and Philipp Hübner "
"(2009) and is released under the GPL2 or any later version. Enjoy!"
+<<<< 125968969722687
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3547
-msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you "
-"are the author of it and plan to release it under the same conditions </"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+msgid "If you add content to it, <emphasis role=\"strong\">please only do so if you are the author of it and plan to release it under the same conditions </emphasis>! Then add your name here and release it under the GPL2 or later version."
msgstr ""
# type: Content of: <article><section><title>
@@ -7022,48 +6753,32 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3555
-msgid ""
-"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007) "
-"and Rafael Rivas (2009) and is released under the GPL2 or any later version."
+msgid "The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007) and Rafael Rivas (2009) and is released under the GPL2 or any later version."
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3557
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008) and Tore Skogly (2008) and is released under the GPL2 "
-"or any later version."
+msgid "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard Korsvoll (2007, 2008) and Tore Skogly (2008) and is released under the GPL2 or any later version."
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3559
-msgid ""
-"The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007), Roland F. Teichert (2007, 2008, "
-"2009), Jürgen Leibner (2007), Ludger Sicking (2008), Kai Hatje (2008), Kurt "
-"Gramlich (2009), Franziska Teichert (2009) and Philipp Hübner (2009) and is "
-"released under the GPL2 or any later version."
+msgid "The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007), Ludger Sicking (2008), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009) and Philipp Hübner (2009) and is released under the GPL2 or any later version."
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3561
-msgid ""
-"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009) and is released under the GPL2 or any later version."
+msgid "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009) and is released under the GPL2 or any later version."
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3563
-msgid ""
-"The French translation is copyrighted by Christophe Masson (2008) and the "
-"French l10n team (2009) and is released under the GPL2 or any later version."
+msgid "The French translation is copyrighted by Christophe Masson (2008) and the French l10n team (2009) and is released under the GPL2 or any later version."
msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3565
-msgid ""
-"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+msgid "The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) (2009) and is released under the GPL2 or any later version."
msgstr ""
# type: Content of: <article><section><title>
@@ -7073,11 +6788,7 @@ msgstr ""
# type: Content of: <article><section><para>
#: debian-edu-lenny-manual.xml:3572
-msgid ""
-"Fully translated versions of this document are not yet available. Incomplete "
-"translations for Italian, German, Norwegian Bokmål, French and Spanish "
-"exist, take a look for your <ulink url=\"http://maintainer.skolelinux.org/"
-"debian-edu-doc/\">language </ulink> here."
+msgid "Fully translated versions of this document are not yet available. Incomplete translations for Italian, German, Norwegian Bokmål, French and Spanish exist, take a look for your <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">language </ulink> here."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -7087,61 +6798,37 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3579
-msgid ""
-"Translations of this document are kept in .po files like in many free "
-"software projects, read <computeroutput>usr/share/doc/debian-edu-doc/README."
-"debian-edu-lenny-manual-translations </computeroutput> for more information "
-"on this. Please read also read this, if you want to start/help translating "
-"this document."
+msgid "Translations of this document are kept in .po files like in many free software projects, read <computeroutput>usr/share/doc/debian-edu-doc/README.debian-edu-lenny-manual-translations </computeroutput> for more information on this. Please read also read this, if you want to start/help translating this document."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3582
-msgid ""
-"To commit your translations you need to be a member of the alioth project "
-"<computeroutput>debian-edu </computeroutput>. To translate, you just need to "
-"check out some files from from svn (which can be done anonymously), create "
-"patches and send those to <ulink url=\"mailto:debian-edu-doc at packages.qa."
-"debian.org\">debian-edu-doc at packages.qa.debian.org </ulink>."
+msgid "To commit your translations you need to be a member of the alioth project <computeroutput>debian-edu </computeroutput>. To translate, you just need to check out some files from from svn (which can be done anonymously), create patches and send those to <ulink url=\"mailto:debian-edu-doc at packages.qa.debian.org\">debian-edu-doc at packages.qa.debian.org </ulink>."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3586
-msgid ""
-"You can checkout the <computeroutput>debian-edu-doc </computeroutput> source "
-"anonymously with the following command (you need to have the "
-"<computeroutput>subversion </computeroutput> package installed for this to "
-"work):"
+msgid "You can checkout the <computeroutput>debian-edu-doc </computeroutput> source anonymously with the following command (you need to have the <computeroutput>subversion </computeroutput> package installed for this to work):"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3590
-msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc </computeroutput>"
+msgid "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc </computeroutput>"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3595
-msgid ""
-"Then edit the <computeroutput>documentation/debian-edu-lenny/debian-edu-"
-"lenny-manual.$CC.po </computeroutput> (where you replace $CC with your "
-"language code). There are many tools for translating available, we suggest "
-"to use <computeroutput>kbabel </computeroutput>."
+msgid "Then edit the <computeroutput>documentation/debian-edu-lenny/debian-edu-lenny-manual.$CC.po </computeroutput> (where you replace $CC with your language code). There are many tools for translating available, we suggest to use <computeroutput>kbabel </computeroutput>."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3599
-msgid ""
-"Then you either commit the file directly to svn (if you have the rights to "
-"do so) or send the file to the mailinglist."
+msgid "Then you either commit the file directly to svn (if you have the rights to do so) or send the file to the mailinglist."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3601
-msgid ""
-"To update your local copy of the repository use the following command inside "
-"the <computeroutput>debian-edu-doc </computeroutput> directory:"
+msgid "To update your local copy of the repository use the following command inside the <computeroutput>debian-edu-doc </computeroutput> directory:"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -7151,15 +6838,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3609
-msgid ""
-"Read /usr/share/doc/debian-edu-doc/README.debian-edu-lenny-manual-"
-"translations to find information how to create a new .po file for your "
-"language if there is none yet, and how to update translations. If you are "
-"new to SVN, look at the <ulink url=\"http://svnbook.org\">SVN book </ulink>, "
-"it has a chapter on the <ulink url=\"http://svnbook.red-bean.com/en/1.0/"
-"ch03s05.html\">basic workflow with SVN </ulink>. Also you might want to look "
-"at he <computeroutput>kdesvn </computeroutput> package if you prefer a GUI "
-"client for SVN instead of using the commandline client."
+msgid "Read /usr/share/doc/debian-edu-doc/README.debian-edu-lenny-manual-translations to find information how to create a new .po file for your language if there is none yet, and how to update translations. If you are new to SVN, look at the <ulink url=\"http://svnbook.org\">SVN book </ulink>, it has a chapter on the <ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with SVN </ulink>. Also you might want to look at he <computeroutput>kdesvn </computeroutput> package if you prefer a GUI client for SVN instead of using the commandline client."
msgstr ""
# type: Content of: <article><section><section><para>
@@ -7185,37 +6864,22 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3627
-msgid ""
-"Copyright (C) 2007-2009 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org </ulink> > and others, see the <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Etch/CopyRight#"
-"\">Copyright chapter </ulink> for the full list of copyright owners."
+msgid "Copyright (C) 2007-2009 Holger Levsen < <ulink url=\"mailto:holger at layer-acht.org\">holger at layer-acht.org </ulink> > and others, see the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Etch/CopyRight#\">Copyright chapter </ulink> for the full list of copyright owners."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3631
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+msgid "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3633
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details."
+msgid "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3635
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgid "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -7230,11 +6894,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3644
-msgid ""
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
-"distribute verbatim copies of this license document, but changing it is not "
-"allowed."
+msgid "Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -7244,311 +6904,142 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3651
-msgid ""
-"<emphasis role=\"strong\">0. </emphasis> This License applies to any "
-"program or other work which contains a notice placed by the copyright holder "
-"saying it may be distributed under the terms of this General Public "
-"License. The \"Program\", below, refers to any such program or work, and a "
-"\"work based on the Program\" means either the Program or any derivative "
-"work under copyright law: that is to say, a work containing the Program or a "
-"portion of it, either verbatim or with modifications and/or translated into "
-"another language. (Hereinafter, translation is included without limitation "
-"in the term \"modification\".) Each licensee is addressed as \"you\"."
+msgid "<emphasis role=\"strong\">0. </emphasis> This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The \"Program\", below, refers to any such program or work, and a \"work based on the Program\" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term \"modification\".) Each licensee is addressed as \"you\"."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3654
-msgid ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope. The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+msgid "Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3656
-msgid ""
-"<emphasis role=\"strong\">1. </emphasis> You may copy and distribute "
-"verbatim copies of the Program's source code as you receive it, in any "
-"medium, provided that you conspicuously and appropriately publish on each "
-"copy an appropriate copyright notice and disclaimer of warranty; keep intact "
-"all the notices that refer to this License and to the absence of any "
-"warranty; and give any other recipients of the Program a copy of this "
-"License along with the Program."
+msgid "<emphasis role=\"strong\">1. </emphasis> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3659
-msgid ""
-"You may charge a fee for the physical act of transferring a copy, and you "
-"may at your option offer warranty protection in exchange for a fee."
+msgid "You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3661
-msgid ""
-"<emphasis role=\"strong\">2. </emphasis> You may modify your copy or copies "
-"of the Program or any portion of it, thus forming a work based on the "
-"Program, and copy and distribute such modifications or work under the terms "
-"of Section 1 above, provided that you also meet all of these conditions:"
+msgid "<emphasis role=\"strong\">2. </emphasis> You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3664
-msgid ""
-"<emphasis role=\"strong\">a) </emphasis> You must cause the modified files "
-"to carry prominent notices stating that you changed the files and the date "
-"of any change."
+msgid "<emphasis role=\"strong\">a) </emphasis> You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3667
-msgid ""
-"<emphasis role=\"strong\">b) </emphasis> You must cause any work that you "
-"distribute or publish, that in whole or in part contains or is derived from "
-"the Program or any part thereof, to be licensed as a whole at no charge to "
-"all third parties under the terms of this License."
+msgid "<emphasis role=\"strong\">b) </emphasis> You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License."
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3670
-msgid ""
-"<emphasis role=\"strong\">c) </emphasis> If the modified program normally "
-"reads commands interactively when run, you must cause it, when started "
-"running for such interactive use in the most ordinary way, to print or "
-"display an announcement including an appropriate copyright notice and a "
-"notice that there is no warranty (or else, saying that you provide a "
-"warranty) and that users may redistribute the program under these "
-"conditions, and telling the user how to view a copy of this License. "
-"(Exception: if the Program itself is interactive but does not normally print "
-"such an announcement, your work based on the Program is not required to "
-"print an announcement.)"
+msgid "<emphasis role=\"strong\">c) </emphasis> If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3675
-msgid ""
-"These requirements apply to the modified work as a whole. If identifiable "
-"sections of that work are not derived from the Program, and can be "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works. But when you distribute the same "
-"sections as part of a whole which is a work based on the Program, the "
-"distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each "
-"and every part regardless of who wrote it."
+msgid "These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3677
-msgid ""
-"Thus, it is not the intent of this section to claim rights or contest your "
-"rights to work written entirely by you; rather, the intent is to exercise "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+msgid "Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3679
-msgid ""
-"In addition, mere aggregation of another work not based on the Program with "
-"the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+msgid "In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3681
-msgid ""
-"<emphasis role=\"strong\">3. </emphasis> You may copy and distribute the "
-"Program (or a work based on it, under Section 2) in object code or "
-"executable form under the terms of Sections 1 and 2 above provided that you "
-"also do one of the following:"
+msgid "<emphasis role=\"strong\">3. </emphasis> You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3684
-msgid ""
-"<emphasis role=\"strong\">a) </emphasis> Accompany it with the complete "
-"corresponding machine-readable source code, which must be distributed under "
-"the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+msgid "<emphasis role=\"strong\">a) </emphasis> Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3687
-msgid ""
-"<emphasis role=\"strong\">b) </emphasis> Accompany it with a written offer, "
-"valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete "
-"machine-readable copy of the corresponding source code, to be distributed "
-"under the terms of Sections 1 and 2 above on a medium customarily used for "
-"software interchange; or,"
+msgid "<emphasis role=\"strong\">b) </emphasis> Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: debian-edu-lenny-manual.xml:3690
-msgid ""
-"<emphasis role=\"strong\">c) </emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code. (This "
-"alternative is allowed only for noncommercial distribution and only if you "
-"received the program in object code or executable form with such an offer, "
-"in accord with Subsection b above.)"
+msgid "<emphasis role=\"strong\">c) </emphasis> Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)"
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3695
-msgid ""
-"The source code for a work means the preferred form of the work for making "
-"modifications to it. For an executable work, complete source code means all "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable. However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+msgid "The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3697
-msgid ""
-"If distribution of executable or object code is made by offering access to "
-"copy from a designated place, then offering equivalent access to copy the "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+msgid "If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3699
-msgid ""
-"<emphasis role=\"strong\">4. </emphasis> You may not copy, modify, "
-"sublicense, or distribute the Program except as expressly provided under "
-"this License. Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights "
-"under this License. However, parties who have received copies, or rights, "
-"from you under this License will not have their licenses terminated so long "
-"as such parties remain in full compliance."
+msgid "<emphasis role=\"strong\">4. </emphasis> You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3702
-msgid ""
-"<emphasis role=\"strong\">5. </emphasis> You are not required to accept "
-"this License, since you have not signed it. However, nothing else grants "
-"you permission to modify or distribute the Program or its derivative works. "
-"These actions are prohibited by law if you do not accept this License. "
-"Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all "
-"its terms and conditions for copying, distributing or modifying the Program "
-"or works based on it."
+msgid "<emphasis role=\"strong\">5. </emphasis> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3705
-msgid ""
-"<emphasis role=\"strong\">6. </emphasis> Each time you redistribute the "
-"Program (or any work based on the Program), the recipient automatically "
-"receives a license from the original licensor to copy, distribute or modify "
-"the Program subject to these terms and conditions. You may not impose any "
-"further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to "
-"this License."
+msgid "<emphasis role=\"strong\">6. </emphasis> Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3708
-msgid ""
-"<emphasis role=\"strong\">7. </emphasis> If, as a consequence of a court "
-"judgment or allegation of patent infringement or for any other reason (not "
-"limited to patent issues), conditions are imposed on you (whether by court "
-"order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License. If you "
-"cannot distribute so as to satisfy simultaneously your obligations under "
-"this License and any other pertinent obligations, then as a consequence you "
-"may not distribute the Program at all. For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who "
-"receive copies directly or indirectly through you, then the only way you "
-"could satisfy both it and this License would be to refrain entirely from "
-"distribution of the Program."
+msgid "<emphasis role=\"strong\">7. </emphasis> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3711
-msgid ""
-"If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and "
-"the section as a whole is intended to apply in other circumstances."
+msgid "If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3713
-msgid ""
-"It is not the purpose of this section to induce you to infringe any patents "
-"or other property right claims or to contest validity of any such claims; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices. Many people have made generous contributions to the wide range "
-"of software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+msgid "It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3715
-msgid ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+msgid "This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3717
-msgid ""
-"<emphasis role=\"strong\">8. </emphasis> If the distribution and/or use of "
-"the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program "
-"under this License may add an explicit geographical distribution limitation "
-"excluding those countries, so that distribution is permitted only in or "
-"among countries not thus excluded. In such case, this License incorporates "
-"the limitation as if written in the body of this License."
+msgid "<emphasis role=\"strong\">8. </emphasis> If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3720
-msgid ""
-"<emphasis role=\"strong\">9. </emphasis> The Free Software Foundation may "
-"publish revised and/or new versions of the General Public License from time "
-"to time. Such new versions will be similar in spirit to the present "
-"version, but may differ in detail to address new problems or concerns."
+msgid "<emphasis role=\"strong\">9. </emphasis> The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3723
-msgid ""
-"Each version is given a distinguishing version number. If the Program "
-"specifies a version number of this License which applies to it and \"any "
-"later version\", you have the option of following the terms and conditions "
-"either of that version or of any later version published by the Free "
-"Software Foundation. If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software "
-"Foundation."
+msgid "Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and \"any later version\", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3725
-msgid ""
-"<emphasis role=\"strong\">10. </emphasis> If you wish to incorporate parts "
-"of the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission. For software which is "
-"copyrighted by the Free Software Foundation, write to the Free Software "
-"Foundation; we sometimes make exceptions for this. Our decision will be "
-"guided by the two goals of preserving the free status of all derivatives of "
-"our free software and of promoting the sharing and reuse of software "
-"generally."
+msgid "<emphasis role=\"strong\">10. </emphasis> If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally."
msgstr ""
# type: Content of: <article><section><section><para>
@@ -7558,30 +7049,12 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3731
-msgid ""
-"<emphasis role=\"strong\">11. </emphasis> BECAUSE THE PROGRAM IS LICENSED "
-"FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
-"PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
-"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
-"PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
-"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+msgid "<emphasis role=\"strong\">11. </emphasis> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3734
-msgid ""
-"<emphasis role=\"strong\">12. </emphasis> IN NO EVENT UNLESS REQUIRED BY "
-"APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
-"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
-"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
-"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
-"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
-"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
-"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
+msgid "<emphasis role=\"strong\">12. </emphasis> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -7621,14 +7094,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3767
-msgid ""
-"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
-"UTF-8 </computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
-"name you want. To aciviate a given keyboard layout, use the "
-"<computeroutput>keyb=KB </computeroutput> option where KB is the wanted "
-"keyboard layout. More information on this feature <ulink url=\"http://wiki."
-"debian.org/DebianLive/l10n\">is available from the live cd build script "
-"documentation </ulink>. Here is a list of commonly used locale codes:"
+msgid "To activate a specific translation, boot using <computeroutput>locale=ll_CC.UTF-8 </computeroutput> as a boot option, where ll_CC.UTF-8 is the locale name you want. To aciviate a given keyboard layout, use the <computeroutput>keyb=KB </computeroutput> option where KB is the wanted keyboard layout. More information on this feature <ulink url=\"http://wiki.debian.org/DebianLive/l10n\">is available from the live cd build script documentation </ulink>. Here is a list of commonly used locale codes:"
msgstr ""
# type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -7657,7 +7123,14 @@ msgid "nb_NO.UTF-8"
msgstr ""
# type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+>>>> YOUR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
+#: debian-edu-lenny-manual.xml:3720
+#: debian-edu-lenny-manual.xml:3730
+==== ORIGINAL VERSION debian-edu-lenny-manual.zh.po 125968969722687
+#: debian-edu-lenny-manual.xml:3720 debian-edu-lenny-manual.xml:3730
+==== THEIR VERSION debian-edu-lenny-manual.zh.po (/mirror/debian-edu/trunk/src/debian-edu-doc/documentation/debian-edu-lenny) 125968969722687
#: debian-edu-lenny-manual.xml:3791 debian-edu-lenny-manual.xml:3801
+<<<< 125968969722687
msgid "no"
msgstr ""
@@ -7748,11 +7221,7 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3858
-msgid ""
-"A complete list of locale codes is available in <computeroutput>/usr/share/"
-"i18n/SUPPORTED </computeroutput>, but only the UTF-8 locales are supported "
-"by the live images. Not all locales have translations installed, though. "
-"The keyboard layout names can be found in /usr/share/keymaps/i386/."
+msgid "A complete list of locale codes is available in <computeroutput>/usr/share/i18n/SUPPORTED </computeroutput>, but only the UTF-8 locales are supported by the live images. Not all locales have translations installed, though. The keyboard layout names can be found in /usr/share/keymaps/i386/."
msgstr ""
# type: Content of: <article><section><section><title>
@@ -7772,10 +7241,7 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject>
#: debian-edu-lenny-manual.xml:3879
-msgid ""
-"</inlinemediaobject> there are no lenny images yet "
-"<inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://"
-"wiki.debian.org/htdocs/modern/img/sad.png\" depth=\"15\"/> </imageobject>"
+msgid "</inlinemediaobject> there are no lenny images yet <inlinemediaobject><imageobject><imagedata width=\"15\" fileref=\"http://wiki.debian.org/htdocs/modern/img/sad.png\" depth=\"15\"/> </imageobject>"
msgstr ""
# type: Content of: <article><section><section><title>
@@ -7785,13 +7251,11 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: debian-edu-lenny-manual.xml:3892
-msgid ""
-"The image is 1.2 GiB and available using <ulink url=\"ftp://ftp.skolelinux."
-"org/cd-lenny-live/\">FTP </ulink>, <ulink url=\"http://ftp.skolelinux.org/cd-"
-"lenny-live/\">HTTP </ulink> or rsync from ftp.skolelinux.org at cd-lenny-"
-"live/."
+msgid "The image is 1.2 GiB and available using <ulink url=\"ftp://ftp.skolelinux.org/cd-lenny-live/\">FTP </ulink>, <ulink url=\"http://ftp.skolelinux.org/cd-lenny-live/\">HTTP </ulink> or rsync from ftp.skolelinux.org at cd-lenny-live/."
msgstr ""
-# type: Content of: <article><section><section><title>
-#~ msgid "Services"
-#~ msgstr "服務"
+# type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#~ msgid "DNS (PowerDNS) [domain]"
+#~ msgstr "DNS (Bind) [domain]"
+
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list