i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User taos made the copyrights entries a bit more consistent, e.g. endings with full stops, using single spaces, removing unneeded spaces, shortening year ranges. That sort of thing. Thanks taos.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41293 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Joachim Seemer
2011-04-29 21:01:51 +00:00
parent 8235ff073b
commit 8d9e29a558
1 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/aboutsystem/AboutSystem.cpp
+30 -31
View File
@@ -1318,7 +1318,7 @@ AboutView::_CreateCreditsView()
// FreeType copyrights // FreeType copyrights
_AddPackageCredit(PackageCredit("FreeType2") _AddPackageCredit(PackageCredit("FreeType2")
.SetCopyright(B_TRANSLATE("Portions of this software are copyright " .SetCopyright(B_TRANSLATE("Portions of this software are copyright. "
COPYRIGHT_STRING "1996-2006 " COPYRIGHT_STRING "1996-2006 "
"The FreeType Project. All rights reserved.")) "The FreeType Project. All rights reserved."))
.SetLicense("FTL") .SetLicense("FTL")
@@ -1350,8 +1350,8 @@ AboutView::_CreateCreditsView()
// OpenGroup & DEC (BRegion backend) copyright // OpenGroup & DEC (BRegion backend) copyright
_AddPackageCredit(PackageCredit("BRegion backend (XFree86)") _AddPackageCredit(PackageCredit("BRegion backend (XFree86)")
.SetCopyrights(COPYRIGHT_STRING "1987, 1988, 1998 The Open Group.", .SetCopyrights(COPYRIGHT_STRING "1987-1988, 1998 The Open Group.",
B_TRANSLATE(COPYRIGHT_STRING "1987, 1988 Digital Equipment " B_TRANSLATE(COPYRIGHT_STRING "1987-1988 Digital Equipment "
"Corporation, Maynard, Massachusetts.\n" "Corporation, Maynard, Massachusetts.\n"
"All rights reserved."), "All rights reserved."),
NULL) NULL)
@@ -1361,20 +1361,20 @@ AboutView::_CreateCreditsView()
// VL-Gothic font // VL-Gothic font
_AddPackageCredit(PackageCredit("VL-Gothic font") _AddPackageCredit(PackageCredit("VL-Gothic font")
.SetCopyrights(B_TRANSLATE(COPYRIGHT_STRING "1990-2003 Wada Laboratory," .SetCopyrights(B_TRANSLATE(COPYRIGHT_STRING "1990-2003 Wada Laboratory,"
" the University of Tokyo"), COPYRIGHT_STRING " the University of Tokyo."), COPYRIGHT_STRING
"2003-2004 Electronic Font Open Laboratory (/efont/)", "2003-2004 Electronic Font Open Laboratory (/efont/).",
COPYRIGHT_STRING "2003-2008 M+ FONTS PROJECT", COPYRIGHT_STRING "2003-2008 M+ FONTS PROJECT.",
COPYRIGHT_STRING "2006-2009 Daisuke SUZUKI", COPYRIGHT_STRING "2006-2009 Daisuke SUZUKI.",
COPYRIGHT_STRING "2006-2009 Project Vine", COPYRIGHT_STRING "2006-2009 Project Vine.",
B_TRANSLATE("MIT license. All rights reserved."), B_TRANSLATE("MIT license. All rights reserved."),
NULL)); NULL));
// TODO: License! // TODO: License!
// expat copyrights // expat copyrights
_AddPackageCredit(PackageCredit("expat") _AddPackageCredit(PackageCredit("expat")
.SetCopyrights(B_TRANSLATE(COPYRIGHT_STRING "1998, 1999, 2000 Thai " .SetCopyrights(B_TRANSLATE(COPYRIGHT_STRING "1998-2000 Thai "
"Open Source Software Center Ltd and Clark Cooper."), "Open Source Software Center Ltd and Clark Cooper."),
B_TRANSLATE(COPYRIGHT_STRING "2001, 2002, 2003 Expat maintainers."), B_TRANSLATE(COPYRIGHT_STRING "2001-2003 Expat maintainers."),
NULL) NULL)
.SetLicense("Expat") .SetLicense("Expat")
.SetURL("http://expat.sourceforge.net")); .SetURL("http://expat.sourceforge.net"));
@@ -1423,13 +1423,13 @@ AboutView::_CreateCreditsView()
// atftp copyrights // atftp copyrights
_AddPackageCredit(PackageCredit("atftp") _AddPackageCredit(PackageCredit("atftp")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2000 Jean-Pierre " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2000 Jean-Pierre "
"ervbefeL and Remi Lefebvre")) "ervbefeL and Remi Lefebvre."))
.SetLicense("GNU GPL v2")); .SetLicense("GNU GPL v2"));
// TODO: URL! // TODO: URL!
// Netcat copyrights // Netcat copyrights
_AddPackageCredit(PackageCredit("Netcat") _AddPackageCredit(PackageCredit("Netcat")
.SetCopyright(COPYRIGHT_STRING "1996 Hobbit")); .SetCopyright(COPYRIGHT_STRING "1996 Hobbit."));
// TODO: License! // TODO: License!
// acpica copyrights // acpica copyrights
@@ -1456,7 +1456,7 @@ AboutView::_CreateCreditsView()
_AddPackageCredit(PackageCredit("libjpeg") _AddPackageCredit(PackageCredit("libjpeg")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1994-2009, Thomas G. " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1994-2009, Thomas G. "
"Lane, Guido Vollbeding. This software is based in part on the " "Lane, Guido Vollbeding. This software is based in part on the "
"work of the Independent JPEG Group")) "work of the Independent JPEG Group."))
.SetLicense("LibJPEG") .SetLicense("LibJPEG")
.SetURL("http://www.ijg.org")); .SetURL("http://www.ijg.org"));
@@ -1541,24 +1541,25 @@ AboutView::_CreateCreditsView()
// libhttpd copyright (used as Poorman backend) // libhttpd copyright (used as Poorman backend)
_AddPackageCredit(PackageCredit("libhttpd") _AddPackageCredit(PackageCredit("libhttpd")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995, 1998, 1999, 2000, " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995, 1998-2001 "
"2001 by Jef Poskanzer. All rights reserved.")) "Jef Poskanzer. All rights reserved."))
.SetLicense("LibHTTPd") .SetLicense("LibHTTPd")
.SetURL("http://www.acme.com/software/thttpd/")); .SetURL("http://www.acme.com/software/thttpd/"));
#ifdef __INTEL__ #ifdef __INTEL__
// Udis86 copyrights // Udis86 copyrights
_AddPackageCredit(PackageCredit("Udis86") _AddPackageCredit(PackageCredit("Udis86")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002, 2003, 2004 " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2004 "
"Vivek Mohan. All rights reserved.")) "Vivek Mohan. All rights reserved."))
.SetLicense(B_TRANSLATE("BSD (2-clause)"))
.SetURL("http://udis86.sourceforge.net")); .SetURL("http://udis86.sourceforge.net"));
// TODO: License! // TODO: License! - Project website refers to BSD License
#endif #endif
#ifdef __INTEL__ #ifdef __INTEL__
// Intel PRO/Wireless 2100 Firmware // Intel PRO/Wireless 2100 Firmware
_AddPackageCredit(PackageCredit("Intel PRO/Wireless 2100 Firmware") _AddPackageCredit(PackageCredit("Intel PRO/Wireless 2100 Firmware")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2003-2006 by " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2003-2006 "
"Intel Corporation. All rights reserved.")) "Intel Corporation. All rights reserved."))
.SetLicense("Intel (2xxx firmware)") .SetLicense("Intel (2xxx firmware)")
.SetURL("http://ipw2100.sourceforge.net/")); .SetURL("http://ipw2100.sourceforge.net/"));
@@ -1567,7 +1568,7 @@ AboutView::_CreateCreditsView()
#ifdef __INTEL__ #ifdef __INTEL__
// Intel PRO/Wireless 2200BG Firmware // Intel PRO/Wireless 2200BG Firmware
_AddPackageCredit(PackageCredit("Intel PRO/Wireless 2200BG Firmware") _AddPackageCredit(PackageCredit("Intel PRO/Wireless 2200BG Firmware")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2004-2005 by " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2004-2005 "
"Intel Corporation. All rights reserved.")) "Intel Corporation. All rights reserved."))
.SetLicense("Intel (2xxx firmware)") .SetLicense("Intel (2xxx firmware)")
.SetURL("http://ipw2200.sourceforge.net/")); .SetURL("http://ipw2200.sourceforge.net/"));
@@ -1578,7 +1579,7 @@ AboutView::_CreateCreditsView()
_AddPackageCredit( _AddPackageCredit(
PackageCredit( PackageCredit(
"Intel PRO/Wireless 3945ABG/BG Network Connection Adapter Firmware") "Intel PRO/Wireless 3945ABG/BG Network Connection Adapter Firmware")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 by " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 "
"Intel Corporation. All rights reserved.")) "Intel Corporation. All rights reserved."))
.SetLicense("Intel (firmware)") .SetLicense("Intel (firmware)")
.SetURL("http://www.intellinuxwireless.org/")); .SetURL("http://www.intellinuxwireless.org/"));
@@ -1587,7 +1588,7 @@ AboutView::_CreateCreditsView()
// Intel Wireless WiFi Link 4965AGN Adapter Firmware // Intel Wireless WiFi Link 4965AGN Adapter Firmware
_AddPackageCredit( _AddPackageCredit(
PackageCredit("Intel Wireless WiFi Link 4965AGN Adapter Firmware") PackageCredit("Intel Wireless WiFi Link 4965AGN Adapter Firmware")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 by " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 "
"Intel Corporation. All rights reserved.")) "Intel Corporation. All rights reserved."))
.SetLicense("Intel (firmware)") .SetLicense("Intel (firmware)")
.SetURL("http://www.intellinuxwireless.org/")); .SetURL("http://www.intellinuxwireless.org/"));
@@ -1596,7 +1597,7 @@ AboutView::_CreateCreditsView()
#ifdef __INTEL__ #ifdef __INTEL__
// Marvell 88w8363 // Marvell 88w8363
_AddPackageCredit(PackageCredit("Marvell 88w8363") _AddPackageCredit(PackageCredit("Marvell 88w8363")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2007-2009 by " .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2007-2009 "
"Marvell Semiconductor, Inc. All rights reserved.")) "Marvell Semiconductor, Inc. All rights reserved."))
.SetLicense("Marvell (firmware)") .SetLicense("Marvell (firmware)")
.SetURL("http://www.marvell.com/")); .SetURL("http://www.marvell.com/"));
@@ -1605,26 +1606,24 @@ AboutView::_CreateCreditsView()
#ifdef __INTEL__ #ifdef __INTEL__
// Ralink Firmware RT2501/RT2561/RT2661 // Ralink Firmware RT2501/RT2561/RT2661
_AddPackageCredit(PackageCredit("Ralink Firmware RT2501/RT2561/RT2661") _AddPackageCredit(PackageCredit("Ralink Firmware RT2501/RT2561/RT2661")
.SetCopyright(COPYRIGHT_STRING .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2007 "
"2007 by " "Ralink Technology Corporation. All rights reserved."))
"Ralink Technology Corporation. All rights reserved.")
.SetLicense("Ralink (firmware)") .SetLicense("Ralink (firmware)")
.SetURL("http://www.ralinktech.com/")); .SetURL("http://www.ralinktech.com/"));
#endif #endif
// Gutenprint // Gutenprint
_AddPackageCredit(PackageCredit("Gutenprint") _AddPackageCredit(PackageCredit("Gutenprint")
.SetCopyright(COPYRIGHT_STRING .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING
"1999 - 2010 by " "1999-2010 by the authors of Gutenprint. All rights reserved."))
"the authors of Gutenprint. All rights reserved.")
.SetLicense("GNU GPL v2") .SetLicense("GNU GPL v2")
.SetURL("http://gutenprint.sourceforge.net")); .SetURL("http://gutenprint.sourceforge.net"));
// libwebp // libwebp
_AddPackageCredit(PackageCredit("libwebp") _AddPackageCredit(PackageCredit("libwebp")
.SetCopyright(COPYRIGHT_STRING .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING
"2010 - 2011 by Google Inc. All rights reserved.") "2010-2011 Google Inc. All rights reserved."))
.SetLicense("BSD (3-clause)") .SetLicense(B_TRANSLATE("BSD (3-clause)"))
.SetURL("http://www.webmproject.org/code/#libwebp_webp_image_library")); .SetURL("http://www.webmproject.org/code/#libwebp_webp_image_library"));
_AddCopyrightsFromAttribute(); _AddCopyrightsFromAttribute();