diff options
Diffstat (limited to 'zh_CN.GB2312/share/sgml/trademarks.ent')
| -rw-r--r-- | zh_CN.GB2312/share/sgml/trademarks.ent | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent index 863dc84d1b..eb0dfc4c88 100644 --- a/zh_CN.GB2312/share/sgml/trademarks.ent +++ b/zh_CN.GB2312/share/sgml/trademarks.ent @@ -8,7 +8,7 @@ Please keep this file sorted. - Original revision: 1.46 + Original revision: 1.47 $FreeBSD$ --> @@ -293,7 +293,7 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢² <!-- http://www.sun.com/suntrademarks/ --> <!ENTITY tm-attrib.sun "<para>Sun¡¢ Sun Microsystems¡¢ Java¡¢ Java - Virtual Machine¡¢ JavaServer Pages¡¢ JDK¡¢ JRE¡¢ JSP¡¢ JVM¡¢ Netra¡¢ + Virtual Machine¡¢ JavaServer Pages¡¢ JDK¡¢ JRE¡¢ JSP¡¢ JVM¡¢ Netra¡¢ OpenJDK¡¢ Solaris¡¢ StarOffice¡¢ Sun Blade¡¢ Sun Enterprise¡¢ Sun Fire¡¢ SunOS¡¢ Ultra ÒÔ¼° VirtualBox ÊÇ Sun Microsystems, Inc. ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> @@ -305,6 +305,7 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢² <!ENTITY jsp "<trademark>JSP</trademark>"> <!ENTITY jvm "<trademark>JVM</trademark>"> <!ENTITY netra "<trademark>Netra</trademark>"> +<!ENTITY openjdk "<trademark>OpenJDK</trademark>"> <!ENTITY solaris "<trademark>Solaris</trademark>"> <!ENTITY staroffice "<trademark>StarOffice</trademark>"> <!ENTITY sun "<trademark>Sun</trademark>"> |