- Merge the following from the English version:
r45900 -> r45992 head/ja_JP.eucJP/share/xml/trademarks.ent
This commit is contained in:
parent
23e7970ad1
commit
d7181f79fa
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=46012
1 changed files with 2 additions and 2 deletions
|
@ -10,7 +10,7 @@
|
|||
Please keep this file sorted.
|
||||
|
||||
$FreeBSD$
|
||||
Original revision: r45900
|
||||
Original revision: r45992
|
||||
-->
|
||||
|
||||
<!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com および HomeConnect は
|
||||
|
@ -35,7 +35,7 @@
|
|||
<!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>Apple, AirPort, FireWire,
|
||||
iMac, iPhone, iPad,
|
||||
Mac, Macintosh, Mac OS,
|
||||
Quicktime および TrueType は Apple Computer, Inc. の商標で、
|
||||
Quicktime および TrueType は Apple Inc. の商標で、
|
||||
アメリカ合衆国およびその他の国で登録されています。</para>">
|
||||
|
||||
<!ENTITY tm-attrib.arm "<para xmlns='http://docbook.org/ns/docbook'>ARM は ARM Limited の登録商標です。</para>">
|
||||
|
|
Loading…
Reference in a new issue