- Merge the following from the English version:

r49777 -> r51353	head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml
	r38745 -> r51230	head/ja_JP.eucJP/htdocs/copyright/trademarks.xml
	r49777 -> r51353	head/ja_JP.eucJP/share/xml/header.l10n.ent
This commit is contained in:
Ryusuke SUZUKI 2018-01-02 08:53:05 +00:00
parent 8de7b0db20
commit 3f1f2fb28a
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=51359
3 changed files with 9 additions and 9 deletions

View file

@ -4,7 +4,7 @@
<!ENTITY title "The FreeBSD Copyright">
]>
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: r49777 -->
<!-- Original revision: r51353 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@ -17,7 +17,7 @@
<p>訳注 : 以下は FreeBSD の license の原文です。</p>
<p>Copyright 1992-2017
<p>Copyright 1992-2018
The FreeBSD Project.
All rights reserved.</p>
@ -60,7 +60,7 @@
<p>以下の日本語訳は参考のために添付したものです。
英語版だけが法律的に有効であることに注意してください。</p>
<p>Copyright 1992-2017
<p>Copyright 1992-2018
The FreeBSD Project.
All rights reserved.</p>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
<!ENTITY title "登録商標">
]>
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.20 -->
<!-- Original revision: r51230 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@ -20,9 +20,9 @@
<p>FreeBSD Logo は FreeBSD Foundation の商標です。</p>
<p>FreeBSD マークの利用に関しては、
<a href="http://www.freebsdfoundation.org/">FreeBSD
<a href="https://www.freebsdfoundation.org/">FreeBSD
Foundation</a><a
href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">Trademark
href="https://www.freebsdfoundation.org/legal/trademark-usage-terms-and-conditions/">Trademark
Usage Terms and Conditions</a> ページをご覧ください。</p>
<p>Adobe, Acrobat, Acrobat Reader および PostScript

View file

@ -5,10 +5,10 @@
<!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: r49777 -->
<!-- Original revision: r51353 -->
<!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">サイトマップ</a> |
<a href="&base;/copyright/">知的財産権について</a> | <!-- &copy; -->(C) 1995&ndash;2017 The FreeBSD Project.
<a href="&base;/copyright/">知的財産権について</a> | <!-- &copy; -->(C) 1995&ndash;2018 The FreeBSD Project.
All rights reserved.</span>'>
<!ENTITY author '<a href="&base;/index.html">ホーム</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">連絡先</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">知的財産権について</a> &nbsp; | &nbsp; &copyright;'>