From b1a4667672466c4b6a65e23489b4514fe8ae22ee Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 26 Nov 2011 06:08:23 +0000
Subject: [PATCH] Merge the following from the English version:

	1.116 -> 1.117	doc/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
---
 .../books/handbook/desktop/chapter.sgml       | 104 +++++++++++++++++-
 1 file changed, 102 insertions(+), 2 deletions(-)

diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.sgml b/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
index 934fb7fc11..c3a51121f0 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.116
+     Original revision: 1.117
      $FreeBSD$
 -->
 
@@ -56,7 +56,8 @@
       <listitem>
 	<para>Web �֥饦�� (<application>Firefox</application>,
 	  <application>Opera</application>,
-	  <application>Konqueror</application> �ʤ�)</para>
+	  <application>Konqueror</application>,
+	  <application>Chromium</application> �ʤ�)</para>
       </listitem>
 
       <listitem>
@@ -174,6 +175,13 @@
 	    <entry>��</entry>
 	    <entry><application>KDE</application> �饤�֥��</entry>
 	  </row>
+
+          <row>
+	    <entry><application>Chromium</application></entry>
+	    <entry>��</entry>
+	    <entry>��</entry>
+	    <entry><application>Gtk+</application></entry>
+          </row>
 	</tbody>
       </tgroup>
     </informaltable>
@@ -445,6 +453,92 @@
 	�ˤ���ޤ���</para>
     </sect2>
 
+    <sect2>
+      <title>Chromium</title>
+      <indexterm>
+	<primary><application>Chromium</application></primary>
+      </indexterm>
+
+      <para><application>Chromium</application> �ϡ�
+	�����ץ󥽡����Υ֥饦���Υץ��������Ȥǡ�
+	�������Ĺ�®�����ꤷ�������֥֥饦���󥰤��δ����ܻؤ��Ƥ��ޤ���
+	<application>Chromium</application> �ϡ����֥֥饦���󥰡�
+	�ݥåץ��åץ֥��å�����ĥ��ǽ�ʤɤε�ǽ����äƤ��ޤ���
+	<application>Chromium</application> �ϡ�Google Chrome
+	�����֥֥饦�����١����Ȥ��Ƥ��륪���ץ󥽡����Υץ��������ȤǤ���</para>
+
+      <para><application>Chromium</application> �ϡ�
+	�ʲ��Τ褦�����Ϥ��뤳�Ȥ� package ���饤�󥹥ȡ���Ǥ��ޤ���</para>
+
+      <screen>&prompt.root; <userinput>pkg_add -r chromium</userinput></screen>
+
+      <para>�ޤ��ϡ�Ports Collection ���Ѥ���
+	<application>Chromium</application>
+	�򥽡������饳��ѥ��뤷�ƥ��󥹥ȡ���Ǥ��ޤ���</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/www/chromium</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <note>
+	<para><application>Chromium</application> �ϡ�
+	  <filename>/usr/local/bin/chrome</filename> �Ȥ��ƥ��󥹥ȡ��뤵��ޤ���
+	  <filename>/usr/local/bin/chromium</filename> �ǤϤ���ޤ���</para>
+      </note>
+    </sect2>
+
+    <sect2 id="chromium-java-plugin">
+      <title>Chromium �� &java; �ץ饰����</title>
+
+      <note>
+	<para>������Ǥϡ�<application>Chromium</application>
+	  �����󥹥ȡ��뤵��Ƥ��뤳�Ȥ�����Ȥ��Ƥ��ޤ���</para>
+      </note>
+
+      <para>�ʲ��Τ褦�����Ϥ��ơ�Ports Collection ����
+	<application>OpenJDK&nbsp;6</application>
+	�򥤥󥹥ȡ��뤷�Ƥ���������</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6
+&prompt.root; make install clean</userinput></screen>
+
+      <para>���θ塢Ports Collection ���� <filename
+	role="package">java/icedtea-web</filename> �򥤥󥹥ȡ��뤷�Ƥ���������</para> 
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web
+&prompt.root; make install clean</userinput></screen>
+
+      <para><application>Chromium</application> ��ư����
+	���ɥ쥹�С��ˡ�
+	<literal>about:plugins</literal> �����Ϥ��Ƥ���������
+	���󥹥ȡ��뤵��Ƥ���ץ饰����ΰ�����
+	IcedTea-Web ���ɲä���Ƥ���Ϥ��Ǥ���</para>
+
+      <para><application>Chromium</application>
+	�� IcedTea-Web �ץ饰�����ɲä���Ƥ��ʤ����ˤϡ�
+	�ʲ��Υ��ޥ�ɤ�¹Ԥ����֥饦����Ƶ�ư���Ƥ���������</para>
+
+      <screen>&prompt.root; <userinput>mkdir -p /usr/local/share/chromium/plugins
+&prompt.root; ln -s /usr/local/lib/IcedTeaPlugin.so \
+  /usr/local/share/chromium/plugins/</userinput></screen>
+    </sect2>
+
+    <sect2 id="chromium-flash-plugin">
+      <title>Chromium �� &adobe;&nbsp;&flash; �ץ饰����</title>
+
+      <note>
+	<para>������Ǥϡ�<application>Chromium</application>
+	  �����󥹥ȡ��뤵��Ƥ��뤳�Ȥ�����Ȥ��Ƥ��ޤ���</para>
+      </note>
+
+      <para><application>Chromium</application> �� &adobe;&nbsp;&flash;
+	������ϡ�<link
+	linkend="moz-flash-plugin">Firefox �μ��</link> ��Ʊ���Ǥ���
+	&os; �� &adobe;&nbsp;&flash; �򥤥󥹥ȡ��뤹����ˡ�ξܺ٤ˤĤ��Ƥϡ�
+	�嵭�ξϤ򻲹ͤˤ��Ƥ���������
+	<application>Chromium</application>
+	�ϡ�¾�Υ֥饦���Υץ饰������Ѥ��뤳�Ȥ��Ǥ���Τǡ�
+	�ɲä������ɬ�פ���ޤ���</para>
+    </sect2>
   </sect1>
 
   <sect1 id="desktop-productivity">
@@ -1203,6 +1297,12 @@
 	    <entry><filename role="package">www/firefox</filename></entry>
 	  </row>
 
+	  <row>
+	    <entry><application>Chromium</application></entry>
+	    <entry><literal>chromium</literal></entry>
+	    <entry><filename role="package">www/chromium</filename></entry>
+	  </row>
+
 	  <row>
 	    <entry><application>KOffice</application></entry>
 	    <entry><literal>koffice</literal></entry>