diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
index 39c35ace48..d88ffb24d0 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r39828
+ Original revision: r40469
$FreeBSD$
-->
@@ -177,18 +177,19 @@
<entry><application>KDE</application> �饤�֥��</entry>
</row>
- <row>
+ <row>
<entry><application>Chromium</application></entry>
<entry>��</entry>
<entry>��</entry>
<entry><application>Gtk+</application></entry>
- </row>
+ </row>
</tbody>
</tgroup>
</informaltable>
<sect2>
<title>Firefox</title>
+
<indexterm>
<primary><application>Firefox</application></primary>
</indexterm>
@@ -238,8 +239,9 @@
<screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para>���θ塢<filename
- role="package">java/icedtea-web</filename> port �ȡ��뤷�Ƥ���������</para>
+ <para>���θ塢
+ <filename role="package">java/icedtea-web</filename>
+ port �ȡ��뤷�Ƥ���������</para>
<screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
@@ -263,6 +265,7 @@
<sect2 id="moz-flash-plugin">
<title>Firefox �� &adobe; &flash; �ץ饰����</title>
+
<indexterm>
<primary>Flash</primary>
</indexterm>
@@ -278,12 +281,14 @@
<step>
<title>&os; 7.X</title>
- <para><filename role="package">www/nspluginwrapper</filename> port
- �ȡ��뤷�ޤ���
+ <para>
+ <filename role="package">www/nspluginwrapper</filename>
+ port �ȡ��뤷�ޤ���
���� port �ϡ�<filename role="package">emulators/linux_base-fc4</filename>
�Ȥ����礭�� port ��ɬ�פȤ��ޤ���</para>
- <para>���ˡ�<filename role="package">www/linux-flashplugin9</filename>
+ <para>���ˡ�
+ <filename role="package">www/linux-flashplugin9</filename>
port �ȡ��뤷�ޤ���
���� port �ϡ�&os; 7.X �ˤ����������ư���
&flash; 9.X �ȡ��뤷�ޤ���</para>
@@ -292,29 +297,31 @@
<step>
<title>&os; 8.X �ʹ�</title>
- <para><filename role="package">www/nspluginwrapper</filename> port
- �ȡ��뤷�ޤ���
- ���� port �ϡ�<filename role="package">emulators/linux_base-f10</filename>
+ <para>
+ <filename role="package">www/nspluginwrapper</filename>
+ port �ȡ��뤷�ޤ���
+ ���� port �ϡ�<filename
+ role="package">emulators/linux_base-f10</filename>
�Ȥ����礭�� port ��ɬ�פȤ��ޤ���</para>
- <para>���ˡ�<filename role="package">www/linux-f10-flashplugin11</filename>
+ <para>���ˡ�<filename
+ role="package">www/linux-f10-flashplugin11</filename>
port ���� &flash; 11.X �ȡ��뤷�ޤ���</para>
<para>���ΥС������Ǥϡ�
�ʲ��Τ褦�˥���ܥ�å�����������ɬ�פ�����ޤ���</para>
- <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \
+ <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \
/usr/local/lib/browser_plugins/</userinput></screen>
<para><filename
- class="directory">/usr/local/lib/browser_plugins</filename>
+ class="directory">/usr/local/lib/browser_plugins</filename>
�ǥ��쥯�ȥ꤬¸�ߤ��ʤ����ˤϡ�
��ư�Ǻ�������ɬ�פ�����ޤ���</para>
- </step>
- </procedure>
+ </step>
+ </procedure>
- <para>
- ���Ѥ��Ƥ��� &os; �ΥС��������Ф���Ŭ�ڤ�
+ <para>���Ѥ��Ƥ��� &os; �ΥС��������Ф���Ŭ�ڤ�
&flash; port �ȡ��뤷����ϡ�
�ƥ桼�����Ȥ� <command>nspluginwrapper</command>
��Ȥäƥץ饰����ȡ��뤷�Ƥ���������</para>
@@ -328,6 +335,7 @@
</sect2>
<sect2 id="moz-swfdec-flash-plugin">
+
<title>Firefox �� Swfdec &flash; �ץ饰����</title>
<para>Swfdec �� &flash;
@@ -352,6 +360,7 @@
<sect2>
<title>Opera</title>
+
<indexterm>
<primary><application>Opera</application></primary>
</indexterm>
@@ -385,10 +394,10 @@
<para>&os; �Ѥ� &adobe; &flash; �ץ饰���������Ƥ��ޤ���
Linux �ǤΥץ饰����¸�ߤ��ޤ���
���Υץ饰����ȡ��뤹��ˤϡ��ޤ� <filename
- role="package">www/linux-f10-flashplugin11</filename> port
+ role="package">www/linux-f10-flashplugin11</filename> port
�ȡ��뤷�Ƥ���������
���θ塢<filename
- role="package">www/opera-linuxplugins</filename> port
+ role="package">www/opera-linuxplugins</filename> port
�ȡ��뤷�Ƥ���������</para>
<screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput>
@@ -408,6 +417,7 @@
<sect2>
<title>Konqueror</title>
+
<indexterm>
<primary><application>Konqueror</application></primary>
</indexterm>
@@ -447,6 +457,7 @@
<sect2>
<title>Chromium</title>
+
<indexterm>
<primary><application>Chromium</application></primary>
</indexterm>
@@ -571,7 +582,8 @@
<entry><application>AbiWord</application></entry>
<entry>��</entry>
<entry>��</entry>
- <entry><application>Gtk+</application> �ޤ��� <application>GNOME</application></entry>
+ <entry><application>Gtk+</application> �ޤ���
+ <application>GNOME</application></entry>
</row>
<row>
@@ -582,17 +594,22 @@
</row>
<row>
- <entry><application>Apache OpenOffice</application></entry>
+ <entry><application>Apache
+ OpenOffice</application></entry>
<entry>¿</entry>
<entry>����</entry>
- <entry><application>&jdk;</application>, <application>Mozilla</application></entry>
+ <entry><application>&jdk;</application>,
+ <application>Mozilla</application></entry>
</row>
+
<row>
<entry><application>LibreOffice</application></entry>
<entry>���¿</entry>
<entry>����</entry>
- <entry><application>Gtk+</application> �ޤ��� <application>KDE</application>/
- <application>GNOME</application> �ޤ��� <application>&jdk;</application></entry>
+ <entry><application>Gtk+</application> �ޤ���
+ <application>KDE</application>/
+ <application>GNOME</application> �ޤ���
+ <application>&jdk;</application></entry>
</row>
</tbody>
</tgroup>
@@ -600,6 +617,7 @@
<sect2>
<title>KOffice</title>
+
<indexterm>
<primary><application>KOffice</application></primary>
</indexterm>
@@ -640,6 +658,7 @@
<sect2>
<title>AbiWord</title>
+
<indexterm>
<primary><application>AbiWord</application></primary>
</indexterm>
@@ -669,6 +688,7 @@
<sect2>
<title>GIMP</title>
+
<indexterm>
<primary><application>GIMP</application></primary>
</indexterm>
@@ -690,8 +710,8 @@
<para>���Ѥ��Ƥ��� FTP �����Ȥˤ��� package ���ʤ����Ǥ⡢
Ports Collection ���饤�ȡ���Ǥ��ޤ���
- Ports Collection ��
- <ulink url="http://www.FreeBSD.org/ja/ports/graphics.html">graphics</ulink>
+ Ports Collection �� <ulink
+ url="http://www.FreeBSD.org/ja/ports/graphics.html">graphics</ulink>
�ǥ��쥯�ȥ�ˤ� <application>Gimp �ޥ˥奢��</application>�⤢��ޤ���
���ȡ��뤹����ˡ�ϼ��ΤȤ���Ǥ���</para>
@@ -701,8 +721,8 @@
&prompt.root; <userinput>make install clean</userinput></screen>
<note>
- <para>Ports Collection ��
- <ulink url="http://www.FreeBSD.org/ja/ports/graphics.html">graphics</ulink>
+ <para>Ports Collection �� <ulink
+ url="http://www.FreeBSD.org/ja/ports/graphics.html">graphics</ulink>
�ǥ��쥯�ȥ�ˤ� <application>GIMP</application>
�γ�ȯ�ǤǤ���
<filename role="package">graphics/gimp-devel</filename>
@@ -715,12 +735,17 @@
<sect2>
<title>Apache OpenOffice</title>
+
<indexterm>
- <primary><application>Apache OpenOffice</application></primary>
+ <primary>
+ <application>Apache OpenOffice</application>
+ </primary>
</indexterm>
<indexterm>
<primary>���ե�����������</primary>
- <secondary><application>Apache OpenOffice</application></secondary>
+ <secondary>
+ <application>Apache OpenOffice</application>
+ </secondary>
</indexterm>
<para>2011 ǯ 7 �� 1 ����Oracle Corporation ��
@@ -750,17 +775,18 @@
&windows;, &solaris;, Linux, FreeBSD, &macos; X
�ˤ����ư��ꤷ�ƥͥ��ƥ��֤�ư��Ƥ��ޤ���
<application>Apache OpenOffice</application>
- �ˤĤ��Ƥξܤ�������ϡ�
- <ulink url="http://incubator.apache.org/openofficeorg/">Apache OpenOffice web ������</ulink>
- ���������������ޤ���
- <ulink url="http://porting.openoffice.org/freebsd/">FreeBSD Apache OpenOffice �ץ��������ȥ�����</ulink>
+ �ˤĤ��Ƥξܤ�������ϡ�<ulink
+ url="http://incubator.apache.org/openofficeorg/">Apache
+ OpenOffice web ������</ulink> ���������������ޤ���<ulink
+ url="http://porting.openoffice.org/freebsd/">FreeBSD Apache
+ OpenOffice �ץ��������ȥ�����</ulink>
�� Web �����Ȥ��顢FreeBSD ��ͭ�ξ����
packages ��ľ�ܼ������뤳�Ȥ�Ǥ��ޤ���</para>
- <para><application>Apache OpenOffice.org</application>
+ <para><application>Apache OpenOffice</application>
�ȡ��뤹��ˤϡ��ʲ��Τ褦�����Ϥ��Ƥ���������</para>
- <screen>&prompt.root; <userinput>pkg_add -r apache-opeonoffice</userinput></screen>
+ <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen>
<note>
<para>&os; �Υ����Ǥ���Ѥ��Ƥ�����ˤϡ��������Ϥ��ޤ������Ǥ��礦��
@@ -792,7 +818,7 @@
�����ˤ��ʤ�Ĺ�����֤�ɬ�פȤ��뤳�Ȥ�α��Ƥ���ɬ�פ�����ޤ���</para>
<screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-3</userinput>
- &prompt.root; <userinput>make install clean</userinput></screen>
+&prompt.root; <userinput>make install clean</userinput></screen>
<note>
<para>�ϰ貽���줿�С�������ӥ�ɤ������Τʤ顢
@@ -817,6 +843,7 @@
<sect2>
<title>LibreOffice</title>
+
<indexterm>
<primary><application>LibreOffice</application></primary>
</indexterm>
@@ -825,8 +852,8 @@
<secondary><application>LibreOffice</application></secondary>
</indexterm>
- <para><application>LibreOffice</application> �ϡ�
- <ulink url="http://www.documentfoundation.org/">The Document
+ <para><application>LibreOffice</application> �ϡ�<ulink
+ url="http://www.documentfoundation.org/">The Document
Foundation</ulink>
����ȯ���Ƥ���ե���եȥ������Υ��ե����������ȤǤ���
¾�Υ�㡼�ʥ��ե����������Ȥȸߴ��������ꡢ
@@ -906,8 +933,7 @@
<para>&unix; �νи��ʹߡ������Ĥ��ο�����ʸ��������褯�Ȥ���褦�ˤʤ�ޤ�����
���ܥ����ƥ�ˤϡ�������ʸ���᤹��ӥ塼�����ʤ����⤷��ޤ���
- ������ǤϤ����Υɥ�����ȥӥ塼���Υ��ȡ�����ˡ�ˤĤ����������ޤ���
- </para>
+ ������ǤϤ����Υɥ�����ȥӥ塼���Υ��ȡ�����ˡ�ˤĤ����������ޤ���</para>
<para>������Ǥϼ��Υ��ץꥱ�������ˤĤ����������ޤ���</para>
@@ -948,7 +974,8 @@
<entry><application>GQview</application></entry>
<entry>��</entry>
<entry>��</entry>
- <entry><application>Gtk+</application> �ޤ��� <application>GNOME</application></entry>
+ <entry><application>Gtk+</application> �ޤ���
+ <application>GNOME</application></entry>
</row>
</tbody>
</tgroup>
@@ -956,6 +983,7 @@
<sect2>
<title>&acrobat.reader;</title>
+
<indexterm>
<primary><application>Acrobat Reader</application></primary>
</indexterm>
@@ -979,11 +1007,11 @@
&prompt.root; <userinput>make install clean</userinput></screen>
<para>�饤�������¤Τ��ᡢ�ѥå����������Ѥ��뤳�ȤϤǤ��ޤ���</para>
-
</sect2>
<sect2>
<title>gv</title>
+
<indexterm>
<primary><application>gv</application></primary>
</indexterm>
@@ -1053,6 +1081,7 @@
<sect2>
<title>GQview</title>
+
<indexterm>
<primary><application>GQview</application></primary>
</indexterm>
@@ -1088,7 +1117,7 @@
�� <application>Excel</application>
�ʤɤι����Ԥ��Ϥä������Υե�����ȸߴ����������Τ⤢��ޤ���</para>
- <para>������Ǥϼ��Υ��ץꥱ�������ˤĤ����������ޤ���</para>
+ <para>������Ǥϼ��Υ��ץꥱ�������ˤĤ����������ޤ���</para>
<informaltable frame="none" pgwide="1">
<tgroup cols="4">
@@ -1135,6 +1164,7 @@
<sect2>
<title>GnuCash</title>
+
<indexterm>
<primary><application>GnuCash</application></primary>
</indexterm>
@@ -1169,6 +1199,7 @@
<sect2>
<title>Gnumeric</title>
+
<indexterm>
<primary><application>Gnumeric</application></primary>
</indexterm>
@@ -1207,6 +1238,7 @@
<sect2>
<title>Abacus</title>
+
<indexterm>
<primary><application>Abacus</application></primary>
</indexterm>
@@ -1296,99 +1328,114 @@
<row>
<entry><application>Opera</application></entry>
<entry><literal>opera</literal></entry>
- <entry><filename role="package">www/opera</filename></entry>
+ <entry><filename
+ role="package">www/opera</filename></entry>
</row>
<row>
<entry><application>Firefox</application></entry>
<entry><literal>firefox</literal></entry>
- <entry><filename role="package">www/firefox</filename></entry>
+ <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>
+ <entry><filename
+ role="package">www/chromium</filename></entry>
</row>
<row>
<entry><application>KOffice</application></entry>
<entry><literal>koffice-kde4</literal></entry>
- <entry><filename role="package">editors/koffice-kde4</filename></entry>
+ <entry><filename
+ role="package">editors/koffice-kde4</filename></entry>
</row>
<row>
<entry><application>AbiWord</application></entry>
<entry><literal>abiword</literal></entry>
- <entry><filename role="package">editors/abiword</filename></entry>
+ <entry><filename
+ role="package">editors/abiword</filename></entry>
</row>
<row>
<entry><application>GIMP</application></entry>
<entry><literal>gimp</literal></entry>
- <entry><filename role="package">graphics/gimp</filename></entry>
+ <entry><filename
+ role="package">graphics/gimp</filename></entry>
</row>
<row>
<entry><application>OpenOffice.org</application></entry>
<entry><literal>openoffice</literal></entry>
- <entry><filename role="package">editors/openoffice.org-3</filename></entry>
+ <entry><filename
+ role="package">editors/openoffice-3</filename></entry>
</row>
<row>
- <entry><application>LibreOffice</application></entry>
+ <entry><application>LibreOffice</application></entry>
<entry><literal>libreoffice</literal></entry>
- <entry><filename role="package">editors/libreoffice</filename></entry>
+ <entry><filename
+ role="package">editors/libreoffice</filename></entry>
</row>
<row>
<entry><application>&acrobat.reader;</application></entry>
<entry><literal>acroread</literal></entry>
- <entry><filename role="package">print/acroread8</filename></entry>
+ <entry><filename
+ role="package">print/acroread8</filename></entry>
</row>
<row>
<entry><application>gv</application></entry>
<entry><literal>gv</literal></entry>
- <entry><filename role="package">print/gv</filename></entry>
+ <entry><filename
+ role="package">print/gv</filename></entry>
</row>
<row>
<entry><application>Xpdf</application></entry>
<entry><literal>xpdf</literal></entry>
- <entry><filename role="package">graphics/xpdf</filename></entry>
+ <entry><filename
+ role="package">graphics/xpdf</filename></entry>
</row>
<row>
<entry><application>GQview</application></entry>
<entry><literal>gqview</literal></entry>
- <entry><filename role="package">graphics/gqview</filename></entry>
+ <entry><filename
+ role="package">graphics/gqview</filename></entry>
</row>
<row>
<entry><application>GnuCash</application></entry>
<entry><literal>gnucash</literal></entry>
- <entry><filename role="package">finance/gnucash</filename></entry>
+ <entry><filename
+ role="package">finance/gnucash</filename></entry>
</row>
<row>
<entry><application>Gnumeric</application></entry>
<entry><literal>gnumeric</literal></entry>
- <entry><filename role="package">math/gnumeric</filename></entry>
+ <entry><filename
+ role="package">math/gnumeric</filename></entry>
</row>
<row>
<entry><application>Abacus</application></entry>
<entry><literal>abacus</literal></entry>
- <entry><filename role="package">deskutils/abacus</filename></entry>
+ <entry><filename
+ role="package">deskutils/abacus</filename></entry>
</row>
- <row>
- <entry><application>KMyMoney</application></entry>
- <entry><literal>kmymoney2</literal></entry>
- <entry><filename role="package">finance/kmymoney2</filename></entry>
- </row>
-
+ <row>
+ <entry><application>KMyMoney</application></entry>
+ <entry><literal>kmymoney2</literal></entry>
+ <entry><filename
+ role="package">finance/kmymoney2</filename></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>