Date: Sat, 8 Jun 2013 17:20:50 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41880 - in projects/db5: el_GR.ISO8859-7/share/xml es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/xml hu_HU.ISO8859-2/share/xml mn_MN.UTF-8/share/xml nl_NL.ISO8859-1/share/xml ru_RU.K... Message-ID: <201306081720.r58HKoF8040292@svn.freebsd.org>
index | next in thread | raw e-mail
Author: gabor Date: Sat Jun 8 17:20:50 2013 New Revision: 41880 URL: http://svnweb.freebsd.org/changeset/doc/41880 Log: - trademark is not allowed in application so just use ™ or ® Modified: projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent projects/db5/mn_MN.UTF-8/share/xml/trademarks.ent projects/db5/nl_NL.ISO8859-1/share/xml/trademarks.ent projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent projects/db5/share/xml/trademarks.ent projects/db5/zh_CN.GB2312/share/xml/trademarks.ent projects/db5/zh_TW.Big5/share/xml/trademarks.ent Modified: projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent ============================================================================== --- projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent Sat Jun 8 17:03:03 2013 (r41879) +++ projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent Sat Jun 8 17:20:50 2013 (r41880) @@ -25,80 +25,80 @@ <!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.3com "3Com®"> <!ENTITY tm-attrib.3ware "<para>Οι λέξεις 3ware και Escalade είναι κατοχυρωμένα εμπορικά σύμβολα της 3ware Inc.</para>"> -<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> +<!ENTITY tm.3ware "3ware®"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Η λέξη Adaptec είναι κατοχυρωμένο εμπορικό σύμβολο της Adaptec, Inc.</para>"> -<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> +<!ENTITY adaptec "Adaptec®"> <!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 Reader</trademark>"> -<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>"> -<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>"> +<!ENTITY acrobat "Acrobat®"> +<!ENTITY acrobat.reader "Acrobat Reader®"> +<!ENTITY adobe "Adobe®"> +<!ENTITY postscript "PostScript®"> <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html --> <!ENTITY tm-attrib.amd "<para>Οι λέξεις ή φράσεις AMD, AMD Athlon, AMD Opteron, Élan, και PCnet είναι εμπορικά σύμβολα της Advanced Micro Devices, Inc.</para>"> -<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> -<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> -<!ENTITY athlon "<trademark>Athlon</trademark>"> -<!ENTITY elan "<trademark>Élan</trademark>"> -<!ENTITY opteron "<trademark>Opteron</trademark>"> +<!ENTITY amd.athlon "AMD Athlon™"> +<!ENTITY amd.opteron "AMD Opteron™"> +<!ENTITY athlon "Athlon™"> +<!ENTITY elan "Élan™"> +<!ENTITY opteron "Opteron™"> <!ENTITY tm-attrib.apple "<para>Οι λέξεις ή φράσεις Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, και TrueType είναι εμπορικά σύμβολα της Apple Computer, Inc., κατοχυρωμένα στις Ηνωμένες Πολιτείες και σε άλλες χώρες.</para>"> -<!ENTITY airport "<trademark class='registered'>AirPort</trademark>"> -<!ENTITY apple "<trademark class='registered'>Apple</trademark>"> -<!ENTITY firewire "<trademark class='registered'>FireWire</trademark>"> -<!ENTITY imac "<trademark class='registered'>iMac</trademark>"> -<!ENTITY mac "<trademark class='registered'>Mac</trademark>"> -<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>"> -<!ENTITY macos "<trademark class='registered'>Mac OS</trademark>"> -<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>"> -<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>"> +<!ENTITY airport "AirPort®"> +<!ENTITY apple "Apple®"> +<!ENTITY firewire "FireWire®"> +<!ENTITY imac "iMac®"> +<!ENTITY mac "Mac®"> +<!ENTITY macintosh "Macintosh®"> +<!ENTITY macos "Mac OS®"> +<!ENTITY quicktime "Quicktime®"> +<!ENTITY truetype "TrueType®"> <!ENTITY tm-attrib.arm "<para>Η λέξη ARM είναι κατοχυρωμένο εμπορικό σύμβολο της ARM Limited.</para>"> -<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> +<!ENTITY arm "ARM®"> <!ENTITY tm-attrib.cisco "<para>Οι λέξεις ή φράσεις Cisco, Catalyst, και IOS είναι κατοχυρωμένα εμπορικά σύμβολα της Cisco Systems, Inc. ή/και των συνεργατών της στις Ηνωμένες Πολιτείες και σε ορισμένες άλλες χώρες."> -<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>"> -<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>"> -<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>"> -<!ENTITY ios "<trademark class='registered'>IOS</trademark>"> +<!ENTITY cisco "Cisco®"> +<!ENTITY catalyst "Catalyst®"> +<!ENTITY etherchannel "EtherChannel®"> +<!ENTITY ios "IOS®"> <!ENTITY tm-attrib.corel "<para>Οι λέξεις Corel και WordPerfect είναι εμπορικά σύμβολα ή κατοχυρωμένα εμπορικά σύμβολα της Corel Corporation ή/και των θυγατρικών της στον Καναδά, τις Ηνωμένες Πολιτείες ή/και σε άλλες χώρες.</para>"> -<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>"> +<!ENTITY wordperfect "WordPerfect®"> <!-- http://www.coverity.com/html/press_story45_07_25_07.html --> <!ENTITY tm-attrib.coverity "<para>Η λέξη Coverity είναι ένα κατοχυρωμένο εμπορικό σύμβολο. Οι λέξεις ή φράσεις Coverity Extend, Coverity Prevent και Coverity Prevent SQS είναι εμπορικά σύμβολα της Coverity, Inc.</para>"> -<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> -<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> +<!ENTITY coverity "Coverity®"> +<!ENTITY coverity.prevent "Coverity Prevent®"> <!-- http://www.creative.com/legal.asp --> <!ENTITY tm-attrib.creative "<para>Η φράση Sound Blaster είναι εμπορικό σύμβολο της Creative Technology Ltd. στις Ηνωμένες Πολιτείες ή/και σε άλλες χώρες.</para>"> -<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> +<!ENTITY soundblaster "SoundBlaster®"> <!-- http://www.cvsup.org/ --> <!ENTITY tm-attrib.cvsup "<para>Η λέξη CVSup είναι κατοχυρωμένο εμπορικό @@ -107,7 +107,7 @@ Coverity, Inc.</para>"> <!ENTITY tm-attrib.freebsd "<para>Το FreeBSD είναι ένα κατοχυρωμένο εμπορικό σύμβολο του FreeBSD Foundation.</para>"> -<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>"> +<!ENTITY fujitsu "Fujitsu®"> <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp --> <!ENTITY tm-attrib.heidelberger "<para>Οι λέξεις ή φράσεις Heidelberg, @@ -119,32 +119,32 @@ Coverity, Inc.</para>"> OS/2, PowerPC, PS/2, S/390, και ThinkPad είναι εμπορικά σύμβολα της International Business Machines Corporation στις Ηνωμένες Πολιτείες, άλλες χώρες, ή και στα δύο ταυτόχρονα.</para>"> -<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> -<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> -<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> -<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> -<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> -<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> +<!ENTITY aix "AIX®"> +<!ENTITY os2 "OS/2®"> +<!ENTITY powerpc "PowerPC®"> +<!ENTITY ps2 "PS/2®"> +<!ENTITY s390 "S/390®"> +<!ENTITY thinkpad "ThinkPad®"> <!ENTITY tm-attrib.ieee "<para>Οι λέξεις IEEE, POSIX, και 802 είναι κατοχυρωμένα εμπορικά σύμβολα του Institute of Electrical and Electronics Engineers, Inc. στις Ηνωμένες Πολιτείες.</para>"> -<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>"> -<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> +<!ENTITY ieee "IEEE®"> +<!ENTITY posix "POSIX®"> <!ENTITY tm-attrib.intel "<para>Οι λέξεις Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, και Xeon είναι εμπορικά σύμβολα ή κατοχυρωμένα εμπορικά σύμβολα της Intel Corporation και των θυγατρικών της στις Ηνωμένες Πολιτείες και σε άλλες χώρες.</para>"> -<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> -<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> -<!ENTITY i386 "<trademark>i386</trademark>"> -<!ENTITY i486 "<trademark>i486</trademark>"> -<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> -<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> -<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> -<!ENTITY core "<trademark>Core</trademark>"> -<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY celeron "Celeron®"> +<!ENTITY etherexpress "EtherExpress™"> +<!ENTITY i386 "i386™"> +<!ENTITY i486 "i486™"> +<!ENTITY intel "Intel®"> +<!ENTITY itanium "Itanium®"> +<!ENTITY pentium "Pentium®"> +<!ENTITY core "Core™"> +<!ENTITY xeon "Xeon™"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Οι λέξεις Intuit και Quicken είναι @@ -155,60 +155,60 @@ Coverity, 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 iomegazip "Zip®"> +<!ENTITY jaz "Jaz®"> <!ENTITY tm-attrib.lantronix "<para>Οι λέξεις Lantronix και EasyIO είναι εμπορικά σύμβολα της Lantronix Corporation.</para>"> -<!ENTITY easyio "<trademark>EasyIO</trademark>"> +<!ENTITY easyio "EasyIO™"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Το Linux είναι ένα κατοχυρωμένα εμπορικό σύμβολο του Linus Torvalds στις Ηνωμένες Πολιτείες.</para>"> -<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> +<!ENTITY linux "Linux®"> <!-- http://www.lsilogic.com/trademrk.html --> <!ENTITY tm-attrib.lsilogic "<para>Οι λέξεις LSI Logic, AcceleRAID, eXtremeRAID, 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 acceleraid "AcceleRAID™"> +<!ENTITY megaraid "MegaRAID®"> +<!ENTITY mylex "Mylex®"> <!ENTITY tm-attrib.macromedia "<para>Οι λέξεις Macromedia, Flash, και Shockwave είναι εμπορικά σύμβολα ή κατοχυρωμένα εμπορικά σύμβολα της Macromedia, Inc. στις Ηνωμένες Πολιτείες και/ή σε άλλες χώρες.</para>"> -<!ENTITY flash "<trademark>Flash</trademark>"> -<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> +<!ENTITY flash "Flash™"> +<!ENTITY macromedia "Macromedia®"> <!ENTITY tm-attrib.microsoft "<para>Οι λέξεις Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media, και Windows NT είναι είτε κατοχυρωμένα εμπορικά σύμβολα ή εμπορικά σύμβολα της Microsoft Corporation στις Ηνωμένες Πολιτείες και/ή σε άλλες χώρες.</para>"> -<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> -<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> +<!ENTITY intellimouse "IntelliMouse®"> +<!ENTITY microsoft "Microsoft®"> <!ENTITY microsoft.windows "µsoft; &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 ms-dos "MS-DOS®"> +<!ENTITY outlook "Outlook®"> +<!ENTITY windows "Windows®"> +<!ENTITY windows.media "Windows Media®"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> +<!ENTITY windowsnt "Windows NT®"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>Οι λέξεις MIPS και R4000 είναι κατοχυρωμένα εμπορικά σύμβολα της MIPS Technologies, Inc. στις Ηνωμένες Πολιτείες και σε άλλες χώρες.</para>"> -<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> +<!ENTITY mips "MIPS®"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "<trademark>MySQL</trademark>"> +<!ENTITY mysql "MySQL™"> <!-- http://www.m-sys.com/content/LegalTerms.asp --> <!ENTITY tm-attrib.m-systems "<para>Οι λέξεις M-Systems και DiskOnChip είναι εμπορικά σύμβολα ή κατοχυρωμένα εμπορικά σύμβολα της M-Systems Flash Disk Pioneers, Ltd.</para>"> -<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> +<!ENTITY diskonchip "DiskOnChip®"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>Η λέξη NetBSD είναι ένα κατοχυρωμένο εμπορικό @@ -217,14 +217,14 @@ Coverity, Inc.</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 Navigator</trademark>"> +<!ENTITY netscape "Netscape®"> +<!ENTITY netscape.navigator "Netscape Navigator®"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>Οι λέξεις GateD και NextHop είναι κατοχυρωμένα εμπορικά σύμβολα και εμπορικά σύμβολα της NextHop στις Η.Π.Α. και άλλες χώρες.</para>"> -<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> +<!ENTITY gated "GateD®"> <!ENTITY tm-attrib.opengroup "<para>Οι λέξεις Motif, OSF/1, και UNIX είναι κατοχυρωμένα εμπορικά σύμβολα και οι λέξεις ή φράσεις IT @@ -233,31 +233,31 @@ Coverity, Inc.</para>"> <!ENTITY tm-attrib.unix "<para>Η λέξη UNIX είναι κατοχυρωμένο εμπορικό σύμβολο του Open Group στις Ηνωμένες Πολιτείες και σε άλλες χώρες.</para>"> -<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> -<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> +<!ENTITY motif "Motif®"> +<!ENTITY unix "UNIX®"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Η λέξη Oracle είναι κατοχυρωμένο εμπορικό σύμβολο της Oracle Corporation.</para>"> -<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> +<!ENTITY oracle "Oracle®"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>Οι λέξεις PowerQuest και PartitionMagic είναι κατοχυρωμένα εμπορικά σύμβολα της PowerQuest Corporation στις Ηνωμένες Πολιτείες και/ή σε άλλες χώρες.</para>"> -<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> +<!ENTITY partitionmagic "PartitionMagic®"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>Οι λέξεις QUALCOMM και Eudora είναι κατοχυρωμένα εμπορικά σύμβολα της QUALCOMM Incorporated.</para>"> -<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> +<!ENTITY eudora "Eudora®"> <!-- http://www.realnetworks.com/company/logos/policy.html --> <!ENTITY tm-attrib.realnetworks "<para>Οι λέξεις RealNetworks, RealPlayer και RealAudio είναι κατοχυρωμένα εμπορικά σύμβολα της RealNetworks, Inc.</para>"> -<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>"> +<!ENTITY realplayer "RealPlayer®"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -268,23 +268,23 @@ Coverity, 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 r3 "R/3®"> +<!ENTITY sap "SAP®"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>Οι λέξεις οι φράσεις Silicon Graphics, SGI, και OpenGL είναι κατοχυρωμένα εμπορικά σύμβολα της Silicon Graphics, Inc. στις Ηνωμένες Πολιτείες και/ή σε άλλες χώρες στον κόσμο.</para>"> -<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> +<!ENTITY opengl "OpenGL®"> <!ENTITY tm-attrib.sparc "<para>Οι λέξεις ή φράσεις SPARC, SPARC64, και UltraSPARC είναι εμπορικά σύμβολα της SPARC International, Inc. στις Ηνωμένες Πολιτείες και σε άλλες χώρες. Η SPARC International Inc. κατέχει όλα τα εμπορικά δικαιώματα των συμβόλων SPARC και επιτρέπει την ορθή χρήση τους από όλα τα μέλη της, κατόπιν σχετικής άδειας.</para>"> -<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>"> -<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>"> -<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> +<!ENTITY sparc "SPARC®"> +<!ENTITY sparc64 "SPARC64®"> +<!ENTITY ultrasparc "UltraSPARC®"> <!-- http://www.sun.com/suntrademarks/ --> @@ -293,19 +293,19 @@ Coverity, Inc.</para>"> Solaris, StarOffice, SunOS και VirtualBox είναι εμπορικά σύμβολα ή κατοχυρωμένα εμπορικά σύμβολα της Sun Microsystems, Inc. στις Ηνωμένες Πολιτείες και σε άλλες χώρες.</para>"> -<!ENTITY java "<trademark>Java</trademark>"> -<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> -<!ENTITY jdk "<trademark>JDK</trademark>"> -<!ENTITY jre "<trademark>JRE</trademark>"> -<!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>"> -<!ENTITY sunos "<trademark>SunOS</trademark>"> -<!ENTITY virtualbox "<trademark>VirtualBox</trademark>"> +<!ENTITY java "Java™"> +<!ENTITY java.virtual.machine "Java Virtual Machine™"> +<!ENTITY jdk "JDK™"> +<!ENTITY jre "JRE™"> +<!ENTITY jsp "JSP™"> +<!ENTITY jvm "JVM™"> +<!ENTITY netra "Netra™"> +<!ENTITY openjdk "OpenJDK™"> +<!ENTITY solaris "Solaris™"> +<!ENTITY staroffice "StarOffice™"> +<!ENTITY sun "Sun™"> +<!ENTITY sunos "SunOS™"> +<!ENTITY virtualbox "VirtualBox™"> <!-- http://www.symantec.com/legal/legal_note.html --> <!ENTITY tm-attrib.symantec "<para>Οι λέξεις Symantec και Ghost είναι @@ -315,40 +315,40 @@ Coverity, Inc.</para>"> <!-- http://www.mathworks.com/company/trademarks.shtml --> <!ENTITY tm-attrib.themathworks "<para>Η λέξη MATLAB είναι ένα κατοχυρωμένο εμπορικό σύμβολο της The MathWorks, Inc.</para>"> -<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> +<!ENTITY matlab "MATLAB®"> <!ENTITY tm-attrib.thomson "<para>Η λέξη SpeedTouch είναι ένα εμπορικό σύμβολο της Thomson</para>"> -<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> +<!ENTITY speedtouch "SpeedTouch™"> <!-- 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 και Sportster είναι κατοχυρωμένα εμπορικά σύμβολα της U.S. Robotics Corporation.</para>"> -<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> -<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> +<!ENTITY sportster "Sportster®"> +<!ENTITY usrobotics "U.S. Robotics®"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Οι λέξεις ή φράσεις Waterloo Maple και Maple είναι εμπορικά ή κατοχυρωμένα εμπορικά σύμβολα της Waterloo Maple Inc.</para>"> -<!ENTITY maple "<trademark>Maple</trademark>"> +<!ENTITY maple "Maple™"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Η λέξη Mathematica είναι κατοχυρωμένο εμπορικό σύμβολο της Wolfram Research, Inc.</para>"> -<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> +<!ENTITY mathematica "Mathematica®"> <!-- http://www.vmware.com/legal.html --> <!ENTITY tm-attrib.vmware "<para>Η λέξη VMware είναι εμπορικό σύμβολο της VMware, Inc.</para>"> <!-- http://www.xensource.com/xen-tm-faq.html --> -<!ENTITY xen "<trademark>Xen</trademark>"> +<!ENTITY xen "Xen™"> <!ENTITY tm-attrib.xfree86 "<para>Η λέξη XFree86 είναι ένα εμπορικό σύμβολο του The XFree86 Project, Inc.</para>"> -<!ENTITY xfree86 "<trademark>XFree86</trademark>"> +<!ENTITY xfree86 "XFree86™"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Οι λέξεις ή φράσεις Ogg Vorbis και Xiph.Org Modified: projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent ============================================================================== --- projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent Sat Jun 8 17:03:03 2013 (r41879) +++ projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent Sat Jun 8 17:20:50 2013 (r41880) @@ -16,78 +16,78 @@ <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered trademarks of 3Com Corporation.</para>"> <!-- An SGML entity can't start with a number... --> -<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> +<!ENTITY tm.3com "3Com®"> <!ENTITY tm-attrib.3ware "<para>3ware is a registered trademarks of 3ware Inc.</para>"> -<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> +<!ENTITY tm.3ware "3ware®"> <!-- 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 adaptec "<trademark class='registered'>Adaptec</trademark>"> +<!ENTITY adaptec "Adaptec®"> <!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 acrobat "<trademark class='registered'>Acrobat</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 acrobat "Acrobat®"> +<!ENTITY acrobat.reader "Acrobat Reader®"> +<!ENTITY adobe "Adobe®"> +<!ENTITY postscript "PostScript®"> <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html --> <!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon, AMD Opteron, Athlon, Ιlan, Opteron, and PCnet are trademarks of Advanced Micro Devices, Inc.</para>"> -<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> -<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> -<!ENTITY athlon "<trademark>Athlon</trademark>"> -<!ENTITY elan "<trademark>Ιlan</trademark>"> -<!ENTITY opteron "<trademark>Opteron</trademark>"> +<!ENTITY amd.athlon "AMD Athlon™"> +<!ENTITY amd.opteron "AMD Opteron™"> +<!ENTITY athlon "Athlon™"> +<!ENTITY elan "Ιlan™"> +<!ENTITY opteron "Opteron™"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Computer, Inc., registered in the United States and other countries.</para>"> -<!ENTITY airport "<trademark class='registered'>AirPort</trademark>"> -<!ENTITY apple "<trademark class='registered'>Apple</trademark>"> -<!ENTITY firewire "<trademark class='registered'>FireWire</trademark>"> -<!ENTITY imac "<trademark class='registered'>iMac</trademark>"> -<!ENTITY mac "<trademark class='registered'>Mac</trademark>"> -<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>"> -<!ENTITY macos "<trademark class='registered'>Mac OS</trademark>"> -<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>"> -<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>"> +<!ENTITY airport "AirPort®"> +<!ENTITY apple "Apple®"> +<!ENTITY firewire "FireWire®"> +<!ENTITY imac "iMac®"> +<!ENTITY mac "Mac®"> +<!ENTITY macintosh "Macintosh®"> +<!ENTITY macos "Mac OS®"> +<!ENTITY quicktime "Quicktime®"> +<!ENTITY truetype "TrueType®"> <!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM Limited.</para>"> -<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> +<!ENTITY arm "ARM®"> <!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 catalyst "<trademark class='registered'>Catalyst</trademark>"> -<!ENTITY ios "<trademark class='registered'>IOS</trademark>"> +<!ENTITY catalyst "Catalyst®"> +<!ENTITY ios "IOS®"> <!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 wordperfect "<trademark class='registered'>WordPerfect</trademark>"> +<!ENTITY wordperfect "WordPerfect®"> <!-- http://www.coverity.com/html/press_story45_07_25_07.html --> <!ENTITY tm-attrib.coverity "<para>Coverity is a registered trademark; Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of Coverity, Inc.</para>"> -<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> -<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> +<!ENTITY coverity "Coverity®"> +<!ENTITY coverity.prevent "Coverity Prevent®"> <!-- 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 soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> +<!ENTITY soundblaster "SoundBlaster®"> <!-- http://www.cvsup.org/ --> <!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of @@ -106,32 +106,32 @@ Coverity, Inc.</para>"> PowerPC, PS/2, S/390, and ThinkPad are trademarks of International Business Machines Corporation in the United States, other countries, or both.</para>"> -<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> -<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> -<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> -<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> -<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> -<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> +<!ENTITY aix "AIX®"> +<!ENTITY os2 "OS/2®"> +<!ENTITY powerpc "PowerPC®"> +<!ENTITY ps2 "PS/2®"> +<!ENTITY s390 "S/390®"> +<!ENTITY thinkpad "ThinkPad®"> <!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 posix "<trademark class='registered'>POSIX</trademark>"> +<!ENTITY posix "POSIX®"> <!-- http://www.intel.com/intel/legal/tmnouns2.htm --> <!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>"> -<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> -<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> -<!ENTITY i386 "<trademark>i386</trademark>"> -<!ENTITY i486 "<trademark>i486</trademark>"> -<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> -<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> -<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> -<!ENTITY xeon "<trademark>Xeon</trademark>"> -<!ENTITY core "<trademark>Core</trademark>"> +<!ENTITY celeron "Celeron®"> +<!ENTITY etherexpress "EtherExpress™"> +<!ENTITY i386 "i386™"> +<!ENTITY i486 "i486™"> +<!ENTITY intel "Intel®"> +<!ENTITY itanium "Itanium®"> +<!ENTITY pentium "Pentium®"> +<!ENTITY xeon "Xeon™"> +<!ENTITY core "Core™"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered @@ -141,60 +141,60 @@ Coverity, Inc.</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 iomegazip "<trademark class='registered'>Zip</trademark>"> -<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> +<!ENTITY iomegazip "Zip®"> +<!ENTITY jaz "Jaz®"> <!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are trademarks of Lantronix Corporation.</para>"> -<!ENTITY easyio "<trademark>EasyIO</trademark>"> +<!ENTITY easyio "EasyIO™"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of Linus Torvalds.</para>"> -<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> +<!ENTITY linux "Linux®"> <!-- 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>"> -<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> -<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> -<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> +<!ENTITY acceleraid "AcceleRAID™"> +<!ENTITY megaraid "MegaRAID®"> +<!ENTITY mylex "Mylex®"> <!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 flash "<trademark>Flash</trademark>"> -<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> +<!ENTITY flash "Flash™"> +<!ENTITY macromedia "Macromedia®"> <!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>"> -<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> -<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> +<!ENTITY intellimouse "IntelliMouse®"> +<!ENTITY microsoft "Microsoft®"> <!ENTITY microsoft.windows "µsoft; &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 ms-dos "MS-DOS®"> +<!ENTITY outlook "Outlook®"> +<!ENTITY windows "Windows®"> +<!ENTITY windows.media "Windows Media®"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> +<!ENTITY windowsnt "Windows NT®"> <!ENTITY windowsxp "&windows; 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 mips "<trademark class='registered'>MIPS</trademark>"> +<!ENTITY mips "MIPS®"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "<trademark>MySQL</trademark>"> +<!ENTITY mysql "MySQL™"> <!-- 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 diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> +<!ENTITY diskonchip "DiskOnChip®"> <!-- 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 @@ -203,14 +203,14 @@ Coverity, Inc.</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 netscape "<trademark class='registered'>Netscape</trademark>"> -<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> +<!ENTITY netscape "Netscape®"> +<!ENTITY netscape.navigator "Netscape Navigator®"> <!-- 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 gated "<trademark class='registered'>GateD</trademark>"> +<!ENTITY gated "GateD®"> <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are registered trademarks and IT DialTone and The Open Group are @@ -218,31 +218,31 @@ Coverity, Inc.</para>"> 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 motif "<trademark class='registered'>Motif</trademark>"> -<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> +<!ENTITY motif "Motif®"> +<!ENTITY unix "UNIX®"> <!-- 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 oracle "<trademark class='registered'>Oracle</trademark>"> +<!ENTITY oracle "Oracle®"> <!-- 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 partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> +<!ENTITY partitionmagic "PartitionMagic®"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered trademarks of QUALCOMM Incorporated.</para>"> -<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> +<!ENTITY eudora "Eudora®"> <!-- 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 realplayer "<trademark class='registered'>RealPlayer</trademark>"> +<!ENTITY realplayer "RealPlayer®"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -253,22 +253,22 @@ Coverity, Inc.</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 r3 "<trademark class='registered'>R/3</trademark>"> -<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> +<!ENTITY r3 "R/3®"> +<!ENTITY sap "SAP®"> <!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 opengl "<trademark class='registered'>OpenGL</trademark>"> +<!ENTITY opengl "OpenGL®"> <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, 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 sparc "<trademark class='registered'>Sparc</trademark>"> -<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> -<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> +<!ENTITY sparc "Sparc®"> +<!ENTITY sparc64 "Sparc64®"> +<!ENTITY ultrasparc "UltraSPARC®"> <!-- http://www.sun.com/suntrademarks/ --> @@ -277,17 +277,17 @@ Coverity, Inc.</para>"> Solaris, StarOffice and SunOS are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.</para>"> -<!ENTITY java "<trademark>Java</trademark>"> -<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> -<!ENTITY jdk "<trademark>JDK</trademark>"> -<!ENTITY jre "<trademark>JRE</trademark>"> -<!ENTITY jsp "<trademark>JSP</trademark>"> -<!ENTITY jvm "<trademark>JVM</trademark>"> -<!ENTITY netra "<trademark>Netra</trademark>"> -<!ENTITY solaris "<trademark>Solaris</trademark>"> -<!ENTITY staroffice "<trademark>StarOffice</trademark>"> -<!ENTITY sun "<trademark>Sun</trademark>"> -<!ENTITY sunos "<trademark>SunOS</trademark>"> +<!ENTITY java "Java™"> +<!ENTITY java.virtual.machine "Java Virtual Machine™"> +<!ENTITY jdk "JDK™"> +<!ENTITY jre "JRE™"> +<!ENTITY jsp "JSP™"> +<!ENTITY jvm "JVM™"> +<!ENTITY netra "Netra™"> +<!ENTITY solaris "Solaris™"> +<!ENTITY staroffice "StarOffice™"> +<!ENTITY sun "Sun™"> +<!ENTITY sunos "SunOS™"> <!-- http://www.symantec.com/legal/legal_note.html --> <!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered @@ -297,39 +297,39 @@ Coverity, Inc.</para>"> <!-- http://www.mathworks.com/company/trademarks.shtml --> <!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark of The MathWorks, Inc.</para>"> -<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> +<!ENTITY matlab "MATLAB®"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of Thomson.</para>"> -<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> +<!ENTITY speedtouch "SpeedTouch™"> <!-- 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 sportster "<trademark class='registered'>Sportster</trademark>"> -<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> +<!ENTITY sportster "Sportster®"> +<!ENTITY usrobotics "U.S. Robotics®"> <!-- 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 maple "<trademark>Maple</trademark>"> +<!ENTITY maple "Maple™"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered trademark of Wolfram Research, Inc.</para>"> -<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> +<!ENTITY mathematica "Mathematica®"> <!-- http://www.vmware.com/legal.html --> <!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware, Inc.</para>"> <!-- http://www.xensource.com/xen-tm-faq.html --> -<!ENTITY xen "<trademark>Xen</trademark>"> +<!ENTITY xen "Xen™"> <!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The XFree86 Project, Inc.</para>"> -<!ENTITY xfree86 "<trademark>XFree86</trademark>"> +<!ENTITY xfree86 "XFree86™"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks Modified: projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent ============================================================================== --- projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent Sat Jun 8 17:03:03 2013 (r41879) +++ projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent Sat Jun 8 17:20:50 2013 (r41880) @@ -19,58 +19,58 @@ <!ENTITY tm-attrib.3com "<para>3Com et HomeConnect sont des marques dιposιes de 3Com Corporation.</para>"> <!-- An SGML entity can't start with a number... --> -<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> +<!ENTITY tm.3com "3Com®"> <!ENTITY tm-attrib.3ware "<para>3ware et Escalade sont des marques dιposιes de 3ware Inc.</para>"> -<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> +<!ENTITY tm.3ware "3ware®"> <!-- 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 adaptec "<trademark class='registered'>Adaptec</trademark>"> +<!ENTITY adaptec "Adaptec®"> <!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 acrobat "<trademark class='registered'>Acrobat</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 acrobat "Acrobat®"> +<!ENTITY acrobat.reader "Acrobat Reader®"> +<!ENTITY adobe "Adobe®"> +<!ENTITY postscript "PostScript®"> <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html --> <!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon, AMD Opteron, Athlon, Ιlan, Opteron, et PCnet sont des marques de Advanced Micro Devices, Inc.</para>"> -<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> -<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> -<!ENTITY athlon "<trademark>Athlon</trademark>"> -<!ENTITY elan "<trademark>Ιlan</trademark>"> -<!ENTITY opteron "<trademark>Opteron</trademark>"> +<!ENTITY amd.athlon "AMD Athlon™"> +<!ENTITY amd.opteron "AMD Opteron™"> +<!ENTITY athlon "Athlon™"> +<!ENTITY elan "Ιlan™"> +<!ENTITY opteron "Opteron™"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, et TrueType sont des marques d'Apple Computer, Inc., dιposιes aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY airport "<trademark class='registered'>AirPort</trademark>"> -<!ENTITY apple "<trademark class='registered'>Apple</trademark>"> -<!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 OS</trademark>"> -<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>"> -<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>"> +<!ENTITY airport "AirPort®"> +<!ENTITY apple "Apple®"> +<!ENTITY firewire "FireWire®"> +<!ENTITY mac "Mac®"> +<!ENTITY macintosh "Macintosh®"> +<!ENTITY macos "Mac OS®"> +<!ENTITY quicktime "Quicktime®"> +<!ENTITY truetype "TrueType®"> <!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM Limited.</para>"> -<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> +<!ENTITY arm "ARM®"> <!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 catalyst "<trademark class='registered'>Catalyst</trademark>"> -<!ENTITY ios "<trademark class='registered'>IOS</trademark>"> +<!ENTITY catalyst "Catalyst®"> +<!ENTITY ios "IOS®"> <!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks or registered trademarks of Corel Corporation and/or its @@ -81,7 +81,7 @@ <!ENTITY tm-attrib.creative "<para>Sound Blaster is a trademark of Creative Technology Ltd. in the United States and/or other countries.</para>"> -<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> +<!ENTITY soundblaster "SoundBlaster®"> <!-- http://www.cvsup.org/ --> <!ENTITY tm-attrib.cvsup "<para>CVSup est une marque dιposιe de @@ -99,30 +99,30 @@ <!ENTITY tm-attrib.ibm "<para>IBM, AIX, 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>"> -<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> -<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> -<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> -<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> -<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> -<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> +<!ENTITY aix "AIX®"> +<!ENTITY os2 "OS/2®"> +<!ENTITY powerpc "PowerPC®"> +<!ENTITY ps2 "PS/2®"> +<!ENTITY s390 "S/390®"> +<!ENTITY thinkpad "ThinkPad®"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, et 802 sont des marques dιposιes de Institute of Electrical and Electronics Engineers, Inc. aux Etats Unis.</para>"> -<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> +<!ENTITY posix "POSIX®"> <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, et Xeon sont des marques ou des marques dιposιes d'Intel Corporation ou de ses filiales aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> -<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> -<!ENTITY i386 "<trademark>i386</trademark>"> -<!ENTITY i486 "<trademark>i486</trademark>"> -<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> -<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> -<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> -<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY celeron "Celeron®"> +<!ENTITY etherexpress "EtherExpress™"> +<!ENTITY i386 "i386™"> +<!ENTITY i486 "i486™"> +<!ENTITY intel "Intel®"> +<!ENTITY itanium "Itanium®"> +<!ENTITY pentium "Pentium®"> +<!ENTITY xeon "Xeon™"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered @@ -132,60 +132,60 @@ <!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 iomegazip "<trademark class='registered'>Zip</trademark>"> -<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> +<!ENTITY iomegazip "Zip®"> +<!ENTITY jaz "Jaz®"> <!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are trademarks of Lantronix Corporation.</para>"> -<!ENTITY easyio "<trademark>EasyIO</trademark>"> +<!ENTITY easyio "EasyIO™"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux est une marque dιposιe de Linus Torvalds.</para>"> -<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> +<!ENTITY linux "Linux®"> <!-- 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>"> -<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> -<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> -<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> +<!ENTITY acceleraid "AcceleRAID™"> +<!ENTITY megaraid "MegaRAID®"> +<!ENTITY mylex "Mylex®"> <!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 flash "<trademark>Flash</trademark>"> -<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> +<!ENTITY flash "Flash™"> +<!ENTITY macromedia "Macromedia®"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media, et Windows NT sont soit des marques *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306081720.r58HKoF8040292>