- Merge the following from the English version:

	r24989 -> r45697	head/ja_JP.eucJP/share/xml/trademarks.ent