From 8e6a16d8297e9033285b930bf72921958bac4371 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 23 Mar 2011 10:48:12 +0000
Subject: [PATCH] Merge the following from the English version:

	1.101 -> 1.103	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 98e8ec904e..8f4db52c95 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.101
+     Original revision: 1.103
      $FreeBSD$
 -->
 
@@ -63,7 +63,8 @@
 	<para>����Ū�ʥ��ץꥱ������� (<application>KOffice</application>,
 	  <application>AbiWord</application>,
 	  <application>GIMP</application>,
-	  <application>OpenOffice.org</application> �ʤ�)</para>
+           <application>OpenOffice.org</application>,
+	   <application>LibreOffice</application> �ʤ�)</para>
       </listitem>
 
       <listitem>
@@ -547,6 +548,13 @@
 	    <entry>����</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>
+	  </row>
 	</tbody>
       </tgroup>
     </informaltable>
@@ -751,6 +759,92 @@
       <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
 
     </sect2>
+
+    <sect2>
+      <title>LibreOffice</title>
+      <indexterm>
+	<primary><application>LibreOffice</application></primary>
+      </indexterm>
+      <indexterm>
+	<primary>���ե�����������</primary>
+	<secondary><application>LibreOffice</application></secondary>
+      </indexterm>
+
+      <para><application>LibreOffice</application> �ϡ�
+	<ulink url="http://www.documentfoundation.org/">The Document
+	Foundation</ulink>
+	����ȯ���Ƥ���ե꡼���եȥ������Υ��ե����������ȤǤ���
+	¾�Υ᥸�㡼�ʥ��ե����������Ȥȸߴ��������ꡢ
+	���ޤ��ޤʥץ�åȥե���������ѤǤ��ޤ���
+	�����ʥ��ե����������������Ȥ�ɬ�ܤΥ��ץꥱ�������
+	(��ɥץ����å���ɽ�׻����եȥ��������ץ쥼��ơ�����󥽥եȥ�������
+	�޷����襽�եȥ��������ǡ����١����������եȥ��������������ǥ���)
+	�򤹤٤�·���Ƥ��� <application>OpenOffice.org</application>
+	����ο������ե������Ǥ���
+	��¿���θ�������ѤǤ��ޤ���
+	��ݲ��ϡ����󥿡��ե����������ڥ�����å���
+	������ϰϤˤ����Ǥ��ޤ���</para>
+
+      <para><application>LibreOffice</application>
+	�Υ�ɥץ����å��ϡ�
+	�ͥ��ƥ��֤Υե���������� XML ����Ѥ��뤳�Ȥ�
+	�ݡ����ӥ�ƥ������������Ƥ��ޤ���
+	ɽ�׻����եȥ������ˤϥޥ�����ǽ�����ꡢ
+	�����ǡ����١�������³���뤳�Ȥ�Ǥ��ޤ���
+	<application>LibreOffice</application> �ϡ����Ǥ�
+	&windows;, &solaris;, Linux, FreeBSD, &macos;&nbsp;X
+	�ˤ����ư��ꤷ�ƥͥ��ƥ��֤�ư��Ƥ��ޤ���
+	<application>LibreOffice</application>
+	�ˤĤ��Ƥξܤ�������ϡ�
+	<ulink url="http://www.libreoffice.org/">LibreOffice �����֥�����</ulink>
+	��������������</para>
+
+      <para>package ���� <application>LibreOffice</application>
+	�򥤥󥹥ȡ��뤹��ˤϡ��ʲ��Τ褦�ˤ��Ƥ���������</para>
+
+      <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
+
+      <note>
+	<para>&os; �Υ�꡼���Ǥ���Ѥ��Ƥ�����ˤϡ�
+	  �������Ϥ��ޤ������Ǥ��礦��
+      </note>
+
+      <para>package �򥤥󥹥ȡ��뤷���顢�ʲ��Υ��ޥ�ɤ����Ϥ���
+	<application>LibreOffice</application> ��ư���Ƥ���������</para>
+
+      <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
+
+      <note>
+	<para>���ư���ˤϡ������Ĥ��μ��䤬ɽ�����졢
+	  �ۡ���ǥ��쥯�ȥ�� <filename>.libreoffice</filename> �ե��������
+	  ��������ޤ���</para>
+      </note>
+
+      <para><application>LibreOffice.org</application> �� packages
+	�����ѤǤ��ʤ����Ǥ⡢port �����Ѥ�����ˡ������ޤ���
+	�������ʤ��顢����ѥ��뤹��ˤ��礭�ʥǥ��������ڡ�����
+	�����ˤ��ʤ�Ĺ�����֤�ɬ�פȤ��뤳�Ȥ򿴤�α��Ƥ����ʤ���Фʤ�ޤ���</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/libreoffice</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <note>
+	<para>�ϰ貽���줿�С�������ӥ�ɤ������Τʤ顢
+	  �嵭���ޥ�ɤ�����˰ʲ��Υ��ޥ�ɤ�¹Ԥ��Ʋ�������</para>
+
+	<screen>&prompt.root; <userinput>make LOCALIZED_LANG=<replaceable>your_language</replaceable> install clean</userinput></screen>
+
+	<para><replaceable>your_language</replaceable> ������������ ISO �����ɤ��֤������Ƥ���������
+	  ���ݡ��Ȥ���Ƥ�����쥳���ɤΰ����ϡ�port
+	  �� <filename>Makefile</filename> ��
+	  <maketarget>pre-fetch</maketarget> �������åȤˤ���ޤ���</para>
+      </note>
+
+      <para>���󥹥ȡ��뤬����ä��顢�ʲ��Υ��ޥ�ɤ� 
+	<application>LibreOffice</application> ��ư���Ƥ���������</para>
+
+      <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
+    </sect2>
   </sect1>
 
   <sect1 id="desktop-viewers">
@@ -1181,6 +1275,12 @@
 	    <entry><filename role="package">editors/openoffice.org-3</filename></entry>
 	  </row>
 
+	  <row>
+            <entry><application>LibreOffice</application></entry>
+	    <entry><literal>libreoffice</literal></entry>
+	    <entry><filename role="package">editors/libreoffice</filename></entry>
+	  </row>
+
 	  <row>
 	    <entry><application>&acrobat.reader;</application></entry>
 	    <entry><literal>acroread</literal></entry>