Skip site navigation (1)Skip section navigation (2)
Date:      Sun,  9 Jul 2006 23:49:11 +0800
From:      chinsan <chinsan.tw@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        vanilla@FreeBSD.org
Subject:   docs/99968: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
Message-ID:  <20060709154535.C8EB930205@smtp2.bc.hgc.com.tw>
Resent-Message-ID: <200607091550.k69FoEtm077710@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         99968
>Category:       docs
>Synopsis:       [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 09 15:50:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan2.twbbs.org 6.1-STABLE FreeBSD 6.1-STABLE #1: Fri Jun 2 16:44:35 CST 2006 root@chinsan2.twbbs.org:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- Add authors.ent & update trademarks.ent
  ( http://chinsan2.twbbs.org/chinsan/zh_TW.Big5.20060709_2.svn737.diff )
  Obtained from:  The FreeBSD Traditional Chinese Project

- Each changelog can reviewd at
  https://opensvn.csie.org/traccgi/freebsddoc/timeline

>How-To-Repeat:
>Fix:

--- zh_TW.Big5.20060709_2.svn737.diff begins here ---
diff -ruN zh_TW.Big5.orig/share/sgml/authors.ent zh_TW.Big5/share/sgml/authors.ent
--- zh_TW.Big5.orig/share/sgml/authors.ent	Thu Jan  1 08:00:00 1970
+++ zh_TW.Big5/share/sgml/authors.ent	Sun Jul  9 23:37:08 2006
@@ -0,0 +1,92 @@
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD Traditional Chinese Documentation Project
+
+     $FreeBSD$
+
+     Names and email address of contributing authors and CVS committers.
+     Entity names for committers should be the same as their login names on
+     freefall.FreeBSD.org.
+
+     Use these entities when referencing people.
+
+     Please keep this list in alphabetical order by entity names.
+
+     IMPORTANT:  If you delete names from this file you *must* ensure that
+                 all references to them have been removed from the handbook's
+                 translations.  If they haven't then you *will* break the
+                 builds for the other languages, and we will poke fun of you
+                 in public.
+-->
+
+<!--
+     Chinese Names delphij is aware of. Please contact delphij@FreeBSD.org
+     if you know more.
+-->
+
+<!ENTITY a.avatar "梁泰華 <email>avatar@FreeBSD.org</email>">
+
+<!ENTITY a.bmah "馬源浩 <email>bmah@FreeBSD.org</email>">
+
+<!ENTITY a.clive "林東毅 <email>clive@FreeBSD.org</email>">
+
+<!ENTITY a.clsung "宋政隆 <email>clsung@FreeBSD.org</email>">
+
+<!ENTITY a.davidxu "徐逸鋒 <email>davidxu@FreeBSD.org</email>">
+
+<!ENTITY a.delphij "李鑫 <email>delphij@FreeBSD.org</email>">
+
+<!ENTITY a.foxfair "胡庭豪 <email>foxfair@FreeBSD.org</email>">
+
+<!ENTITY a.hsu "徐敏傑 <email>hsu@FreeBSD.org</email>">
+
+<!ENTITY a.ijliao "廖英傑 <email>ijliao@FreeBSD.org</email>">
+
+<!ENTITY a.keichii "吳敬元 <email>keichii@FreeBSD.org</email>">
+
+<!ENTITY a.kevlo "羅謝家偉 <email>kevlo@FreeBSD.org</email>">
+
+<!ENTITY a.leeym "李彥明 <email>leeym@FreeBSD.org</email>">
+
+<!ENTITY a.luoqi "陳洛祁 <email>luoqi@FreeBSD.org</email>">
+
+<!ENTITY a.pat "李雲玖 <email>pat@FreeBSD.org</email>">
+
+<!ENTITY a.rafan "范榮恩 <email>rafan@FreeBSD.org</email>">
+
+<!ENTITY a.vanilla "徐三泰 <email>vanilla@FreeBSD.org</email>">
+
+
+<!--
+     Names and email address of Simpified Chinese local contributing authors and
+     tarsier.cn.FreeBSD.org CVS committers.
+     Entity names for committers should be the same as their login
+     names on tarsier.cn.FreeBSD.org.
+-->
+
+<!ENTITY a.cn.alu "陸海雁 <email>alu@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.delphij "李鑫 <email>delphij@FreeBSD.org</email>">
+
+<!ENTITY a.cn.gavin "穆立超 <email>gavin@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.intron "<email>intron@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.lih "李浩源 <email>lih@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.wjf "溫俊峰 <email>wjf@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.yarshure "孔祥波 <email>yarshure@cn.FreeBSD.org</email>">
+
+
+<!--
+     Names and email address of Traditional Chinese local contributing authors
+-->
+
+<!ENTITY a.tw.chinsan "黃青山 <email>chinsan.tw@gmail.com</email>">
+
+<!ENTITY a.tw.psilotum "林政道 <email>b89605222@ntu.edu.tw</email>">
+
+<!ENTITY a.tw.tzhuan "Tz-Huan Huang <email>tzhuan@gmail.com</email>">
+
+<!ENTITY a.tw.whsyu "Wei-Hao Syu <email>whsyu@arbor.ee.ntu.edu.tw</email>">
diff -ruN zh_TW.Big5.orig/share/sgml/catalog zh_TW.Big5/share/sgml/catalog
--- zh_TW.Big5.orig/share/sgml/catalog	Mon Nov 21 23:14:02 2005
+++ zh_TW.Big5/share/sgml/catalog	Sun Jul  9 23:37:08 2006
@@ -13,6 +13,14 @@
 PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent"
 
+
+-- Addition to en_US, opened in l10n.ent. --
+PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//CN"
+        "authors.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//TW"
+        "authors.ent"
+
 PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
 	"trademarks.ent"
 
diff -ruN zh_TW.Big5.orig/share/sgml/l10n.ent zh_TW.Big5/share/sgml/l10n.ent
--- zh_TW.Big5.orig/share/sgml/l10n.ent	Mon Nov 21 23:14:02 2005
+++ zh_TW.Big5/share/sgml/l10n.ent	Sun Jul  9 23:37:08 2006
@@ -16,3 +16,11 @@
 
 <!-- charset for HTML output -->
 <!ENTITY doc.html.charset "Big5">
+
+<!ENTITY mdash "——">
+
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//TW">
+%authors.cn;
+
+<!ENTITY % authors.tw PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//TW">
+%authors.tw;
diff -ruN zh_TW.Big5.orig/share/sgml/trademarks.ent zh_TW.Big5/share/sgml/trademarks.ent
--- zh_TW.Big5.orig/share/sgml/trademarks.ent	Mon Nov 21 23:14:02 2005
+++ zh_TW.Big5/share/sgml/trademarks.ent	Sun Jul  9 23:37:08 2006
@@ -8,122 +8,111 @@
 
      Please keep this file sorted.
 
+     Original revision: 1.30
      $FreeBSD: doc/zh_TW.Big5/share/sgml/trademarks.ent,v 1.1 2005/11/21 15:14:02 vanilla Exp $
 -->
 
-<!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
-  trademarks of 3Com Corporation.</para>">
+<!ENTITY tm-attrib.3com "<para>3Com 和 HomeConnect 是 3Com Corporation 的註冊商標。</para>">
 <!-- An SGML entity can't start with a number... -->
 <!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
-<!ENTITY tm-attrib.3ware "<para>3ware and Escalade are registered
-  trademarks of 3ware Inc.</para>">
+<!ENTITY tm-attrib.3ware "<para>3ware 和 Escalade 是 3ware Inc 的註冊商標。</para>">
 <!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
 <!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
 
 <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
-<!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
-  Adaptec, Inc.</para>">
+<!ENTITY tm-attrib.adaptec "<para>Adaptec 是
+  Adaptec, Inc. 的註冊商標。</para>">
 <!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
 
-<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and
-  PostScript are either registered trademarks or trademarks of Adobe
-  Systems Incorporated in the United States and/or other
-  countries.</para>">
+<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, 以及
+  PostScript 是 Adobe
+  Systems Incorporated 在美國和/或其他國家的商標或註冊商標。</para>">
 <!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
-<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat&nbsp;Reader</trademark>">
+<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat Reader</trademark>">
 <!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
 <!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
 
 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
-  Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, and PCnet are
-  trademarks of Advanced Micro Devices, Inc.</para>">
+  Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
+ Advanced Micro Devices, Inc. 的商標。</para>">
 <!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
 <!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
-<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
+<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>">
+<!ENTITY amd.duron "<trademark>AMD Duron</trademark>">
 <!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
-<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
+<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>">
 <!ENTITY athlon "<trademark>Athlon</trademark>">
 <!ENTITY elan "<trademark>&Eacute;lan</trademark>">
 <!ENTITY opteron "<trademark>Opteron</trademark>">
 
 <!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
-  Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
-  registered in the United States and other countries.</para>">
+  Quicktime, 以及 TrueType 是 Apple Computer, Inc. 在美國以及其他國家的註冊商標。</para>">
 <!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
 <!ENTITY mac "<trademark class='registered'>Mac</trademark>">
 <!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
-<!ENTITY macos "<trademark class='registered'>Mac&nbsp;OS</trademark>">
+<!ENTITY macos "<trademark class='registered'>Mac OS</trademark>">
 <!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
 <!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
 
-<!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM
-  Limited.</para>">
+<!ENTITY tm-attrib.arm "<para>ARM 是 ARM
+  Limited. 的註冊商標。</para>">
 <!ENTITY arm "<trademark class='registered'>ARM</trademark>">
 
 <!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth word mark is owned
-  by the Bluetooth SIG, Inc.</para>">
+<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth 文字標誌屬於 Bluetooth SIG, Inc.</para>">
 <!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
 
-<!ENTITY tm-attrib.broadcom "<para>Broadcom is a registered trademark
-  of Broadcom Corporation and/or its subsidiaries.</para>">
+<!ENTITY tm-attrib.broadcom "<para>Broadcom 是 Broadcom Corporation 和/或其子公司的註冊商標。</para>">
 <!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
 
 <!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, and
-  VPN-1 are trademarks of Check Point Software Technologies
-  Ltd..</para>">
-
-<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, and IOS are
-  registered trademarks of Cisco Systems, Inc. and/or its affiliates
-  in the United States and certain other countries.</para>">
+<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, 以及
+  VPN-1 是 Check Point Software Technologies
+  Ltd. 的商標。</para>">
+
+<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, 和 IOS
+  是 Cisco Systems, Inc. 和/或其附屬機構在美國和一些其他國家的註冊商標。</para>">
 <!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
 <!ENTITY ios "<trademark class='registered'>IOS</trademark>">
 
-<!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks
-  or registered trademarks of Corel Corporation and/or its
-  subsidiaries in Canada, the United States and/or other
-  countries.</para>">
+<!ENTITY tm-attrib.corel "<para>Corel 和 WordPerfect 是 Corel Corporation 和/或其子公司
+  在加拿大、美國和/或其他國家的註冊商標。</para>">
 
 <!-- http://www.creative.com/legal.asp -->
-<!ENTITY tm-attrib.creative "<para>Sound Blaster is a trademark of
-  Creative Technology Ltd. in the United States and/or other
-  countries.</para>">
+<!ENTITY tm-attrib.creative "<para>Sound Blaster 是
+  Creative Technology Ltd. 在美國和/或其他國家的註冊商標。</para>">
 <!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
 
 <!-- http://www.cvsup.org/ -->
-<!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
-  John D. Polstra.</para>">
+<!ENTITY tm-attrib.cvsup "<para>CVSup 是
+  John D. Polstra 的註冊商標。</para>">
 
 <!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
 <!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
-  Optiplex, PowerEdge are trademarks or registered trademarks of Dell
-  Computer Corporation</para>">
+  Optiplex, PowerEdge 是 Dell
+  Computer Corporation 的商標或註冊商標。</para>">
 <!ENTITY dell "<trademark>Dell</trademark>">
 <!ENTITY poweredge "<trademark>PowerEdge</trademark>">
 
 <!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection are registered
-  trademarks of Seiko Epson Corporation.</para>">
+<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection 是
+  Epson Corporation的註冊商標。</para>">
 <!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
 <!ENTITY epson.perfection "<trademark class='registered'>EPSON
   Perfection</trademark>">
 
-<!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of
-  the FreeBSD Foundation.</para>">
+<!ENTITY tm-attrib.freebsd "<para>FreeBSD 是 FreeBSD基金會的註冊商標</para>">
 
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
-  Palatino, and Times Roman are either registered trademarks or
-  trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
-  countries.</para>">
-
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, and ThinkPad are
-  trademarks of International Business Machines Corporation in the
-  United States, other countries, or both.</para>">
+  Palatino, 和 Times Roman 是 Heidelberger Druckmaschinen AG 在美國以及其他國家的商標或註冊商標。</para>">
+
+
+
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, 和 ThinkPad 是
+  國際商用機器公司在美國和其他國家的註冊商標或商標。</para>">
 <!ENTITY aix "<trademark class='registered'>AIX</trademark>">
 <!ENTITY etherjet "<trademark>EtherJet</trademark>">
 <!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
@@ -133,15 +122,13 @@
 <!ENTITY s390 "<trademark class='registered'>S/390</trademark>">
 <!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>">
 
-<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered
-  trademarks of Institute of Electrical and Electronics Engineers,
-  Inc. in the United States.</para>">
+<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, 和 802 是 Institute of Electrical and Electronics Engineers,
+  Inc. 在美國的註冊商標。</para>">
 <!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
 
 <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
-  i486, Itanium, Pentium, and Xeon are trademarks or registered
-  trademarks of Intel Corporation or its subsidiaries in the United
-  States and other countries.</para>">
+  i486, Itanium, Pentium, 和 Xeon 是 Intel Corporation
+  及其分支機構在美國和其他國家的商標或註冊商標。</para>">
 <!ENTITY celeron "<trademark class='registered'>Celeron</trademark>">
 <!ENTITY etherexpress "<trademark>EtherExpress</trademark>">
 <!ENTITY i386 "<trademark>i386</trademark>">
@@ -152,155 +139,134 @@
 <!ENTITY xeon "<trademark>Xeon</trademark>">
 
 <!-- http://www.quicken.com/support/trademark/ -->
-<!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered
-  trademarks and/or registered service marks of Intuit Inc., or one of
-  its subsidiaries, in the United States and other countries.</para>">
-
-<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, and Jaz are either
-  registered trademarks or trademarks of Iomega Corporation in the
-  United States and/or other countries.</para>">
+<!ENTITY tm-attrib.intuit "<para>Intuit 和 Quicken 是 Intuit Inc., 或其子公司在美國和其他國家的商標或註冊商標。</para>">
+
+
+
+<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, 和 Jaz 是 Iomega Corporation
+  在美國和/或其他國家的商標或註冊商標。</para>">
 <!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
 <!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
 
-<!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are
-  trademarks of Lantronix Corporation.</para>">
+<!ENTITY tm-attrib.lantronix "<para>Lantronix 和 EasyIO 是 Lantronix Corporation 的商標。</para>">
 <!ENTITY easyio "<trademark>EasyIO</trademark>">
 
 <!-- http://www.linuxmark.org/ -->
-<!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
-  Linus Torvalds.</para>">
+<!ENTITY tm-attrib.linux "<para>Linux 是 Linus Torvalds 的註冊商標。</para>">
+
 <!ENTITY linux "<trademark class='registered'>Linux</trademark>">
 
 <!-- http://www.lsilogic.com/trademrk.html -->
 <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
-  MegaRAID and Mylex are trademarks or registered trademarks of LSI
-  Logic Corp.</para>">
+  MegaRAID 和 Mylex 是 LSI
+  Logic Corp 的商標或註冊商標。</para>">
 <!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
 <!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
 <!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
 
-<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are
-  trademarks or registered trademarks of Macromedia, Inc. in the
-  United States and/or other countries.</para>">
+<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, 以及 Shockwave
+  Macromedia, Inc. 在美國和/或其他國家的商標或註冊商標。</para>">
 <!ENTITY flash "<trademark>Flash</trademark>">
 <!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
 <!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
 
 <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
-  Outlook, Windows, Windows Media and Windows NT are either
-  registered trademarks or trademarks of Microsoft Corporation in the
-  United States and/or other countries.</para>">
+  Outlook, Windows, Windows Media, 和 Windows NT 是 Microsoft Corporation
+  在美國和/或其他國家的商標或註冊商標。</para>">
 <!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
 <!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
-<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
+<!ENTITY microsoft.windows "&microsoft; &windows;">
 <!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">
 <!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
 <!ENTITY windows "<trademark class='registered'>Windows</trademark>">
 <!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
-<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
-<!ENTITY windowsxp "&windows;&nbsp;XP">
-
-<!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
-  trademarks of MIPS Technologies, Inc. in the United States and other
-  countries.</para>">
+<!ENTITY windows2k "&windows; 2000">
+<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>">
+<!ENTITY windowsxp "&windows; XP">
+
+<!ENTITY tm-attrib.mips "<para>MIPS 和 R4000 是 MIPS Technologies, Inc.
+  在美國以及其他國家的註冊商標。</para>">
 <!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
 
 <!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL is a registered trademark of
-  MySQL AB in the United States, the European Union and other
-  countries.</para>">
+<!ENTITY tm-attrib.mysql "<para>MySQL 是
+  MySQL AB 在美國、歐盟和其他國家的註冊商標。</para>">
 <!ENTITY mysql "<trademark>MySQL</trademark>">
 
 <!-- http://www.m-sys.com/content/LegalTerms.asp -->
-<!ENTITY tm-attrib.m-systems "<para>M-Systems and DiskOnChip are
-  trademarks or registered trademarks of M-Systems Flash Disk
-  Pioneers, Ltd.</para>">
+<!ENTITY tm-attrib.m-systems "<para>M-Systems 和 DiskOnChip 是 M-Systems Flash Disk
+  Pioneers, Ltd. 的商標或註冊商標。</para>">
 <!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
 
 <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
-<!ENTITY tm-attrib.netbsd "<para>NetBSD is a registered trademark of
-  the NetBSD Foundation.</para>">
+<!ENTITY tm-attrib.netbsd "<para>NetBSD是 NetBSD Foundation的註冊商標。</para>">
 
-<!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator
-  are registered trademarks of Netscape Communications Corporation in
-  the U.S. and other countries.</para>">
+<!ENTITY tm-attrib.netscape "<para>Netscape 以及 Netscape Navigator
+  是 Netscape Communications Corporation 在美國和其他國家的註冊商標。</para>">
 <!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>">
 
 <!-- http://www.nexthop.com/legal.shtml -->
-<!ENTITY tm-attrib.nexthop "<para>GateD and NextHop are registered and
-  unregistered trademarks of NextHop in the U.S. and other
-  countries.</para>">
+<!ENTITY tm-attrib.nexthop "<para>GateD 和 NextHop 是 NextHop 在美國和其他國家的商標或註冊商標。</para>">
 <!ENTITY gated "<trademark class='registered'>GateD</trademark>">
 
 <!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, and
-  NLM are either registered trademarks or trademarks of Novell,
-  Inc. in the United States and other countries.</para>">
-
-<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are
-  registered trademarks and IT DialTone and The Open Group are
-  trademarks of The Open Group in the United States and other
-  countries.</para>">
-<!ENTITY tm-attrib.unix "<para>UNIX is a registered trademarks of The
-  Open Group in the United States and other countries.</para>">
+<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, 和
+  NLM 是 Novell, Inc. 在美國和其他國家的商標或註冊商標。</para>">
+
+<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, 和 UNIX
+  是 The Open Group 在美國和其他國家的註冊商標; IT DialTone 和 The Open Group
+  是其商標。</para>">
+<!ENTITY tm-attrib.unix "<para>UNIX是 Open Group 
+  在美國和其它國家的註冊商標。</para>">
 <!ENTITY motif "<trademark class='registered'>Motif</trademark>">
 <!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
 
 <!-- http://www.oracle.com/html/trademark.html -->
 <!-- http://www.oracle.com/html/3party.html -->
-<!ENTITY tm-attrib.oracle "<para>Oracle is a registered trademark
-  of Oracle Corporation.</para>">
+<!ENTITY tm-attrib.oracle "<para>Oracle 是 Oracle Corporation 的註冊商標。</para>">
 <!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
 
 <!-- http://www.powerquest.com/legal/ -->
-<!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are
-  registered trademarks of PowerQuest Corporation in the United States
-  and/or other countries.</para>">
+<!ENTITY tm-attrib.powerquest "<para>PowerQuest 和 PartitionMagic 是
+  PowerQuest Corporation 在美國和/或其他國家的註冊商標。</para>">
 <!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
 
 <!-- http://www.qualcomm.com/main/legal.html -->
-<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
-  trademarks of QUALCOMM Incorporated.</para>">
+<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM 和 Eudora 是 QUALCOMM Incorporated 的註冊商標。</para>">
 <!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
 
 <!-- http://www.realnetworks.com/company/logos/policy.html -->
-<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
-  RealAudio are the registered trademarks of RealNetworks,
-  Inc.</para>">
+<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, 和
+  RealAudio 是 RealNetworks, Inc. 的註冊商標。</para>">
 
 <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
 <!-- http://www.redhat.com/legal/legal_statement.html -->
-<!ENTITY tm-attrib.redhat "<para>Red Hat, RPM, are trademarks or
-  registered trademarks of Red Hat, Inc. in the United States and
-  other countries.</para>">
-
-<!ENTITY tm-attrib.sap "<para>SAP, R/3, and mySAP are trademarks or
-  registered trademarks of SAP AG in Germany and in several other
-  countries all over the world.</para>">
+<!ENTITY tm-attrib.redhat "<para>Red Hat, RPM, 是 Red Hat, Inc.
+  在美國和其他國家的註冊商標。</para>">
+
+
+<!ENTITY tm-attrib.sap "<para>SAP, R/3, 和 mySAP 是 SAP AG
+  在德國以及許多其他國家的商標或註冊商標。</para>">
 <!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
 <!ENTITY sap "<trademark class='registered'>SAP</trademark>">
-<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
+<!ENTITY sap.r3 "&sap; &r3;">
 
-<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are
-  registered trademarks of Silicon Graphics, Inc., in the United
-  States and/or other countries worldwide.</para>">
+<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, 和 OpenGL 是 Silicon Graphics, Inc.
+  在美國和/或其他國家的註冊商標。</para>">
 <!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
 
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, and
-  UltraSPARC are trademarks of SPARC International, Inc in the United
-  States and other countries.  Products bearing SPARC trademarks are
-  based upon architecture developed by Sun Microsystems, Inc.</para>">
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, 以及
+  UltraSPARC 是 SPARC International, Inc 在美國和其他國家的商標。
+  為 Sun Microsystems, 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>">
 
 <!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice,
-  Sun Blade, Sun Enterprise, Sun Fire, SunOS, and Ultra are trademarks or registered trademarks of
-  Sun Microsystems, Inc. in the United States and other
-  countries.</para>">
+  Sun Blade, Sun Enterprise, Sun Fire, SunOS, 和 Ultra 是
+  Sun Microsystems, Inc. 在美國和其他國家的商標或註冊商標。</para>">
 <!ENTITY java "<trademark>Java</trademark>">
 <!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
 <!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
@@ -311,65 +277,54 @@
 <!ENTITY solaris "<trademark>Solaris</trademark>">
 <!ENTITY staroffice "<trademark>StarOffice</trademark>">
 <!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
+<!ENTITY sun.blade "<trademark>Sun Blade</trademark>">
+<!ENTITY sun.enterprise "<trademark>Sun Enterprise</trademark>">
+<!ENTITY sun.fire "<trademark>Sun Fire</trademark>">
+<!ENTITY sun.ultra "Sun <trademark>Ultra</trademark>">
 <!ENTITY sunos "<trademark>SunOS</trademark>">
 
 <!-- http://www.symantec.com/legal/legal_note.html -->
-<!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered
-  trademarks of Symantec Corporation in the United States and other
-  countries.</para>">
+<!ENTITY tm-attrib.symantec "<para>Symantec 和 Ghost 是
+  Symantec Corporation 在美國和其他國家的註冊商標。</para>">
 
 <!-- http://www.mathworks.com/company/trademarks.shtml -->
-<!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
-  of The MathWorks, Inc.</para>">
+<!ENTITY tm-attrib.themathworks "<para>MATLAB 是
+  The MathWorks, Inc. 的註冊商標。</para>">
 <!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
 
-<!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
-  Thomson</para>">
+<!ENTITY tm-attrib.thomson "<para>SpeedTouch 是 Thomson 的商標。</para>">
 <!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
 
 <!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta and Crusoe are either
-  trademarks or registered trademarks of Transmeta Corporation in the
-  United States and/or other countries.</para>">
+<!ENTITY tm-attrib.transmeta "<para>Transmeta 和 Crusoe 是 Transmeta Corporation
+  在美國和/或其他國家的商標或註冊商標。</para>">
 <!ENTITY crusoe "<trademark>Crusoe</trademark>">
 <!ENTITY transmeta "<trademark>Transmeta</trademark>">
 
 <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp -->
 <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp -->
-<!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics and Sportster are
-  registered trademarks of U.S. Robotics Corporation.</para>">
+<!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics 和 Sportster 是 U.S. Robotics Corporation 的註冊商標。</para>">
 <!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
 <!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
 
 <!-- http://www.maplesoft.com/trademarks.shtml -->
-<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are
-  trademarks or registered trademarks of Waterloo Maple Inc.</para>">
+<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple 和 Maple 是 Waterloo Maple Inc 的商標或註冊商標</para>">
 <!ENTITY maple "<trademark>Maple</trademark>">
 
 <!-- http://www.wolfram.com/company/terms.html -->
-<!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
-  trademark of Wolfram Research, Inc.</para>">
+<!ENTITY tm-attrib.wolframresearch "<para>Mathematica 是 Wolfram Research, Inc 的註冊商標。</para>">
 <!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
 
 <!-- http://www.vmware.com/legal.html -->
-<!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
-  Inc.</para>">
+<!ENTITY tm-attrib.vmware "<para>VMware 是 VMware,
+  Inc. 的商標</para>">
 
-<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
-  XFree86 Project, Inc.</para>">
+<!ENTITY tm-attrib.xfree86 "<para>XFree86 是 The
+  XFree86 Project, Inc 的商標。.</para>">
 <!ENTITY xfree86 "<trademark>XFree86</trademark>">
 
 <!-- http://www.xiph.org/ -->
-<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks
-  of Xiph.Org.</para>">
+<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis 和 Xiph.Org 是 Xiph.Org 的商標。</para>">
 
-<!ENTITY tm-attrib.general "<para>Many of the designations used by
-  manufacturers and sellers to distinguish their products are claimed
-  as trademarks.  Where those designations appear in this document,
-  and the FreeBSD Project was aware of the trademark claim, the
-  designations have been followed by the <quote>&trade;</quote> or the
-  <quote>&reg;</quote> symbol.</para>">
+<!ENTITY tm-attrib.general "<para>許多製造商和經銷商使用一些稱為商標的圖案或文字設計來彰顯自己的產品。
+  本文中出現的眾多商標,以及 FreeBSD Project 本身廣所人知的商標,後面將以 '&trade;' 或 '&reg;' 符號來標註。</para>">
--- zh_TW.Big5.20060709_2.svn737.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060709154535.C8EB930205>