Attachment 67897 Details for Bug 99968 – zh_TW.Big5.20060709_2.svn737.diff

[patch] zh_TW.Big5.20060709_2.svn737.diff

zh_TW.Big5.20060709_2.svn737.diff (text/plain), 29.62 KB, created by chinsan on 2006-07-09 16:50:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: chinsan

Created: 2006-07-09 16:50:14 UTC

Size: 29.62 KB

patch

obsolete

>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 @@
>+
>+
>+
>+
>+<!ENTITY a.avatar "±ç®õµØ <email>avatar@FreeBSD.org</email>">
>+
>+<!ENTITY a.bmah "°¨·½¯E <email>bmah@FreeBSD.org</email>">
>+
>+<!ENTITY a.clive "ªLªF¼Ý <email>clive@FreeBSD.org</email>">
>+
>+<!ENTITY a.clsung "§º¬F¶© <email>clsung@FreeBSD.org</email>">
>+
>+<!ENTITY a.davidxu "®}¶h¾W <email>davidxu@FreeBSD.org</email>">
>+
>+<!ENTITY a.delphij "§õøÊ <email>delphij@FreeBSD.org</email>">
>+
>+<!ENTITY a.foxfair "J®x»¨ <email>foxfair@FreeBSD.org</email>">
>+
>+<!ENTITY a.hsu "®}±Ó³Ç <email>hsu@FreeBSD.org</email>">
>+
>+<!ENTITY a.ijliao "¹ù^³Ç <email>ijliao@FreeBSD.org</email>">
>+
>+<!ENTITY a.keichii "§d·q¤¸ <email>keichii@FreeBSD.org</email>">
>+
>+<!ENTITY a.kevlo "Ã¹ÁÂ®a°¶ <email>kevlo@FreeBSD.org</email>">
>+
>+<!ENTITY a.leeym "§õ«Û©ú <email>leeym@FreeBSD.org</email>">
>+
>+<!ENTITY a.luoqi "³¯¬¥ªÂ <email>luoqi@FreeBSD.org</email>">
>+
>+<!ENTITY a.pat "§õ¶³¨h <email>pat@FreeBSD.org</email>">
>+
>+<!ENTITY a.rafan "Sºa®¦ <email>rafan@FreeBSD.org</email>">
>+
>+<!ENTITY a.vanilla "®}¤T®õ <email>vanilla@FreeBSD.org</email>">
>+
>+
>+
>+
>+<!ENTITY a.cn.alu "³°®ü¶ <email>alu@cn.FreeBSD.org</email>">
>+
>+<!ENTITY a.cn.delphij "§õøÊ <email>delphij@FreeBSD.org</email>">
>+
>+<!ENTITY a.cn.gavin "¿p¥ß¶W <email>gavin@cn.FreeBSD.org</email>">
>+
>+<!ENTITY a.cn.intron "<email>intron@cn.FreeBSD.org</email>">
>+
>+<!ENTITY a.cn.lih "§õ¯E·½ <email>lih@cn.FreeBSD.org</email>">
>+
>+<!ENTITY a.cn.wjf "·Å«T®p <email>wjf@cn.FreeBSD.org</email>">
>+
>+<!ENTITY a.cn.yarshure "¤Õ²»ªi <email>yarshure@cn.FreeBSD.org</email>">
>+
>+
>+
>+
>+<!ENTITY a.tw.chinsan "¶À«C¤s <email>chinsan.tw@gmail.com</email>">
>+
>+<!ENTITY a.tw.psilotum "ªL¬F¹D <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 @@
> 
> 
> <!ENTITY doc.html.charset "Big5">
>+
>+<!ENTITY mdash "¡X¡X">
>+
>+<!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 ©M HomeConnect ¬O 3Com Corporation ªºµù¥U°Ó¼Ð¡C</para>">
> 
> <!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 ©M Escalade ¬O 3ware Inc ªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
> <!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
> 
> 
>-<!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
>-  Adaptec, Inc.</para>">
>+<!ENTITY tm-attrib.adaptec "<para>Adaptec ¬O
>+  Adaptec, Inc. ªºµù¥U°Ó¼Ð¡C</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, ¥H¤Î
>+  PostScript ¬O Adobe
>+  Systems Incorporated ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</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>">
> 
> 
> <!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, ©M PCnet ¬O
>+ Advanced Micro Devices, Inc. ªº°Ó¼Ð¡C</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, ¥H¤Î TrueType ¬O Apple Computer, Inc. ¦b¬ü°ê¥H¤Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</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 ¬O ARM
>+  Limited. ªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY arm "<trademark class='registered'>ARM</trademark>">
> 
> 
>-<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth word mark is owned
>-  by the Bluetooth SIG, Inc.</para>">
>+<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth ¤å¦r¼Ð»xÄÝ©ó 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 ¬O Broadcom Corporation ©M/©Î¨ä¤l¤½¥qªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
> 
> 
>-<!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, ¥H¤Î
>+  VPN-1 ¬O Check Point Software Technologies
>+  Ltd. ªº°Ó¼Ð¡C</para>">
>+
>+<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, ©M IOS
>+  ¬O Cisco Systems, Inc. ©M/©Î¨äªþÄÝ¾÷ºc¦b¬ü°ê©M¤@¨Ç¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</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 ©M WordPerfect ¬O Corel Corporation ©M/©Î¨ä¤l¤½¥q
>+  ¦b¥[®³¤j¡B¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>">
> 
> 
>-<!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 ¬O
>+  Creative Technology Ltd. ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
> 
> 
>-<!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
>-  John D. Polstra.</para>">
>+<!ENTITY tm-attrib.cvsup "<para>CVSup ¬O
>+  John D. Polstra ªºµù¥U°Ó¼Ð¡C</para>">
> 
> 
> <!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
>-  Optiplex, PowerEdge are trademarks or registered trademarks of Dell
>-  Computer Corporation</para>">
>+  Optiplex, PowerEdge ¬O Dell
>+  Computer Corporation ªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY dell "<trademark>Dell</trademark>">
> <!ENTITY poweredge "<trademark>PowerEdge</trademark>">
> 
> 
>-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection are registered
>-  trademarks of Seiko Epson Corporation.</para>">
>+<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection ¬O
>+  Epson Corporationªºµù¥U°Ó¼Ð¡C</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 ¬O FreeBSD°òª÷·|ªºµù¥U°Ó¼Ð</para>">
> 
> 
> <!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, ©M Times Roman ¬O Heidelberger Druckmaschinen AG ¦b¬ü°ê¥H¤Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>">
>+
>+
>+
>+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, ©M ThinkPad ¬O
>+  °ê»Ú°Ó¥Î¾÷¾¹¤½¥q¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð©Î°Ó¼Ð¡C</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, ©M 802 ¬O Institute of Electrical and Electronics Engineers,
>+  Inc. ¦b¬ü°êªºµù¥U°Ó¼Ð¡C</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, ©M Xeon ¬O Intel Corporation
>+  ¤Î¨ä¤À¤ä¾÷ºc¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</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>">
> 
> 
>-<!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 ©M Quicken ¬O Intuit Inc., ©Î¨ä¤l¤½¥q¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>">
>+
>+
>+
>+<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, ©M Jaz ¬O Iomega Corporation
>+  ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</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 ©M EasyIO ¬O Lantronix Corporation ªº°Ó¼Ð¡C</para>">
> <!ENTITY easyio "<trademark>EasyIO</trademark>">
> 
> 
>-<!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
>-  Linus Torvalds.</para>">
>+<!ENTITY tm-attrib.linux "<para>Linux ¬O Linus Torvalds ªºµù¥U°Ó¼Ð¡C</para>">
>+
> <!ENTITY linux "<trademark class='registered'>Linux</trademark>">
> 
> 
> <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
>-  MegaRAID and Mylex are trademarks or registered trademarks of LSI
>-  Logic Corp.</para>">
>+  MegaRAID ©M Mylex ¬O LSI
>+  Logic Corp ªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</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, ¥H¤Î Shockwave
>+  Macromedia, Inc. ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</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, ©M Windows NT ¬O Microsoft Corporation
>+  ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</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 ©M R4000 ¬O MIPS Technologies, Inc.
>+  ¦b¬ü°ê¥H¤Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
> 
> 
>-<!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 ¬O
>+  MySQL AB ¦b¬ü°ê¡B¼Ú·ù©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY mysql "<trademark>MySQL</trademark>">
> 
> 
>-<!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 ©M DiskOnChip ¬O M-Systems Flash Disk
>+  Pioneers, Ltd. ªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
> 
> 
>-<!ENTITY tm-attrib.netbsd "<para>NetBSD is a registered trademark of
>-  the NetBSD Foundation.</para>">
>+<!ENTITY tm-attrib.netbsd "<para>NetBSD¬O NetBSD Foundationªºµù¥U°Ó¼Ð¡C</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 ¥H¤Î Netscape Navigator
>+  ¬O Netscape Communications Corporation ¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</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>">
> 
> 
>-<!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 ©M NextHop ¬O NextHop ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY gated "<trademark class='registered'>GateD</trademark>">
> 
> 
>-<!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, ©M
>+  NLM ¬O Novell, Inc. ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>">
>+
>+<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, ©M UNIX
>+  ¬O The Open Group ¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡F IT DialTone ©M The Open Group
>+  ¬O¨ä°Ó¼Ð¡C</para>">
>+<!ENTITY tm-attrib.unix "<para>UNIX¬O Open Group 
>+  ¦b¬ü°ê©M¨ä¥¦°ê®aªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY motif "<trademark class='registered'>Motif</trademark>">
> <!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
> 
> 
> 
>-<!ENTITY tm-attrib.oracle "<para>Oracle is a registered trademark
>-  of Oracle Corporation.</para>">
>+<!ENTITY tm-attrib.oracle "<para>Oracle ¬O Oracle Corporation ªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
> 
> 
>-<!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 ©M PartitionMagic ¬O
>+  PowerQuest Corporation ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
> 
> 
>-<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
>-  trademarks of QUALCOMM Incorporated.</para>">
>+<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM ©M Eudora ¬O QUALCOMM Incorporated ªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
> 
> 
>-<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
>-  RealAudio are the registered trademarks of RealNetworks,
>-  Inc.</para>">
>+<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, ©M
>+  RealAudio ¬O RealNetworks, Inc. ªºµù¥U°Ó¼Ð¡C</para>">
> 
> 
> 
>-<!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, ¬O Red Hat, Inc.
>+  ¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>">
>+
>+
>+<!ENTITY tm-attrib.sap "<para>SAP, R/3, ©M mySAP ¬O SAP AG
>+  ¦b¼w°ê¥H¤Î³\¦h¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</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, ©M OpenGL ¬O Silicon Graphics, Inc.
>+  ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</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, ¥H¤Î
>+  UltraSPARC ¬O SPARC International, Inc ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð¡C
>+  ¬° Sun Microsystems, Inc. ©Ò¶}µoªº¬[ºc¡A¥]§t SPARC °Ó¼Ðªº²£«~¡C</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, ©M Ultra ¬O
>+  Sun Microsystems, Inc. ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</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>">
> 
> 
>-<!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 ©M Ghost ¬O
>+  Symantec Corporation ¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>">
> 
> 
>-<!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
>-  of The MathWorks, Inc.</para>">
>+<!ENTITY tm-attrib.themathworks "<para>MATLAB ¬O
>+  The MathWorks, Inc. ªºµù¥U°Ó¼Ð¡C</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 ¬O Thomson ªº°Ó¼Ð¡C</para>">
> <!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
> 
> 
>-<!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 ©M Crusoe ¬O Transmeta Corporation
>+  ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY crusoe "<trademark>Crusoe</trademark>">
> <!ENTITY transmeta "<trademark>Transmeta</trademark>">
> 
> 
> 
>-<!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 ©M Sportster ¬O U.S. Robotics Corporation ªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
> <!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
> 
> 
>-<!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 ©M Maple ¬O Waterloo Maple Inc ªº°Ó¼Ð©Îµù¥U°Ó¼Ð</para>">
> <!ENTITY maple "<trademark>Maple</trademark>">
> 
> 
>-<!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
>-  trademark of Wolfram Research, Inc.</para>">
>+<!ENTITY tm-attrib.wolframresearch "<para>Mathematica ¬O Wolfram Research, Inc ªºµù¥U°Ó¼Ð¡C</para>">
> <!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
> 
> 
>-<!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
>-  Inc.</para>">
>+<!ENTITY tm-attrib.vmware "<para>VMware ¬O VMware,
>+  Inc. ªº°Ó¼Ð</para>">
> 
>-<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
>-  XFree86 Project, Inc.</para>">
>+<!ENTITY tm-attrib.xfree86 "<para>XFree86 ¬O The
>+  XFree86 Project, Inc ªº°Ó¼Ð¡C.</para>">
> <!ENTITY xfree86 "<trademark>XFree86</trademark>">
> 
> 
>-<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks
>-  of Xiph.Org.</para>">
>+<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis ©M Xiph.Org ¬O Xiph.Org ªº°Ó¼Ð¡C</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>³\¦h»s³y°Ó©M¸g¾P°Ó¨Ï¥Î¤@¨ÇºÙ¬°°Ó¼Ðªº¹Ï®×©Î¤å¦r³]p¨Ó¹üÅã¦Û¤vªº²£«~¡C
>+  ¥»¤å¤¤¥X²{ªº²³¦h°Ó¼Ð¡A¥H¤Î FreeBSD Project ¥»¨¼s©Ò¤Hª¾ªº°Ó¼Ð¡A«á±±N¥H '&trade;' ©Î '&reg;' ²Å¸¹¨Ó¼Ðµù¡C</para>">

Actions: View | Diff

Attachments on bug 99968: 67897