diff options
| -rw-r--r-- | zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml | 23 | ||||
| -rw-r--r-- | zh_CN.GB2312/share/sgml/trademarks.ent | 23 |
2 files changed, 39 insertions, 7 deletions
diff --git a/zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml b/zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml index d62c9b5569..ec7137ffbd 100644 --- a/zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml +++ b/zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml @@ -1,5 +1,5 @@ <!-- - Original Revision: 1.35 + Original Revision: 1.36 $FreeBSD$ FreeBSD Glossary Terms @@ -1525,6 +1525,27 @@ </glossdef> </glossentry> + <glossentry id="rcs-glossary"> + <glossterm>Revision Control System</glossterm> + <acronym>RCS</acronym> + <glossdef> + <para><emphasis>Revision Control System</emphasis> + (<acronym>RCS</acronym>) ÊÇ×îÔçʵÏÖÆÕͨÎļþ + <quote>°æ±¾¿ØÖÆ</quote> µÄÈí¼þ°üÖ®Ò»¡£ + ËüÌṩÁË´æ´¢¡¢ »ñÈ¡¡¢ ±£´æ¹éµµ¡¢ ¼Ç¼¡¢ + ÃüÃûºÍºÏ²¢ÎļþÖжà¸ö°æ±¾µÄÄÜÁ¦¡£ + RCS °üº¬ÁËÐí¶à¿ÉÒÔÅäºÏʹÓõÄС¹¤¾ß¡£ + Ëü²¢²»¾ß±¸¸üÏÖ´ú»¯µÄ°æ±¾¿ØÖÆϵͳ£¬ ÀýÈç CVS »ò Subversion + ËùÌṩµÄijЩ¹¦ÄÜ£¬ µ«¶ÔÓÚÉÙÁ¿ÎļþµÄ¹ÜÀí¶øÑÔ£¬ + ÆäÒ×ÓÚ°²×°¡¢ ÅäÖúÍʹÓÃÔò¿É¿´×÷ÓÅÊÆ¡£ + RCS µÄʵÏÖ¿ÉÒÔÔÚ¼¸ºõÿһÖÖÖ÷Á÷ + Àà-UNIX OS ÉÏÕÒµ½¡£</para> + + <glossseealso otherterm="cvs-glossary"> + <glossseealso otherterm="svn-glossary"> + </glossdef> + </glossentry> + <glossentry id="rd-glossary"> <glossterm>Received Data (Êý¾ÝÒÑÊÕµ½)</glossterm> <acronym>RD</acronym> 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/ --> |