diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml index b86d00f0ee..39c35ace48 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: r39265 + Original revision: r39828 $FreeBSD$ --> @@ -65,8 +65,8 @@ <para>����Ū�ʥ��ץꥱ������� (<application>KOffice</application>, <application>AbiWord</application>, <application>GIMP</application>, - <application>OpenOffice.org</application>, - <application>LibreOffice</application> �ʤ�)</para> + <application>Apache OpenOffice</application>, + <application>LibreOffice</application> �ʤ�)</para> </listitem> <listitem> @@ -582,7 +582,7 @@ </row> <row> - <entry><application>OpenOffice.org</application></entry> + <entry><application>Apache OpenOffice</application></entry> <entry>¿</entry> <entry>����</entry> <entry><application>&jdk;</application>, <application>Mozilla</application></entry> @@ -714,16 +714,24 @@ </sect2> <sect2> - <title>OpenOffice.org</title> + <title>Apache OpenOffice</title> <indexterm> - <primary><application>OpenOffice.org</application></primary> + <primary><application>Apache OpenOffice</application></primary> </indexterm> <indexterm> <primary>���ե�����������</primary> - <secondary><application>OpenOffice.org</application></secondary> + <secondary><application>Apache OpenOffice</application></secondary> </indexterm> - <para><application>OpenOffice.org</application> + <para>2011 ǯ 7 �� 1 ����Oracle Corporation �� + <application>OpenOffice.org</application> �Υ����ɥ١����� + Apache Software Foundation �ش�£���ޤ����� + ���� <application>OpenOffice.org</application> �ϡ� + <application>Apache OpenOffice</application> �Ȥ����Τ�졢 + Apache Software Foundation + �Υ���١����ץ��������ȤȤ��Ƴ�ȯ���Ԥ��Ƥ��ޤ���</para> + + <para><application>Apache OpenOffice</application> �ϡ������ʥ��ե����������Ȥ�ɬ�ܤΥ��ץꥱ������� (��ɥץ����å���ɽ�����եȥ������� �ץ쥼��ơ�����եȥ������������ƿ����襽�եȥ�����) @@ -733,40 +741,44 @@ ���ե����������ڥ�����å�������Ϲ�ݲ�����Ƥ��ꡢ ¿���θ�������ѤǤ��ޤ���</para> - <para><application>OpenOffice.org</application> + <para><application>Apache OpenOffice</application> �Υ�ɥץ����å��ϡ��ͥ��ƥ��֤Υե���������� XML ����Ѥ��뤳�Ȥ� �ݡ����ӥ�ƥ������������Ƥ��ޤ��� ɽ�����եȥ������ˤϥޥ�����ǽ�����ꡢ �����ǡ����١�������³���뤳�Ȥ�Ǥ��ޤ��� - <application>OpenOffice.org</application> �ϡ����Ǥ� + <application>Apache OpenOffice</application> �ϡ����Ǥ� &windows;, &solaris;, Linux, FreeBSD, &macos; X �ˤ����ư��ꤷ�ƥͥ��ƥ��֤�ư��Ƥ��ޤ��� - <application>OpenOffice.org</application> + <application>Apache OpenOffice</application> �ˤĤ��Ƥξܤ�������ϡ� - <ulink url="http://www.openoffice.org/">OpenOffice.org web ������</ulink> + <ulink url="http://incubator.apache.org/openofficeorg/">Apache OpenOffice web ������</ulink> ���������������ޤ��� - <ulink url="http://porting.openoffice.org/freebsd/">FreeBSD OpenOffice.org �ץ��������ȥ�����</ulink> + <ulink url="http://porting.openoffice.org/freebsd/">FreeBSD Apache OpenOffice �ץ��������ȥ�����</ulink> �� Web �����Ȥ��顢FreeBSD ��ͭ�ξ���� packages ��ľ�ܼ������뤳�Ȥ�Ǥ��ޤ���</para> - <para><application>OpenOffice.org</application> + <para><application>Apache OpenOffice.org</application> �ȡ��뤹��ˤϡ��ʲ��Τ褦�����Ϥ��Ƥ���������</para> - <screen>&prompt.root; <userinput>pkg_add -r openoffice.org</userinput></screen> + <screen>&prompt.root; <userinput>pkg_add -r apache-opeonoffice</userinput></screen> <note> <para>&os; �Υ����Ǥ���Ѥ��Ƥ�����ˤϡ��������Ϥ��ޤ������Ǥ��礦�� - ����ʳ����Ǥ���Ѥ��Ƥ����硢&os; <application>OpenOffice.org</application> Porting Team - �� web �����Ȥ���Ŭ�ڤʥѥå����������������ɤ��ơ� + ����ʳ����Ǥ���Ѥ��Ƥ����硢&os; <application>Apache OpenOffice</application> + �ܿ�������� web �����Ȥ���Ŭ�ڤʥѥå����������������ɤ��ơ� &man.pkg.add.1; ����Ѥ��ƥ��ȡ��뤷�Ƥ��������� ��������ϥ����Ǥȳ�ȯ�Ǥ�ξ��������������ɤǤ��ޤ���</para> </note> <para>package �ȡ��뤷���顢�ʲ��Υ��ޥ�ɤ����Ϥ���ȡ� - <application>OpenOffice.org</application> ����ư���ޤ���</para> + <application>Apache OpenOffice</application> ����ư���ޤ���</para> - <screen>&prompt.user; <userinput>openoffice.org</userinput></screen> + <screen>&prompt.user; <userinput>openoffice-<replaceable>X.Y.Z</replaceable></userinput></screen> + + <para>������ <replaceable>X.Y.Z</replaceable> �ϡ� + <replaceable>3.4.0</replaceable> �Τ褦�ʥ��ȡ��뤵��Ƥ��� + <application>Apache OpenOffice</application> �ΥС�������ֹ�Ǥ���</para> <note> <para>���ư���ˡ������Ĥ��μ��䤬ɽ�����졢 @@ -774,12 +786,12 @@ �ե��������������ޤ���</para> </note> - <para><application>OpenOffice.org</application> �� packages + <para><application>Apache OpenOffice</application> �� packages �����ѤǤ��ʤ����ˤϡ�port �����Ѥ�����ˡ�⤢��ޤ����� ����ѥ���ˤ��礭�ʥǥ��������ڡ����ȡ� �����ˤ��ʤ�Ĺ�����֤�ɬ�פȤ��뤳�Ȥ�α��Ƥ���ɬ�פ�����ޤ���</para> - <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-3</userinput> + <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-3</userinput> &prompt.root; <userinput>make install clean</userinput></screen> <note> @@ -794,10 +806,13 @@ </note> <para>���ȡ��뤬����ä��顢�ʲ��Υ��ޥ�ɤ� - <application>OpenOffice.org</application> ��ư���Ƥ���������</para> + <application>Apache OpenOffice</application> ��ư���Ƥ���������</para> - <screen>&prompt.user; <userinput>openoffice.org</userinput></screen> + <screen>&prompt.user; <userinput>openoffice-<replaceable>X.Y.Z</replaceable></userinput></screen> + <para>������ <replaceable>X.Y.Z</replaceable> �ϡ� + <replaceable>3.4.0</replaceable> �Τ褦�ʥ��ȡ��뤵��Ƥ��� + <application>Apache OpenOffice</application> �ΥС�������ֹ�Ǥ���</para> </sect2> <sect2>