From 9b83da790cf110d48219bc730c779dfe7e3f2cb4 Mon Sep 17 00:00:00 2001 From: Gabor Kovesdan Date: Mon, 10 Jun 2013 09:40:37 +0000 Subject: - Revert r41880 and r41881 since they resulted in loss of semantic information Pointed out by: hrs --- es_ES.ISO8859-1/share/xml/trademarks.ent | 194 +++++++++++++++---------------- 1 file changed, 97 insertions(+), 97 deletions(-) (limited to 'es_ES.ISO8859-1/share/xml') diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent index 52df757b36..ca4ee1b91b 100644 --- a/es_ES.ISO8859-1/share/xml/trademarks.ent +++ b/es_ES.ISO8859-1/share/xml/trademarks.ent @@ -16,78 +16,78 @@ 3Com and HomeConnect are registered trademarks of 3Com Corporation."> - +3Com"> 3ware is a registered trademarks of 3ware Inc."> - +3ware"> Adaptec is a registered trademark of Adaptec, Inc."> - +Adaptec"> Adobe, Acrobat, Acrobat Reader, and PostScript are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries."> - - - - +Acrobat"> +Acrobat Reader"> +Adobe"> +PostScript"> AMD, AMD Athlon, AMD Opteron, Athlon, Élan, Opteron, and PCnet are trademarks of Advanced Micro Devices, Inc."> - - - - - +AMD Athlon"> +AMD Opteron"> +Athlon"> +Élan"> +Opteron"> Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Computer, Inc., registered in the United States and other countries."> - - - - - - - - - +AirPort"> +Apple"> +FireWire"> +iMac"> +Mac"> +Macintosh"> +Mac OS"> +Quicktime"> +TrueType"> ARM is a registered trademark of ARM Limited."> - +ARM"> Cisco, Catalyst, and IOS are registered trademarks of Cisco Systems, Inc. and/or its affiliates in the United States and certain other countries."> - - +Catalyst"> +IOS"> Corel and WordPerfect are trademarks or registered trademarks of Corel Corporation and/or its subsidiaries in Canada, the United States and/or other countries."> - +WordPerfect"> Coverity is a registered trademark; Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of Coverity, Inc."> - - +Coverity"> +Coverity Prevent"> Sound Blaster is a trademark of Creative Technology Ltd. in the United States and/or other countries."> - +SoundBlaster"> CVSup is a registered trademark of @@ -106,32 +106,32 @@ Coverity, Inc."> PowerPC, PS/2, S/390, and ThinkPad are trademarks of International Business Machines Corporation in the United States, other countries, or both."> - - - - - - +AIX"> +OS/2"> +PowerPC"> +PS/2"> +S/390"> +ThinkPad"> IEEE, POSIX, and 802 are registered trademarks of Institute of Electrical and Electronics Engineers, Inc. in the United States."> - +POSIX"> 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."> - - - - - - - - - +Celeron"> +EtherExpress"> +i386"> +i486"> +Intel"> +Itanium"> +Pentium"> +Xeon"> +Core"> Intuit and Quicken are registered @@ -141,60 +141,60 @@ Coverity, Inc."> Iomega, Zip, and Jaz are either registered trademarks or trademarks of Iomega Corporation in the United States and/or other countries."> - - +Zip"> +Jaz"> Lantronix and EasyIO are trademarks of Lantronix Corporation."> - +EasyIO"> Linux is a registered trademark of Linus Torvalds."> - +Linux"> LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID and Mylex are trademarks or registered trademarks of LSI Logic Corp."> - - - +AcceleRAID"> +MegaRAID"> +Mylex"> Macromedia, Flash, and Shockwave are trademarks or registered trademarks of Macromedia, Inc. in the United States and/or other countries."> - - +Flash"> +Macromedia"> 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."> - - +IntelliMouse"> +Microsoft"> - - - - +MS-DOS"> +Outlook"> +Windows"> +Windows Media"> - +Windows NT"> MIPS and R4000 are registered trademarks of MIPS Technologies, Inc. in the United States and other countries."> - +MIPS"> - +MySQL"> M-Systems and DiskOnChip are trademarks or registered trademarks of M-Systems Flash Disk Pioneers, Ltd."> - +DiskOnChip"> NetBSD is a registered trademark of @@ -203,14 +203,14 @@ Coverity, Inc."> Netscape and the Netscape Navigator are registered trademarks of Netscape Communications Corporation in the U.S. and other countries."> - - +Netscape"> +Netscape Navigator"> GateD and NextHop are registered and unregistered trademarks of NextHop in the U.S. and other countries."> - +GateD"> Motif, OSF/1, and UNIX are registered trademarks and IT DialTone and The Open Group are @@ -218,31 +218,31 @@ Coverity, Inc."> countries."> UNIX is a registered trademarks of The Open Group in the United States and other countries."> - - +Motif"> +UNIX"> Oracle is a registered trademark of Oracle Corporation."> - +Oracle"> PowerQuest and PartitionMagic are registered trademarks of PowerQuest Corporation in the United States and/or other countries."> - +PartitionMagic"> QUALCOMM and Eudora are registered trademarks of QUALCOMM Incorporated."> - +Eudora"> RealNetworks, RealPlayer, and RealAudio are the registered trademarks of RealNetworks, Inc."> - +RealPlayer"> @@ -253,22 +253,22 @@ Coverity, Inc."> SAP, R/3, and mySAP are trademarks or registered trademarks of SAP AG in Germany and in several other countries all over the world."> - - +R/3"> +SAP"> Silicon Graphics, SGI, and OpenGL are registered trademarks of Silicon Graphics, Inc., in the United States and/or other countries worldwide."> - +OpenGL"> 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."> - - - +Sparc"> +Sparc64"> +UltraSPARC"> @@ -277,17 +277,17 @@ Coverity, Inc."> Solaris, StarOffice and SunOS are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries."> - - - - - - - - - - - +Java"> +Java Virtual Machine"> +JDK"> +JRE"> +JSP"> +JVM"> +Netra"> +Solaris"> +StarOffice"> +Sun"> +SunOS"> Symantec and Ghost are registered @@ -297,39 +297,39 @@ Coverity, Inc."> MATLAB is a registered trademark of The MathWorks, Inc."> - +MATLAB"> SpeedTouch is a trademark of Thomson."> - +SpeedTouch"> U.S. Robotics and Sportster are registered trademarks of U.S. Robotics Corporation."> - - +Sportster"> +U.S. Robotics"> Waterloo Maple and Maple are trademarks or registered trademarks of Waterloo Maple Inc."> - +Maple"> Mathematica is a registered trademark of Wolfram Research, Inc."> - +Mathematica"> VMware is a trademark of VMware, Inc."> - +Xen"> XFree86 is a trademark of The XFree86 Project, Inc."> - +XFree86"> Ogg Vorbis and Xiph.Org are trademarks -- cgit v1.2.3