diff options
Diffstat (limited to 'zh_CN.GB2312/share/sgml/trademarks.ent')
| -rw-r--r-- | zh_CN.GB2312/share/sgml/trademarks.ent | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent index eb0dfc4c88..1b749e04bd 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.47 + Original revision: 1.48 $FreeBSD$ --> @@ -120,6 +120,14 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢² <!ENTITY tm-attrib.freebsd "<para>FreeBSD ÊÇ FreeBSD»ù½ð»áµÄ×¢²áÉ̱ê</para>"> +<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php --> +<!ENTITY tm-attrib.fujitsu "<para>Fujitsu¡¢ Fujitsu ±êÖ¾¡¢ LifeBook¡¢ + Stylistic¡¢ PRIMEPOWER¡¢ PRIMEQUEST¡¢ PRIMECLUSTER¡¢ ETERNUS¡¢ TRIOLE¡¢ + ESPRIMO¡¢ BioMedCAChe¡¢ CAChe¡¢ CELLINJECTOR¡¢ isS¡¢ Materials Explorer¡¢ + SystemWalker£¬ ÒÔ¼° Interstage ÊÇ ¸»Ê¿Í¨Öêʽ»áÉç ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> +<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>"> +<!ENTITY primepower "<trademark class='registered'>PRIMEPOWER</trademark>"> + <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp --> <!ENTITY tm-attrib.heidelberger "<para>Heidelberg¡¢ Helvetica¡¢ Palatino ÒÔ¼° Times Roman ÊÇ Heidelberger Druckmaschinen AG @@ -282,12 +290,15 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢² <!ENTITY tm-attrib.slackware "<para>Slackware ÊÇ Patrick Volkerding ¼° Slackware Linux, Inc. µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, ÒÔ¼° +<!-- http://www.sparc.org/trademarksListing.html --> +<!ENTITY tm-attrib.sparc "<para>SPARC¡¢ SPARC64¡¢ SPARCengine£¬ ÒÔ¼° UltraSPARC ÊÇ SPARC International, Inc ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄÉ̱ꡣ - °üº¬ SPARC É̱êµÄ²úÆ·»ùÓÚ Sun Microsystems, Inc. ¿ª·¢µÄ¼Ü¹¹¡£</para>"> -<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>"> -<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> -<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>"> + SPARC International, Inc ÓµÓÐËùÓÐ + SPARC É̱êµÄÏà¹ØȨÀû£¬ + ²¢ÒÔÐí¿ÉÖ¤ÐÎʽÔÊÐíÆä»áÔ±ÒÔÊʵ±ÐÎʽʹÓÃÕâЩÉ̱ꡣ</para>"> +<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>"> +<!ENTITY sparcengine "<trademark class='registered'>SPARCengine</trademark>"> <!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> |