Date: Tue, 2 Jan 2018 08:53:05 +0000 (UTC) From: Ryusuke SUZUKI <ryusuke@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51359 - in head/ja_JP.eucJP: htdocs/copyright share/xml Message-ID: <201801020853.w028r5Cl047011@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ryusuke Date: Tue Jan 2 08:53:05 2018 New Revision: 51359 URL: https://svnweb.freebsd.org/changeset/doc/51359 Log: - 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 Modified: head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml head/ja_JP.eucJP/htdocs/copyright/trademarks.xml head/ja_JP.eucJP/share/xml/header.l10n.ent Modified: head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml Tue Jan 2 08:39:19 2018 (r51358) +++ head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml Tue Jan 2 08:53:05 2018 (r51359) @@ -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> Modified: head/ja_JP.eucJP/htdocs/copyright/trademarks.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/copyright/trademarks.xml Tue Jan 2 08:39:19 2018 (r51358) +++ head/ja_JP.eucJP/htdocs/copyright/trademarks.xml Tue Jan 2 08:53:05 2018 (r51359) @@ -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 Modified: head/ja_JP.eucJP/share/xml/header.l10n.ent ============================================================================== --- head/ja_JP.eucJP/share/xml/header.l10n.ent Tue Jan 2 08:39:19 2018 (r51358) +++ head/ja_JP.eucJP/share/xml/header.l10n.ent Tue Jan 2 08:53:05 2018 (r51359) @@ -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> | <!-- © -->(C) 1995–2017 The FreeBSD Project. + <a href="&base;/copyright/">知的財産権について</a> | <!-- © -->(C) 1995–2018 The FreeBSD Project. All rights reserved.</span>'> <!ENTITY author '<a href="&base;/index.html">ホーム</a> | <a href="&base;/mailto.html">連絡先</a> | <a href="&base;/copyright/index.html">知的財産権について</a> | ©right;'>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801020853.w028r5Cl047011>