Update Japanese translation (Japanese Translation Specific)

4 files changed, 38 insertions, 53 deletions

diff --git a/build/lang-options/ja b/build/lang-options/ja
index 8b4db9b71..c337a04f8 100644
--- a/build/lang-options/ja
+++ b/build/lang-options/ja
@@ -1 +1 @@
-optional_paras="translation-status"
+optional_paras="translation-status;about-langteam"
diff --git a/ja/administrivia/administrivia.xml b/ja/administrivia/administrivia.xml
index 81e12c787..fbfeaab3f 100644
--- a/ja/administrivia/administrivia.xml
+++ b/ja/administrivia/administrivia.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 29689 -->
+<!-- original version: 38901 -->
 
 <appendix id="administrivia">
  <title>付記</title>
@@ -53,27 +53,27 @@ isolate certain bits of text as architecture-specific.
 各アーキテクチャ固有の文章のまとまりを分離するのに、
 プロファイル属性が使われています。
 
-<!--
-</para><para>
+</para><para condition="about-langteam">
 
-Translators can uncomment this paragraph and add an acknowledgement
-to the people responsible for the translation of the manual.
+<!--
+Translators can use this paragraph to acknowledge the people responsible
+for the translation of the manual.
 Translation teams are advised to just mention the coordinator and maybe
 major contributors and thank everybody else in a phrase like "all
-translators and reviewers from the translation team for <your language>
-at <your l10n mailinglist>".
-翻訳時にこの段落をアンコメントして、
-マニュアルの翻訳に責任ある人への謝辞を追加できます。
-翻訳チームにアドバイスすると、コーディネータと大きな貢献があった人に言及し、
-あと一言、「<your l10n mailinglist> で <your language> のために作業した、
-翻訳チームの全ての翻訳者・査読者に」といった、
-その他全員への謝辞を述べるのがいいでしょう
-
-(Note: support for this for translations using PO files will be added
- soon.)
-(注: もうじき追加するPO ファイルを使用する翻訳用にこれをサポートします)
-訳注: ここどうしましょうかね。(鍋太郎)
+translators and reviewers from the translation team for {your language}
+at {your l10n mailinglist}".
+
+See build/lang-options/README on how to enable this paragraph.
+Its condition is "about-langteam".
 -->
+日本語訳は、
+鴨志田 睦 (1997 年)、
+岡 充 (1998-1999 年)、
+遠藤 美純 (1998-2000 年)、
+門脇 正史、鍋谷 栄展、八田 真行、Guangcheng Wen (1999 年)、
+今井 伸広、上川 純一、喜瀬 浩、久保田 智広、齋藤 努、中野 武雄 (2002 年)、
+杉山 友章、武井 伸光、倉澤 望 (2002-2006 年)
+が行いました。
 
 </para>
  </sect1>
@@ -169,17 +169,6 @@ online.
 
 </para>
 
-<!-- 日本語翻訳について 独自に追加-->
-<para>
-なお本文書の日本語訳については、
-<email>debian-doc@debian.or.jp</email> で議論を行っています。
-また、<ulink url="http://www.debian.or.jp/MailingList.html#docML">Debian JP 
-Project: メーリングリスト</ulink> に購読に関する簡単な説明があり、
-<ulink url="http://lists.debian.or.jp/debian-doc/">debian-doc 
-Mailing List Archive</ulink> では過去のメールを読むことができます。
-</para>
-<!-- ここまで -->
-
  </sect1>
 
  <sect1 id="contributors">
diff --git a/ja/appendix/gpl.xml b/ja/appendix/gpl.xml
index 23b57f78e..d4208f736 100644
--- a/ja/appendix/gpl.xml
+++ b/ja/appendix/gpl.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36893 -->
+<!-- original version: 38907 -->
 
 <appendix id="appendix-gpl"><title>GNU General Public License</title>
 
@@ -15,9 +15,9 @@ name of your language.]]
 This is an unofficial translation of the GNU General Public License into
 {language}. It was not published by the Free Software Foundation, and does
 not legally state the distribution terms for software that uses the GNU
-GPL--only the original English text of the GNU GPL does that. However, we
-hope that this translation will help {language} speakers understand the
-GNU GPL better.
+GPL &mdash; only the original <ulink url="&url-gnu-copyleft;">English
+text</ulink> of the GNU GPL does that. However, we hope that this translation
+will help {language} speakers to better understand the GNU GPL.
 
 </para><para>
 
@@ -29,9 +29,9 @@ name of your language before translating.]]
 This is an unofficial translation of the GNU General Public License into
 {language}. It was not published by the Free Software Foundation, and does
 not legally state the distribution terms for software that uses the GNU
-GPL--only the original English text of the GNU GPL does that. However, we
-hope that this translation will help {language} speakers understand the
-GNU GPL better.
+GPL &mdash; only the original English text of the GNU GPL does that. However,
+we hope that this translation will help {language} speakers to better
+understand the GNU GPL.
 
 </para></note>
 <para>
diff --git a/ja/bookinfo.xml b/ja/bookinfo.xml
index 75d60a43c..e3ae8e9ea 100644
--- a/ja/bookinfo.xml
+++ b/ja/bookinfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36879 -->
+<!-- original version: 38900 -->
 
 <bookinfo id="debian_installation_guide">
 <title>&debian; ���󥹥ȡ��륬����</title>
@@ -69,26 +69,22 @@ You may also be able to find additional translations there.
 <para condition="translation-status">
 <!--
 Translators can use this paragraph to provide some information about
-the status of the translation, the people behind it, how to contact
-the team, etc.
+the status of the translation, for example if the translation is still
+being worked on or if review is wanted (don't forget to mention where
+comments should be sent!).
 
 See build/lang-options/README on how to enable this paragraph.
-Its condition is "bookinfo_langteam".
+Its condition is "translation-status".
 -->
-���ܸ����ϡ�
-������ �� (1997 ǯ)��
-�� �� (1998-1999 ǯ)��
-��ƣ ���� (1998-2000 ǯ)��
-���� ���ˡ���ë ��Ÿ��Ȭ�� ���ԡ�Guangcheng Wen (1999 ǯ)��
-���� ���������� ��졢���� ���������� �ҹ����ƣ �ء����� ��ͺ (2002 ǯ)��
-���� ͧ�ϡ���� ��������߷ ˾ (2002-2006 ǯ)
-�����������ޤ���
-</para>
+���ܸ����ˤĤ��Ƥϡ�
+<email>debian-doc@debian.or.jp</email> (�� subscribe) �ǵ�����ԤäƤ��ޤ���
+�ޤ���<ulink url="http://www.debian.or.jp/MailingList.html#docML">Debian JP 
+Project: �᡼��󥰥ꥹ��</ulink> �˹��ɤ˴ؤ����ñ�����������ꡢ
+<ulink url="http://lists.debian.or.jp/debian-doc/">debian-doc 
+Mailing List Archive</ulink> �Ǥϲ��Υ᡼����ɤळ�Ȥ��Ǥ��ޤ���
 
-<para condition="translation-status">
-���ܸ����ˤĤ��ƤΤ��䤤��碌�ϡ�
-debian-doc@debian.or.jp �ؤ��ꤤ�������ޤ���(�� subscribe)
 </para>
+
 </abstract>
 
 <copyright>