[debian-edu-commits] debian-edu/ 01/01: Update Japanese translation.

victory .deb victory-guest at moszumanska.debian.org
Sun Feb 19 19:27:18 UTC 2017


This is an automated email from the git hooks/post-receive script.

victory-guest pushed a commit to branch master
in repository debian-edu-doc.

commit 85e6cbace02210d34da5854d5119e019c9b27d7c
Author: victory <victory.deb at gmail.com>
Date:   Mon Feb 20 04:26:44 2017 +0900

    Update Japanese translation.
---
 .../debian-edu-stretch-manual.ja.po                | 701 +++------------------
 1 file changed, 89 insertions(+), 612 deletions(-)

diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index 3e50d14..0e8a619 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -75,19 +75,6 @@ msgstr ""
 "す。"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Directly after installation of a school server all services needed for a "
-#| "school network are set up (see the next chapter <link linkend="
-#| "\"Architecture\">details of the architecture of this setup</link>) and "
-#| "the system is ready to be used. Only users and machines need to be added "
-#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
-#| "environment using PXE has also been prepared, so after initial "
-#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
-#| "all other machines can be installed via the network, this includes "
-#| "\"roaming workstations\" (ones that can be taken away from the school "
-#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
-#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -149,13 +136,6 @@ msgstr ""
 "そのまま使える環境を提供するバージョンの Debian だということです。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
-#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
-#| "both projects are united, but both names stayed. \"Skole\" and "
-#| "(Debian-)\"Education\" are just two well understood terms in these "
-#| "regions."
 msgid ""
 "The Skolelinux project in Norway was founded on July 2nd 2001 and about the "
 "same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both "
@@ -202,16 +182,6 @@ msgid "The Debian Edu network topology"
 msgstr "Debian Edu のネットワーク接続形態"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| 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 LTSP-"
-#| "servers (with associated thin-clients and/or diskless workstations). The "
-#| "number of workstations can be as large or small as you want (starting "
-#| "from none to a lot). The same goes for the LTSP servers, each of which is "
-#| "on a separate network so that the traffic between the clients and the "
-#| "LTSP server doesn't affect the rest of the network services."
 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, "
@@ -231,14 +201,6 @@ msgstr ""
 "ビスの他の部分に影響することはありません。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| 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."
 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 "
@@ -283,12 +245,6 @@ msgstr ""
 "ハードディスクからのブート等を選択できるようになっています。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "This is designed to be modified - that is, you can have the NFS-root in "
-#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
-#| "option (stored in LDAP) to have clients directly boot via PXE from the "
-#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
 "syslinux pointing to one of the LTSP servers or change the DHCP next-server "
@@ -319,13 +275,6 @@ msgid "Main server (tjener)"
 msgstr "中心サーバ (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| 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 required) to also select and install the LTSP-server "
-#| "and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
@@ -344,18 +293,6 @@ msgid "Services running on the main server"
 msgstr "中心サーバで動作するサービス"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "With the exception of the control of the thin-clients, all services are "
-#| "initially set up on one central computer (the main server). For "
-#| "performance reasons, the LTSP-server(s) should be separate (though it is "
-#| "possible to install both the main server and LTSP server profiles on the "
-#| "same machine). All services are allocated a dedicated DNS-name and are "
-#| "offered exclusively over IPv4. The allocated DNS name makes it easy to "
-#| "move individual services from the main-server to a different machine, by "
-#| "simply stopping the service on the main-server, and changing the DNS "
-#| "configuration to point to the new location of the service (which should "
-#| "be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin clients, all services are "
 "initially set up on one central computer (the main server). For performance "
@@ -597,11 +534,11 @@ msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Network Block Device Server"
-msgstr ""
+msgstr "NBD (ネットワークブロックデバイス) サーバ"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "NBD"
-msgstr ""
+msgstr "NBD"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -612,16 +549,12 @@ msgstr ""
 "子メールでエラーを報告します。"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-#| msgid "munin, icinga and site-summary"
 msgid "Munin, Icinga and Sitesummary"
-msgstr "munin、icinga、site-summary"
+msgstr "Munin、Icinga、Sitesummary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-#| msgid "site-summary"
 msgid "sitesummary"
-msgstr "site-summary"
+msgstr "sitesummary"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -638,15 +571,6 @@ msgstr ""
 "Macintosh クライアント向けには SMB を経由したアクセスを提供します。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "By default email is set up for local delivery (i.e. within the school) "
-#| "only, though email delivery to the wider Internet may be set up if the "
-#| "school has a permanent Internet connection. Mailing lists are set up "
-#| "based on the user database, giving each class their own mailing list. "
-#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
-#| "users can <link linkend=\"Users--Using_email\">access their personal "
-#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
@@ -656,11 +580,9 @@ msgid ""
 msgstr ""
 "メールはデフォルトでローカル配送 (つまり学校内) だけで使えるように用意されま"
 "すが、学校に恒久的なインターネット接続がある場合には広くインターネットにも"
-"メールを配送できるようにすることも可能です。メーリングリストはユーザのデータ"
-"ベースを基に、各クラスにそれぞれのクラス自身のメーリングリストが用意されま"
-"す。クライアントはメールを (「スマートホスト」を使って) サーバに配送するよう"
-"に設定され、ユーザは IMAP 経由で<link linkend=\"Users--Using_email\">個人の"
-"メールにアクセス</link>できます。"
+"メールを配送できるようにすることも可能です。クライアントはメールを (「スマー"
+"トホスト」を使って) サーバに配送するように設定され、ユーザは IMAP 経由で"
+"<link linkend=\"Users--Using_email\">個人のメールにアクセス</link>できます。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -682,14 +604,6 @@ msgstr ""
 "個々のマシンのインターネットアクセスを制御できるようになります。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP-"
-#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
-#| "network traffic of the thin clients doesn't interfere with the rest of "
-#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
@@ -787,13 +701,6 @@ msgstr ""
 "時刻を得られるようにすべきです。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Printers are connected where convenient, either directly onto the main "
-#| "network, or connected to a server, workstation or LTSP-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."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
 "network, or connected to a server, workstation or LTSP server. Access to "
@@ -811,11 +718,6 @@ msgid "LTSP server(s)"
 msgstr "LTSP サーバ"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (which we called \"thin "
-#| "client servers\" in releases before Stretch), which are installed by "
-#| "selecting the LTSP server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
@@ -861,17 +763,6 @@ msgstr ""
 "います。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP server. This works as follows: "
-#| "the service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted via NFS from the LTSP "
-#| "server, and finally the X Window System is started. The display manager "
-#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
-#| "data is encrypted on the network. For very old thin clients which are too "
-#| "slow for the encryption this can be set to the behavior from former "
-#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
@@ -886,7 +777,7 @@ msgstr ""
 "シンクライアントはプログラムを全て LTSP サーバから効果的に実行することで非力"
 "なマシンを活用できる良い方法です。これは以下のように動作します。サービスは "
 "DHCP と TFTP を使ってネットワークに接続し、ネットワークからブートします。次"
-"に LTSP サーバからNFS経由でファイルシステムがマウントされ、そして最後に X "
+"に LTSP サーバからNBDを使ってファイルシステムがマウントされ、そして最後に X "
 "ウィンドウシステムが起動されます。ディスプレイマネージャ (LDM) はX転送を使っ"
 "てSSH経由で LTSP サーバに接続します。こうしてネットワークを流れるデータは全て"
 "暗号化されます。暗号化通信に耐えないような非常に古いクライアントでは以前の"
@@ -959,12 +850,6 @@ msgid "Administration"
 msgstr "管理"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "All the Linux machines that are installed with the Skolelinux installer "
-#| "will be administrable from a central computer, most likely the server. It "
-#| "will be possible to log in to all machines via SSH (root not allowed by "
-#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
@@ -973,8 +858,9 @@ msgid ""
 msgstr ""
 "Skolelinux インストーラによりインストールされる Linux マシンはすべて、中央コ"
 "ンピュータ、ほとんどの場合中心サーバから管理できます。SSH を経由して全マシン"
-"へのログイン (root はデフォルトで許可されません) が可能になるため、結果として"
-"マシンへの完全アクセスを得られるということになります。"
+"へのログイン (パスワードによる root ログインはデフォルトで許可されません) が"
+"可能になるため、結果としてマシンへの完全アクセスを得られるということになりま"
+"す。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1000,10 +886,6 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The aim is to be able to install a server from any type medium once, and "
-#| "install all other clients over the network by booting from the network."
 msgid ""
 "The aim is to be able to install a server from any type of medium once, and "
 "install all other clients over the network by booting from the network."
@@ -1256,17 +1138,12 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 は中心ネットワーク (10.0.0.0/8) に接続"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
-#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
-#| "\">others are possible</link>."
 msgid ""
 "eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
-"eth1 は LTSP クライアント側で利用されます (192.168.0.0/24 がデフォルトですが"
+"eth1 は LTSP クライアント側で利用されます (デフォルトは 192.168.0.0/24)。"
 "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">変更も"
 "可能です</link>)。"
 
@@ -1376,28 +1253,28 @@ msgid ""
 "interface, is needed to connect to the Internet."
 msgstr ""
 "インターネットへの接続には外部インターフェイスがインターネットに接続し、内部"
-"インターフェイスは IP アドレス 10.0.0.1、ネットマスク netmask 255.0.0.0 で動"
-"作しているルータ/ゲートウェイが必要です。"
+"インターフェイスはIPアドレス 10.0.0.1、ネットマスク netmask 255.0.0.0 で動作"
+"しているルータ/ゲートウェイが必要です。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A system with two network interfaces could be turned into a gateway if the "
 "Debian Edu 'Minimal' profile is installed."
 msgstr ""
+"ネットワークを2つ備えたシステムは Debian Edu の「最小構成 (Minimal)」プロファ"
+"イルをインストールすればゲートウェイにできます。 "
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "Configuring the PXE installation"
 msgid "After the installation:"
-msgstr "PXEインストールの設定"
+msgstr "インストール後に"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Adjust the /etc/network/interfaces file."
-msgstr ""
+msgstr "/etc/network/interfaces を調整します。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Change the hostname permanently to 'gateway'."
-msgstr ""
+msgstr "ホスト名を恒久的に「gateway」に変更します。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
@@ -1450,14 +1327,6 @@ msgstr ""
 "floppyfw\">floppyfw</ulink> を勧めます。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you need something for an embedded router or accesspoint we recommend "
-#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
-#| "you can also use the original firmware. Using the original firmware is "
-#| "easier; using OpenWRT gives you more choices and control. Check the "
-#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
-#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1468,10 +1337,10 @@ msgid ""
 msgstr ""
 "何らかの組み込みルータやアクセスポイントが必要な場合は <ulink url=\"http://"
 "openwrt.org\">OpenWRT</ulink> の利用を勧めますが、もちろん元のファームウェア"
-"も利用できます。元の ファームウェアを利用する方が簡単です。OpenWRT を使うこと"
+"も利用できます。元のファームウェアを利用する方が簡単です。OpenWRT を使うこと"
 "で選択や制御の幅が広がります。OpenWRT のウェブページ、<ulink url=\"http://"
-"wiki.openwrt.org/TableOfHardware\">サポートされているハードウェア</ulink>で一"
-"覧を確認してください。"
+"wiki.openwrt.org/toh/start\">サポートされているハードウェア</ulink>で一覧を確"
+"認してください。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1579,13 +1448,6 @@ msgid "USB drive ISO image for i386 and amd64"
 msgstr "i386 及び amd64 用 USB ISO イメージ"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. Like the netinstall image it can "
-#| "be installed on USB flash drives or disk media of sufficient size. Please "
-#| "note that internet access during installation is needed. Like the others "
-#| "it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
 "The multi-architecture ISO image is 5.5 GiB large and can be used for "
 "installation of amd64 and i386 machines. Like the netinstall image it can be "
@@ -1594,11 +1456,12 @@ msgid ""
 "profile is chosen. Like the others it can be downloaded over HTTP or rsync "
 "via:"
 msgstr ""
-"複数アーキテクチャ対応の ISO イメージは 5.2 GiB の大きさで、 amd64 や i386 マ"
+"複数アーキテクチャ対応の ISO イメージは 5.5 GiB の大きさで、 amd64 や i386 マ"
 "シンへのインストールに利用できます。netinstall イメージと同様に十分なサイズ"
-"の USB フラッシュドライブやディスクメディアで使えます。インストール時にイン"
-"ターネットへのアクセスが必要となることに注意してください 他と同様 FTP や "
-"HTTP、rsync 経由でダウンロードできます:"
+"の USB フラッシュドライブやディスクメディアで使えます。「LTSP サーバ」プロ"
+"ファイルを選択した場合はインストール時にインターネットへのアクセスが必要とな"
+"ることに注意してください 他と同様 FTP や HTTP、rsync 経由でダウンロードできま"
+"す:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1647,14 +1510,6 @@ msgid "Installing Debian Edu"
 msgstr "Debian Edu のインストール"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When you do a Debian Edu installation, you have a few options to choose "
-#| "from. Don't be afraid; there aren't many. We have done a good job of "
-#| "hiding the complexity of Debian during the installation and beyond. "
-#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
-#| "packages to choose from and a billion configuration options. For the "
-#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
@@ -1666,7 +1521,7 @@ msgstr ""
 "Debian Edu のインストールを行う際に、選択できることがいくつかあります。それほ"
 "ど多くはありませんので安心してください。穿いてますよ。Debian インストールやそ"
 "の裏の複雑な部分の隠蔽に私たちは成功したのです。それでも Debian Edu は "
-"Debian であり、望むなら 42,000 超のパッケージから選択できます。その設定オプ"
+"Debian であり、望むなら 52,000 超のパッケージから選択できます。その設定オプ"
 "ションの組み合わせとなれば選択は億を超えることになります。大多数のユーザに"
 "とってはデフォルトが有効なはずです。"
 
@@ -1825,33 +1680,26 @@ msgstr ""
 "説明されている項目についてもっと詳細なヘルプを得られるようになっています。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "<emphasis>Additional boot parameters for installations</emphasis>"
 msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
-msgstr "<emphasis>インストール時の追加のブートパラメータ</emphasis>"
+msgstr "<emphasis>インストール時のブートパラメータの追加や変更</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "In both cases, boot options can be edited by pressing the TAB key in the "
-#| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu; the screenshot shows the command line for <emphasis role=\"strong"
 "\">Graphical install</emphasis>."
 msgstr ""
 "どちらの場合もブートメニューでタブキーを押すとブートオプションを編集できるよ"
-"うになっています。"
+"うになっています。スクリーンショットは <emphasis role=\"strong\">Graphical "
+"install</emphasis> 用のコマンドラインを示しています。"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/BD_command_line.png"
-msgstr "./images/smile.png"
+msgstr "./images/BD_command_line.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Edit command line options"
-msgstr ""
+msgstr "コマンドラインオプションの編集"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1876,64 +1724,41 @@ msgstr ""
 "に利用します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
 "kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
-"<emphasis role=\"strong\">MATE</emphasis> デスクトップに代えて <emphasis "
-"role=\"strong\">GNOME</emphasis> デスクトップをインストールするにはカーネルの"
-"ブートパラメータに <computeroutput>desktop=gnome</computeroutput> を追加しま"
-"す。"
+"<emphasis role=\"strong\">GNOME</emphasis> デスクトップに代えて <emphasis "
+"role=\"strong\">KDE Plasma</emphasis> デスクトップをインストールするにはカー"
+"ネルのブートパラメータ <computeroutput>desktop=kde</computeroutput> の「kde」"
+"を「gnome」に置き換えます。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
 "intended to be used.)"
 msgstr ""
 "代わりに <emphasis role=\"strong\">LXDE</emphasis> デスクトップをインストール"
-"するにはカーネルのブートパラメータに <computeroutput>desktop=lxde</"
-"computeroutput> を追加します。"
+"するには <computeroutput>desktop=lxde</computeroutput> を使いします (LTSP 用"
+"に推奨)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "代わりに <emphasis role=\"strong\">Xfce</emphasis> デスクトップをインストール"
-"するにはカーネルのブートパラメータに <computeroutput>desktop=xfce</"
-"computeroutput> を追加します。"
+"するには <computeroutput>desktop=xfce</computeroutput> を使います。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> "
-#| "desktop instead, add <computeroutput>desktop=kde</computeroutput> to the "
-#| "kernel boot parameters."
 msgid ""
 "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
 "instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
-"代わりに <emphasis role=\"strong\">KDE 「Plasma」</emphasis> デスクトップをイ"
-"ンストールするにはカーネルのブートパラメータに <computeroutput>desktop=kde</"
-"computeroutput> を追加します。"
+"代わりに <emphasis role=\"strong\">MATE</emphasis> デスクトップをインストール"
+"するには <computeroutput>desktop=mate</computeroutput> を使います。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "The installation process"
@@ -1950,8 +1775,6 @@ msgstr ""
 "ド (NIC) が2つ以上あることの確認を忘れないようにしてください。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Choose a language (for the installation and the installed system)"
 msgid "Choose a language (for the installation and the installed system)."
 msgstr "言語を選択します (インストール時とインストールしたシステム)。"
 
@@ -1960,8 +1783,6 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr "国や地域を選択します。通常は自分が住んでいる場所です。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "キーボードの種類を選択します (通常は国や地域のデフォルトでかまいません)。"
@@ -1971,19 +1792,10 @@ msgid "Choose profile(s) from the following list:"
 msgstr "以下のリストからプロファイルを選択します:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgid "<emphasis role=\"strong\">Main Server</emphasis>"
-msgstr "<emphasis role=\"strong\">Main-Server (tjener, 中心サーバ)</emphasis>"
+msgstr "<emphasis role=\"strong\">Main-Server (中心サーバ)</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "This is the main server (tjener) for your school providing all services "
-#| "pre-configured to work out of the box. You must only install one main "
-#| "server per school! This profile does not include a graphical user "
-#| "interface. If you want a graphical user interface, then select "
-#| "Workstation or LTSP-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must install only one main server per "
@@ -2034,22 +1846,10 @@ msgstr ""
 "ファイルを選択してください。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
 msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
-msgstr "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgstr "<emphasis role=\"strong\">LTSP Server</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "A thin client (and diskless workstation) server, is called an LTSP "
-#| "server. Clients without hard drives boot and run software from this "
-#| "server. This computer needs two network cards, a lot of memory, and "
-#| "ideally more than one processor or core. See the chapter about <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for more information "
-#| "on this subject. Choosing this profile also enables the workstation "
-#| "profile (even if it is not selected) - an LTSP server can always be used "
-#| "as a workstation, too."
 msgid ""
 "A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
@@ -2062,12 +1862,12 @@ msgid ""
 msgstr ""
 "シンクライアント (やディスクレスワークステーション) サーバで、LTSP サーバとも"
 "呼ばれます。ハードドライブを持たないクライアントはブートとソフトウェアの実行"
-"をこのサーバから行います。このコンピュータには2つのネットワークカード、大量の"
-"メモリ、それに理想的には複数のプロセッサまたはコアが必要です。この件のさらな"
-"る情報については、<link linkend=\"NetworkClients\">ネットワーククライアント</"
-"link>の章を見てください。このプロファイルを選択すると (ワークステーションを選"
-"択していなくても) ワークステーションプロファイルも有効になります - LTSP サー"
-"バは常にワークステーションとしても使えるということになります。"
+"をこのサーバから行います。このコンピュータには2つのネットワークインターフェイ"
+"ス、大量のメモリ、それに理想的には複数のプロセッサまたはコアが必要です。この"
+"件のさらなる情報については、<link linkend=\"NetworkClients\">ネットワーククラ"
+"イアント</link>の章を見てください。このプロファイルを選択すると (ワークステー"
+"ションを選択していなくても) ワークステーションプロファイルも有効になります - "
+"LTSP サーバは常にワークステーションとしても使えるということになります。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Standalone</emphasis>"
@@ -2098,20 +1898,6 @@ msgstr ""
 "スの基盤に有用です。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
-#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP "
-#| "Server</emphasis> profiles are preselected. These profiles can be "
-#| "installed on one machine together if you want to install a so called "
-#| "<emphasis>combined main server</emphasis>. This means the main server "
-#| "will be an LTSP server and also be used as a workstation. This is the "
-#| "default choice, since we assume most people will install <link linkend="
-#| "\"Installation--"
-#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
-#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
-#| "cards installed in a machine which is going to be installed as a combined "
-#| "main server or as an LTSP server to become usefull after the installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
 "\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP Server</"
@@ -2164,11 +1950,6 @@ msgstr ""
 "方法です。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Wait. If the selected profiles include LTSP-server then the installer "
-#| "will spend quite some time at the end, \"Finishing the installation - "
-#| "Running debian-edu-profile-udeb...\""
 msgid ""
 "Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
@@ -2280,8 +2061,6 @@ msgstr ""
 "ようになっています。"
 
 #. type: Content of: <article><section><section><section><section><title>
-#, fuzzy
-#| msgid "A note on LTSP-server installations using only Thin-Clients"
 msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "シンクライアントだけを扱う LTSP サーバのインストールに関する注意"
 
@@ -2392,11 +2171,6 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-#| "Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
-#| "profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
 "Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
@@ -2574,12 +2348,6 @@ msgstr ""
 "モードを使えないということでもなければこちらを使わない理由はありません。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-#| "Workstation + LTSP Server installation and how it looks at the first boot "
-#| "of the tjener, a PXE boot on the workstation network and on the "
-#| "thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
@@ -2588,8 +2356,8 @@ msgid ""
 msgstr ""
 "以下は中心サーバ + ワークステーション + LTSP サーバを64ビットのグラフィカル"
 "モードでインストールした場合と、中心サーバの最初のブート、ワークステーション"
-"ネットワーク及びシンクライアントネットワークでの PXE ブートのスクリーンショッ"
-"トです:"
+"ネットワーク及び LTSP クライアントネットワークでの PXE ブートのスクリーン"
+"ショットです:"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "01-Installer_64bit_boot_menu.png"
@@ -2784,20 +2552,16 @@ msgid "tjener KDM Login"
 msgstr "中心サーバの KDM ログイン画面"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgstr "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE and Browser"
 msgstr "KDE でブラウザを起動"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/27-Tjener-MATE_Desktop.png"
 msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr "./images/27-Tjener-MATE_Desktop.png"
+msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE Desktop"
@@ -2816,16 +2580,12 @@ msgid "Diskless Workstation Login"
 msgstr "ディスクレスワークステーションのログイン画面"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "./images/31-ThinClient-MATE_Desktop.png"
+msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "KDE Desktop"
 msgid "KDE Desktop and Menu"
-msgstr "KDE デスクトップ"
+msgstr "KDE デスクトップとメニュー"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2884,12 +2644,6 @@ msgstr ""
 "テーションはこの手順をやらなくてもそのまま使えます"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Adding users and workstations is described in detail below, so please "
-#| "read this chapter completely. It covers how to perform these minumum "
-#| "steps correctly as well, as other stuff that everybody will probably need "
-#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
 "this chapter completely. It covers how to perform these minimum steps "
@@ -2933,10 +2687,8 @@ msgstr ""
 "かれる疑問もいくらか扱っています。"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Debian Edu MATE desktop"
 msgid "Debian Edu KDE desktop"
-msgstr "Debian Edu MATE デスクトップ"
+msgstr "Debian Edu KDE デスクトップ"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2980,16 +2732,6 @@ msgid "DHCP Administration"
 msgstr "DHCP 管理"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For GOsa² access you need the Skolelinux main server and a (client) "
-#| "system with a web browser installed which can be the main server itself "
-#| "if it was installed as a so called combined server (main server + LTSP "
-#| "server + workstation). If all of the mentioned before is not available, "
-#| "see: <link linkend=\"Administration--"
-#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
-#| "\">Installing a graphical environment on the main-server to use GOsa²</"
-#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
@@ -3001,8 +2743,8 @@ msgid ""
 msgstr ""
 "GOsa² へのアクセスには Skolelinux の中心サーバとウェブブラウザがインストール"
 "された (クライアント) システムが必要です。後者については複合サーバ (中心サー"
-"バ + LTSP サーバ + ワークステーション) としてインストールしていれば中心サーバ"
-"自体を使えます。前述のどれも利用できない場合は <link linkend="
+"バ + LTSP サーバ + ワークステーションプロファイル) としてインストールしていれ"
+"ば中心サーバ自体を使えます。前述のどれも利用できない場合は <link linkend="
 "\"Administration--Installing_a_graphical_environment_on_the_main-"
 "server_to_use_GOsa.2BALI-\">中心サーバで GOsa² を利用するためのグラフィカル環"
 "境のインストール</link>を見てください。"
@@ -3069,15 +2811,6 @@ msgstr ""
 "いでしょう。GOsa² で提供している全管理ページにあるためです。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "In Debian Edu, account, group, and system information is stored in an "
-#| "LDAP directory. This data is used not only by the main server, but also "
-#| "by the (diskless) workstations, the LTSP servers and the Windows machines "
-#| "on the network. With LDAP, account information about students, pupils, "
-#| "teachers, etc. only needs to be entered once. After information has been "
-#| "provided in LDAP, the information will be available to all systems on the "
-#| "whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
@@ -3089,9 +2822,9 @@ msgstr ""
 "Debian Edu ではアカウントやグループ、システム情報は LDAP ディレクトリに保存さ"
 "れています。このデータは中心サーバだけでなくネットワーク上の (ディスクレス) "
 "ワークステーションや LTSP サーバ、Windows マシンでも利用されます。LDAP では、"
-"学生や生徒、児童、教員等についてのアカウント情報を入力する必要があるのは一度"
-"だけです。情報を LDAP に提供した後は、その情報は Skolelinux ネットワーク全体"
-"の全システムから利用できるようになります。"
+"生徒や教員等についてのアカウント情報を入力する必要があるのは一度だけです。情"
+"報を LDAP に提供した後は、その情報は Skolelinux ネットワーク全体の全システム"
+"から利用できるようになります。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3574,12 +3307,6 @@ msgstr ""
 "\"Architecture\">構成</link>の章を参照してください。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Diskless workstations and thin-clients work out-of-the-box when connected "
-#| "to the main network. Only workstations with disks <emphasis role=\"strong"
-#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
-#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
@@ -3631,20 +3358,6 @@ msgstr ""
 "アイコンが表示されます。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If the machines have booted as thin clients/diskless workstations or have "
-#| "been installed using any of the networked profiles, the "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
-#| "to automatically add machines to GOsa². For simple machines it will work "
-#| "out of the box, for machines with more than one mac address the actually "
-#| "used one has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</"
-#| "computeroutput> shows usage information. Please note, that the IP "
-#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
-#| "computeroutput> belong to the dynamic IP range. These systems can then be "
-#| "modified though to suit your network: rename each new system, activate "
-#| "DHCP and DNS, add it to netgroups, if needed; reboot the system "
-#| "afterwards. The following screenshots show how this looks in practice:"
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
@@ -3854,12 +3567,6 @@ msgstr ""
 "重要となります。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
-#| "or your users won't be able to access their home directories. Diskless "
-#| "workstations and thin clients don't use NFS, so they don't need to be "
-#| "configured."
 msgid ""
 "Remember to configure workstations and LTSP servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -3908,11 +3615,6 @@ msgstr ""
 "された印刷キューがあれば再有効化します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Debian Edu machines in this group will only be allowed to connect to "
-#| "machines on the local network.  Combined with web proxy restrictions this "
-#| "might be used during exams."
 msgid ""
 "Debian Edu machines in this group will be allowed to connect to machines "
 "only on the local network.  Combined with web proxy restrictions this might "
@@ -4132,13 +3834,6 @@ msgstr ""
 "computeroutput> 実行時にダウンロードを待つ必要がなくなります。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Automatic installation of updates can be done easily if desired, it just "
-#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
-#| "be installed and configured as described on <ulink url=\"https://wiki."
-#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
-#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
@@ -4149,7 +3844,8 @@ msgstr ""
 "望むなら更新を自動でインストールさせることも簡単にできます。必要なのは "
 "<computeroutput>unattended-upgrades</computeroutput> パッケージをインストール"
 "して <ulink url=\"https://wiki.debian.org/UnattendedUpgrades\">wiki.debian."
-"org/UnattendedUpgrades</ulink> で説明されているように設定するだけです。"
+"org/UnattendedUpgrades</ulink> で説明されているように設定するだけです。新規イ"
+"ンストールではセキュリティ更新がデフォルトで有効になっています。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4192,14 +3888,6 @@ msgid "Backup Management"
 msgstr "バックアップ管理"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For backup management point your browser to <ulink url=\"https://www/"
-#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
-#| "since you have to enter the root password there. If you try to access "
-#| "this site without using SSL it will fail. Note: the site will only work "
-#| "if you temporarily allow ssh root login on the backup server (tjener by "
-#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
@@ -4318,17 +4006,6 @@ msgstr ""
 "ステム問題の原因を探しているシステム管理者を支援します。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| 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 are registered for Munin "
-#| "monitoring.  It will normally take one day from a machine being installed "
-#| "until Munin monitoring starts, because of the order the cron jobs are "
-#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
-#| "update-munin</computeroutput> as root on the sitesummary server (normally "
-#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
-#| "conf</computeroutput> file."
 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 "
@@ -4348,13 +4025,6 @@ msgstr ""
 "<computeroutput>/etc/munin/munin.conf</computeroutput> ファイルを更新します。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The set of measurements being collected is automatically generated on "
-#| "each machine using the <computeroutput>munin-node-configure</"
-#| "computeroutput> program, which probes the plugins available from "
-#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
-#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
@@ -4369,16 +4039,12 @@ msgstr ""
 "シンボリックリンクを探すようになっています。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Information about Munin is available from <ulink url=\"http://munin."
-#| "projects.linpro.no/\"/> ."
 msgid ""
 "Information about Munin is available from <ulink url=\"http://munin-"
 "monitoring.org/\"/>."
 msgstr ""
-"Munin についての情報は <ulink url=\"http://munin.projects.linpro.no/\"/> にあ"
-"ります。"
+"Munin についての情報は <ulink url=\"http://muninmonitoring.org/\"/> にありま"
+"す。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Icinga"
@@ -5249,12 +4915,7 @@ msgstr ""
 "単です:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "$ sudo apt-get update\n"
-#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
-#| "  # after installation, start a graphical session for the first user \n"
-#| "  $ startx"
+#, no-wrap
 msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
@@ -5262,7 +4923,7 @@ msgid ""
 "  $ startx"
 msgstr ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # インストール後最初のユーザでグラフィカルなセッションを起動します\n"
 "  $ startx"
 
@@ -5379,11 +5040,6 @@ msgstr ""
 "\">stable-updates スイート</ulink>に収録するようになりました。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "While you can use stable-updates directly, you don't have to: stable-"
-#| "updates are pushed into the stable suite regularily when stable point "
-#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
 "are pushed into the stable suite regularly when stable point releases are "
@@ -5394,8 +5050,6 @@ msgstr ""
 "まれます。これは大体2か月ごとに行われます。"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Using backports.debian.org to install newer software"
 msgid "Using backports to install newer software"
 msgstr "backports を利用した、より新しいソフトウェアのインストール"
 
@@ -5453,13 +5107,6 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Backports are automatically updated (if available) just like other "
-#| "packages. (Previously, extra configuration was needed to achieve this, "
-#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
-#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
-#| "anymore]."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
@@ -5516,11 +5163,6 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "apt-cdrom(8) man ページから引用します:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
-#| "apt-cdrom takes care of determining the structure of the disc as well as "
-#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
 "apt-cdrom is used to add a new CD-ROM to APTs list of available sources. apt-"
 "cdrom takes care of determining the structure of the disc as well as "
@@ -5531,11 +5173,6 @@ msgstr ""
 "な限り補正し、インデックスファイルの確認を行います。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
-#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
-#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
 "done by hand. Furthermore each disk in a multi-CD set must be inserted and "
@@ -5563,12 +5200,6 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "自動での残存プロセスの掃除"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| 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."
 msgid ""
 "<computeroutput>killer</computeroutput> is a perl script that gets rid of "
 "background jobs. Background jobs are defined as processes that belong to "
@@ -5871,10 +5502,8 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-#, fuzzy
-#| msgid "Advanced administration"
 msgid "Advanced administration howto"
-msgstr "高度な管理"
+msgstr "高度な管理 howto"
 
 #. type: Content of: <article><section><para>
 msgid "In this chapter advanced administration tasks are described."
@@ -5889,11 +5518,6 @@ msgid "Create Users in Year Groups"
 msgstr "年次グループ内のユーザ作成"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "In this example we want to create users in year groups, with common home "
-#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
-#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
 "directories for each group (home0/2014, home0/2015, etc). We want to create "
@@ -5904,8 +5528,6 @@ msgstr ""
 "ポートしたいものとします。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "<emphasis>(as root on Tjener) </emphasis>"
 msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(中心サーバの root で) </emphasis>"
 
@@ -5983,10 +5605,6 @@ msgid "Import users"
 msgstr "ユーザのインポート"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Choose your new template when doing csv import; testing it with a few "
-#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
 "is recommended."
@@ -6067,17 +5685,10 @@ msgstr ""
 " echo \"$created_dir folders have been created\""
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Easy access to USB drives and CDROMs/DVDs"
 msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "USBメモリやCD、DVDへの簡単アクセス"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
-#| "workstation, a popup window appears asking what to do with it, just like "
-#| "in any other normal installation."
 msgid ""
 "When users insert a USB drive or a DVD / CD-ROM into a (diskless) "
 "workstation, a popup window appears asking what to do with it, just like in "
@@ -6087,13 +5698,6 @@ msgstr ""
 "他の通常のインストールと同じようにウィンドウが出てきてどうするか質問します。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
-#| "is only a notify-window showing up for a few seconds. The media is "
-#| "automatically mounted and it is possible to access it browsing to the /"
-#| "media/$user folder. This is quite difficult for many non experienced "
-#| "users."
 msgid ""
 "When users insert a USB drive or a DVD / CD-ROM into a thin client there is "
 "only a notify-window showing up for a few seconds. The media is "
@@ -6122,13 +5726,6 @@ msgstr ""
 "デスクトップに置かれ、簡単にアクセスできるようになっています)。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "In addition the following script could be used to create the symlink "
-#| "\"media\" for all users in their home folder for easy access to USB "
-#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
-#| "This might come in handy if users want to edit files directly on their "
-#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
 "\" for all users in their home folder for easy access to USB drives, CD-"
@@ -6207,11 +5804,6 @@ msgstr ""
 "レージサーバを用意します。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Add a new system of type server using GOsa² as outlined in the <link "
-#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
-#| "started</link> chapter of this manual."
 msgid ""
 "Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
 "as outlined in the <link linkend=\"GettingStarted--"
@@ -6220,7 +5812,8 @@ msgid ""
 msgstr ""
 "このマニュアルの<link linkend=\"GettingStarted--"
 "Machine_Management_with_GOsa.2BALI-\">さあ始めよう</link>の章で説明しているよ"
-"うに GOsa² を使って新しい種類のサーバを追加します。"
+"うに GOsa² を使って新しい種類の<computeroutput>サーバ</computeroutput>を追加"
+"します。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -6334,11 +5927,6 @@ msgstr ""
 "tjener.intern:/etc/fstab に関連する項目を追加します:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Create the mount directories using <computeroutput>mkdir</"
-#| "computeroutput>, edit '/etc/fstab' as adequate and run "
-#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
 "Create the mount point directories using <computeroutput>mkdir</"
 "computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
@@ -6389,18 +5977,13 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "GOsa で管理する方法はかなり簡単です:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
-#| "level (where already other system management related groups like "
-#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
 "Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
-"最上位レベル (既に <computeroutput>gosa-admins</computeroutput> 等、他のシス"
-"テム管理関連のグループがあるはずです) にグループ <computeroutput>sshusers</"
+"基底レベル (既に <computeroutput>gosa-admins</computeroutput> 等、他のシステ"
+"ム管理関連のグループがあるはずです) にグループ <computeroutput>sshusers</"
 "computeroutput> を作成します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6462,12 +6045,6 @@ msgstr ""
 "#"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-#| "dropped to disable internal ssh login access. Note: someone pluging in "
-#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
-#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
 "dropped to disable internal ssh login access. Note: someone connecting his "
@@ -6513,13 +6090,10 @@ msgid ""
 "apt update\n"
 " apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 msgstr ""
+"apt update\n"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Users will then be able to choose any of the five desktop environment via "
-#| "the login manager before logging in. Of course, you can also choose to "
-#| "give less choices."
 msgid ""
 "Users will then be able to choose any of the five desktop environment via "
 "the login manager before logging in. Of course, you can also choose to give "
@@ -6529,13 +6103,11 @@ msgid ""
 msgstr ""
 "そうするとユーザはログイン前にログインマネージャー経由で 5つのデスクトップ環"
 "境から任意に選択できるようになります。もちろんこの選択の幅を狭めることもでき"
-"ます。"
+"ます。デスクトップ環境を複数インストールすると同じ目的のプログラムがいくつも"
+"ある (ファイルマネージャ、エディタ、PDF ビューア等)、という状態になるであろう"
+"ことに留意してください。ユーザを混乱させることになるかもしれません。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The usage of LXDE as default on thin clients can be forced; see <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for details."
 msgid ""
 "The use of LXDE as default on thin clients can be forced; see <link linkend="
 "\"NetworkClients\">networked clients</link> for details."
@@ -6545,20 +6117,14 @@ msgstr ""
 "い。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you don't want to do installations with the default desktop MATE, you "
-#| "can also <link linkend=\"Installation--The_installation_process\">install "
-#| "with one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</"
-#| "link> directly."
 msgid ""
 "If you don't want to do installations with the default desktop KDE Plasma, "
 "you can also <link linkend=\"Installation--Installation_types_and_options"
 "\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
 "MATE</link> directly."
 msgstr ""
-"デフォルトのデスクトップ MATE に何もインストールしたくない場合、4つの代替デス"
-"クトップ GNOME、LXDE、Xfce、KDE を直接<link linkend=\"Installation--"
+"デフォルトのデスクトップ KDE Plasma に何もインストールしたくない場合、4つの代"
+"替デスクトップ GNOME、LXDE、Xfce、MATE を直接<link linkend=\"Installation--"
 "The_installation_process\">インストール</link>することもできます。"
 
 #. type: Content of: <article><section><section><title>
@@ -6633,13 +6199,6 @@ msgid "Playing DVDs"
 msgstr "DVDの再生"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| 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 deb-multimedia.org. Add the multimedia "
-#| "repository (as described in the following section) and install the "
-#| "required 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 "
@@ -6649,33 +6208,28 @@ msgid ""
 "computeroutput>."
 msgstr ""
 "ほとんどの商用DVDの再生に libdvdcss が必要です。法的な理由からこれは Debian "
-"(Edu) には収録されていません。これの利用を法的に許されている場合は deb-"
-"multimedia.org から提供されるパッケージを利用できます。マルチメディアリポジト"
-"リを追加 (以下の節で説明されています) して必要なライブラリをインストールしま"
-"す:"
+"(Edu) には収録されていません。これの利用を法的に許されている場合は "
+"<computeroutput>libdvd-pkg</computeroutput> Debian パッケージを利用できます。"
+"<computeroutput>/etc/apt/sources.list</computeroutput> で "
+"<computeroutput>contrib</computeroutput> が有効になっていることを確認してくだ"
+"さい。す:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "apt update\n"
-#| " apt install gnome lxde xfce4 kde-standard"
+#, no-wrap
 msgid ""
 "apt update\n"
 "apt install libdvd-pkg"
 msgstr ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
+"apt install libdvd-pkg"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
 "Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
 "libdvd-pkg</computeroutput>."
 msgstr ""
-"新しいグループ <computeroutput>sshusers</computeroutput> にユーザを追加しま"
-"す。"
+"debconf の質問に答え、<computeroutput>dpkg-reconfigure libdvd-pkg</"
+"computeroutput> を実行します。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -12325,80 +11879,3 @@ msgid ""
 msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
-
-#~ msgid "apt-get install libdvdcss2 w32codecs"
-#~ msgstr "apt-get install libdvdcss2 w32codecs"
-
-#~ msgid "Using the multimedia repository"
-#~ msgstr "マルチメディアリポジトリの利用"
-
-#~ msgid "To use www.deb-multimedia.org do the following:"
-#~ msgstr "deb-multimedia.org を利用するには以下を実行します:"
-
-#~ msgid ""
-#~ "# install the debian-keyring securely:\n"
-#~ "apt-get install debian-keyring\n"
-#~ "# fetch the deb-multimedia key insecurely:\n"
-#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-#~ "# update the list of available packages:\n"
-#~ "apt-get update"
-#~ msgstr ""
-#~ "# debian-keyring を安全にインストールします:\n"
-#~ "apt-get install debian-keyring\n"
-#~ "# deb-multimedia の鍵を不安全に取得します:\n"
-#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# 鍵が正しいものか安全に確認してAPTが利用する鍵リングに追加します:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# sources.list にリポジトリを追加します - ミラーについてはウェブサイトで確認してください!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-#~ "# 利用可能パッケージの一覧を更新します:\n"
-#~ "apt-get update"
-
-#~ 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 automation "
-#~ "distribute the changes."
-#~ msgstr ""
-#~ "設定ファイルの編集には cfengine を利用します。サーバで更新されたファイルが"
-#~ "クライアントに送られます。クライアントの設定変更はサーバの設定を変更して自"
-#~ "動配布させるだけです。"
-
-#~ msgid ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
-#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-#~ msgstr ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
-#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-
-#~ msgid ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
-#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-#~ msgstr ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
-#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-
-#~ msgid ""
-#~ "The ordering of the network cards after installation might differ from "
-#~ "the ordering during installation. The wanted ordering can be achieved by "
-#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
-#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
-#~ "the changes to take effect."
-#~ msgstr ""
-#~ "インストール後のネットワークカードの順がインストール中とは異なるかもしれま"
-#~ "せん。<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-#~ "computeroutput> を編集することで希望の順にできます。通常<emphasis>これが起"
-#~ "きた</emphasis>場合は eth0 を eth1 に、eth1 を eth0 に入れ替えるのもいいか"
-#~ "もしれません。変更を反映させるにはシステムの再起動が必要です。"
-
-#~ msgid ""
-#~ "This is being tracked as <ulink url=\"http://bugs.skolelinux."
-#~ "org/1376\">Debian Edu bug #1376</ulink>."
-#~ msgstr ""
-#~ "これは <ulink url=\"http://bugs.skolelinux.org/1376\">Debian Edu バグ"
-#~ "#1376</ulink> で追跡されています。"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git



More information about the debian-edu-commits mailing list