diff options
author | Gabor Kovesdan <gabor@FreeBSD.org> | 2013-06-10 09:40:37 +0000 |
---|---|---|
committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2013-06-10 09:40:37 +0000 |
commit | 9b83da790cf110d48219bc730c779dfe7e3f2cb4 (patch) | |
tree | d62287614b8be38ddff7745bb7c9af73de8cd39a /fr_FR.ISO8859-1/share/xml | |
parent | af9e52a7e6f721d0c7300d69a09502014136cb90 (diff) | |
download | doc-9b83da790cf110d48219bc730c779dfe7e3f2cb4.tar.gz doc-9b83da790cf110d48219bc730c779dfe7e3f2cb4.zip |
- Revert r41880 and r41881 since they resulted in loss of semantic
information
Pointed out by: hrs
Notes
Notes:
svn path=/projects/db5/; revision=41889
Diffstat (limited to 'fr_FR.ISO8859-1/share/xml')
-rw-r--r-- | fr_FR.ISO8859-1/share/xml/trademarks.ent | 180 |
1 files changed, 90 insertions, 90 deletions
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent index 122c088468..68c640547d 100644 --- a/fr_FR.ISO8859-1/share/xml/trademarks.ent +++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent @@ -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 "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>3ware et Escalade sont des marques déposées de 3ware Inc.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</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 adaptec "Adaptec®"> +<!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 acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- 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 "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!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>"> <!-- 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 "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>ARM is a registered trademark of ARM Limited.</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!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 "Catalyst®"> -<!ENTITY ios "IOS®"> +<!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 @@ -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 "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- 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 "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!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 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 "POSIX®"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!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 "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> +<!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>"> <!-- 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 "Zip®"> -<!ENTITY jaz "Jaz®"> +<!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 easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux est une marque déposée de Linus Torvalds.</para>"> -<!ENTITY linux "Linux®"> +<!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>"> -<!ENTITY acceleraid "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!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 flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media, et Windows NT sont soit des marques soit des marques déposées de Microsoft Corporation aux Etats Unis ou dans d'autres pays.</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!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; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!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 "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!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 diskonchip "DiskOnChip®"> +<!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 est une marque @@ -194,14 +194,14 @@ <!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 "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>GateD et NextHop sont des marques déposées ou non de NextHop aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, et UNIX sont des marques déposées et IT DialTone et The Open @@ -210,25 +210,25 @@ <!ENTITY tm-attrib.unix "<para>UNIX est une marque déposée de l'Open Group aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY motif "Motif®"> -<!ENTITY unix "UNIX®"> +<!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 oracle "Oracle®"> +<!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 partitionmagic "PartitionMagic®"> +<!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 eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- http://www.realnetworks.com/company/logos/policy.html --> <!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and @@ -244,40 +244,40 @@ <!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 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!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 "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, et UltraSPARC sont des marques de SPARC International, Inc aux Etats Unis et dans d'autres pays. Les produits utilisant les marques SPARC sont basés sur une architecture développée par Sun Microsystems, Inc.</para>"> -<!ENTITY sparc "Sparc®"> -<!ENTITY sparc64 "Sparc64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JDK, JRE, JSP, JVM, Netra, Solaris, StarOffice, et SunOS sont des marques ou des marques déposées de Sun Microsystems, Inc. aux Etats Unis et dans d'autres pays.</para>"> -<!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™"> +<!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>"> <!-- http://www.symantec.com/legal/legal_note.html --> <!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered @@ -287,29 +287,29 @@ <!-- http://www.mathworks.com/company/trademarks.shtml --> <!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark of The MathWorks, Inc.</para>"> -<!ENTITY matlab "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of Thomson</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</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 sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!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 et Maple sont des marques ou des marques déposées de Waterloo Maple Inc.</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica est une marque déposée de Wolfram Research, Inc.</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- http://www.vmware.com/legal.html --> <!ENTITY tm-attrib.vmware "<para>VMware est une marque de VMware, @@ -317,7 +317,7 @@ <!ENTITY tm-attrib.xfree86 "<para>XFree86 est une marque de XFree86 Project, Inc.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis et Xiph.Org sont des |