- Merge the following from the English version:

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