Ticket #7308: updated-license-localize.diff

File updated-license-localize.diff, 15.5 KB (added by humdinger, 13 years ago)

updated patch

  • src/apps/aboutsystem/AboutSystem.cpp

     
    12411241
    12421242    // GNU copyrights
    12431243    AddCopyrightEntry("The GNU Project",
    1244         "Contains software from the GNU Project, "
     1244        B_TRANSLATE("Contains software from the GNU Project, "
    12451245        "released under the GPL and LGPL licenses:\n"
    12461246        "GNU C Library, "
    12471247        "GNU coretools, diffutils, findutils, "
    12481248        "sharutils, gawk, bison, m4, make, "
    12491249        "gdb, wget, ncurses, termcap, "
    12501250        "Bourne Again Shell.\n"
    1251         COPYRIGHT_STRING "The Free Software Foundation.",
     1251        COPYRIGHT_STRING "The Free Software Foundation."),
    12521252        StringVector("GNU LGPL v2.1", "GNU GPL v2", "GNU GPL v3", NULL),
    12531253        StringVector(),
    12541254        "http://www.gnu.org");
    12551255
    12561256    // FreeBSD copyrights
    12571257    AddCopyrightEntry("The FreeBSD Project",
    1258         "Contains software from the FreeBSD Project, "
     1258        B_TRANSLATE("Contains software from the FreeBSD Project, "
    12591259        "released under the BSD license:\n"
    12601260        "cal, ftpd, ping, telnet, "
    12611261        "telnetd, traceroute\n"
    12621262        COPYRIGHT_STRING "1994-2008 The FreeBSD Project.  "
    1263         "All rights reserved.",
     1263        "All rights reserved."),
    12641264        "http://www.freebsd.org");
    12651265            // TODO: License!
    12661266
    12671267    // NetBSD copyrights
    12681268    AddCopyrightEntry("The NetBSD Project",
    1269         "Contains software developed by the NetBSD, "
     1269        B_TRANSLATE("Contains software developed by the NetBSD, "
    12701270        "Foundation, Inc. and its contributors:\n"
    12711271        "ftp, tput\n"
    12721272        COPYRIGHT_STRING "1996-2008 The NetBSD Foundation, Inc.  "
    1273         "All rights reserved.",
     1273        "All rights reserved."),
    12741274        "http://www.netbsd.org");
    12751275            // TODO: License!
    12761276
    12771277    // FFMpeg copyrights
    12781278    _AddPackageCredit(PackageCredit("FFMpeg libavcodec")
    1279         .SetCopyright(COPYRIGHT_STRING "2000-2007 Fabrice Bellard, et al.")
     1279        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2000-2007 Fabrice "
     1280            "Bellard, et al."))
    12801281        .SetLicenses("GNU LGPL v2.1", "GNU LGPL v2", NULL)
    12811282        .SetURL("http://www.ffmpeg.org"));
    12821283
    12831284    // AGG copyrights
    12841285    _AddPackageCredit(PackageCredit("AntiGrain Geometry")
    1285         .SetCopyright(COPYRIGHT_STRING "2002-2006 Maxim Shemanarev (McSeem).")
    1286         .SetLicenses("Anti-Grain Geometry", "BSD (3-clause)", "GPC", NULL)
     1286        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2006 Maxim "
     1287            "Shemanarev (McSeem)."))
     1288        .SetLicenses("Anti-Grain Geometry", B_TRANSLATE("BSD (3-clause)"),
     1289            "GPC", NULL)
    12871290        .SetURL("http://www.antigrain.com"));
    12881291
    12891292    // PDFLib copyrights
    12901293    _AddPackageCredit(PackageCredit("PDFLib")
    1291         .SetCopyright(COPYRIGHT_STRING "1997-2006 PDFlib GmbH and Thomas Merz. "
    1292             "All rights reserved.\n"
    1293             "PDFlib and PDFlib logo are registered trademarks of PDFlib GmbH.")
     1294        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1997-2006 PDFlib GmbH and "
     1295            "Thomas Merz.  All rights reserved.\n"
     1296            "PDFlib and PDFlib logo are registered trademarks of PDFlib GmbH."))
    12941297        .SetLicense("PDFlib Lite")
    12951298        .SetURL("http://www.pdflib.com"));
    12961299
    12971300    // FreeType copyrights
    12981301    _AddPackageCredit(PackageCredit("FreeType2")
    1299         .SetCopyright("Portions of this software are copyright "
    1300             B_UTF8_COPYRIGHT " 1996-2006 "
    1301             "The FreeType Project.  All rights reserved.")
     1302        .SetCopyright(B_TRANSLATE("Portions of this software are copyright "
     1303            COPYRIGHT_STRING "1996-2006 "
     1304            "The FreeType Project.  All rights reserved."))
    13021305        .SetLicense("FTL")
    13031306        .SetURL("http://www.freetype.org"));
    13041307
    13051308    // Mesa3D (http://www.mesa3d.org) copyrights
    13061309    _AddPackageCredit(PackageCredit("Mesa")
    1307         .SetCopyright(COPYRIGHT_STRING "1999-2006 Brian Paul. "
    1308             "Mesa3D Project.  All rights reserved.")
     1310        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1999-2006 Brian Paul. "
     1311            "Mesa3D Project.  All rights reserved."))
    13091312        .SetLicense("MIT")
    13101313        .SetURL("http://www.mesa3d.org"));
    13111314
    13121315    // SGI's GLU implementation copyrights
    13131316    _AddPackageCredit(PackageCredit("GLU")
    1314         .SetCopyright(COPYRIGHT_STRING
    1315             "1991-2000 Silicon Graphics, Inc. "
    1316             "SGI's Software FreeB license.  All rights reserved.")
     1317        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1991-2000 Silicon Graphics, "
     1318            "Inc. SGI's Software FreeB license.  All rights reserved."))
    13171319        .SetLicense("SGI Free B")
    13181320        .SetURL("http://www.sgi.com/products/software/opengl"));
    13191321
    13201322    // GLUT implementation copyrights
    13211323    _AddPackageCredit(PackageCredit("GLUT")
    1322         .SetCopyrights(COPYRIGHT_STRING "1994-1997 Mark Kilgard. "
    1323             "All rights reserved.",
     1324        .SetCopyrights(B_TRANSLATE(COPYRIGHT_STRING "1994-1997 Mark Kilgard. "
     1325            "All rights reserved."),
    13241326            COPYRIGHT_STRING "1997 Be Inc.",
    13251327            COPYRIGHT_STRING "1999 Jake Hamby.",
    13261328            NULL)
    … …  
    13301332    // OpenGroup & DEC (BRegion backend) copyright
    13311333    _AddPackageCredit(PackageCredit("BRegion backend (XFree86)")
    13321334        .SetCopyrights(COPYRIGHT_STRING "1987, 1988, 1998 The Open Group.",
    1333             COPYRIGHT_STRING "1987, 1988 Digital Equipment "
     1335            B_TRANSLATE(COPYRIGHT_STRING "1987, 1988 Digital Equipment "
    13341336            "Corporation, Maynard, Massachusetts.\n"
    1335             "All rights reserved.",
     1337            "All rights reserved."),
    13361338            NULL)
    13371339        .SetLicenses("OpenGroup", "DEC", NULL));
    13381340            // TODO: URL
    13391341
    13401342    // VL-Gothic font
    13411343    _AddPackageCredit(PackageCredit("VL-Gothic font")
    1342         .SetCopyrights(COPYRIGHT_STRING "1990-2003 Wada Laboratory,"
    1343             " the University of Tokyo", COPYRIGHT_STRING
     1344        .SetCopyrights(B_TRANSLATE(COPYRIGHT_STRING "1990-2003 Wada Laboratory,"
     1345            " the University of Tokyo"), COPYRIGHT_STRING
    13441346            "2003-2004 Electronic Font Open Laboratory (/efont/)",
    13451347            COPYRIGHT_STRING "2003-2008 M+ FONTS PROJECT",
    13461348            COPYRIGHT_STRING "2006-2009 Daisuke SUZUKI",
    13471349            COPYRIGHT_STRING "2006-2009 Project Vine",
    1348             "MIT license. All rights reserved.",
     1350            B_TRANSLATE("MIT license. All rights reserved."),
    13491351            NULL));
    13501352            // TODO: License!
    13511353
    13521354    // expat copyrights
    13531355    _AddPackageCredit(PackageCredit("expat")
    1354         .SetCopyrights(COPYRIGHT_STRING
    1355             "1998, 1999, 2000 Thai Open Source "
    1356             "Software Center Ltd and Clark Cooper.",
    1357             COPYRIGHT_STRING "2001, 2002, 2003 Expat maintainers.",
     1356        .SetCopyrights(B_TRANSLATE(COPYRIGHT_STRING "1998, 1999, 2000 Thai "
     1357            "Open Source Software Center Ltd and Clark Cooper."),
     1358            B_TRANSLATE(COPYRIGHT_STRING "2001, 2002, 2003 Expat maintainers."),
    13581359            NULL)
    13591360        .SetLicense("Expat")
    13601361        .SetURL("http://expat.sourceforge.net"));
    13611362
    13621363    // zlib copyrights
    13631364    _AddPackageCredit(PackageCredit("zlib")
    1364         .SetCopyright(COPYRIGHT_STRING
    1365             "1995-2004 Jean-loup Gailly and Mark Adler.")
     1365        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995-2004 Jean-loup "
     1366            "Gailly and Mark Adler."))
    13661367        .SetLicense("Zlib")
    13671368        .SetURL("http://www.zlib.net"));
    13681369
    13691370    // zip copyrights
    13701371    _AddPackageCredit(PackageCredit("Info-ZIP")
    1371         .SetCopyright(COPYRIGHT_STRING
    1372             "1990-2002 Info-ZIP. All rights reserved.")
     1372        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1990-2002 Info-ZIP. "
     1373            "All rights reserved."))
    13731374        .SetLicense("Info-ZIP")
    13741375        .SetURL("http://www.info-zip.org"));
    13751376
    13761377    // bzip2 copyrights
    13771378    _AddPackageCredit(PackageCredit("bzip2")
    1378         .SetCopyright(COPYRIGHT_STRING
    1379             "1996-2005 Julian R Seward. All rights reserved.")
    1380         .SetLicense("BSD (4-clause)")
     1379        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1996-2005 Julian R "
     1380            "Seward. All rights reserved."))
     1381        .SetLicense(B_TRANSLATE("BSD (4-clause)"))
    13811382        .SetURL("http://bzip.org"));
    13821383
    13831384    // lp_solve copyrights
    … …  
    13891390
    13901391    // OpenEXR copyrights
    13911392    _AddPackageCredit(PackageCredit("OpenEXR")
    1392         .SetCopyright(COPYRIGHT_STRING "2002-2005 Industrial Light & Magic, "
    1393             "a division of Lucas Digital Ltd. LLC.")
    1394         .SetLicense("BSD (3-clause)")
     1393        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2005 Industrial "
     1394            "Light & Magic, a division of Lucas Digital Ltd. LLC."))
     1395        .SetLicense(B_TRANSLATE("BSD (3-clause)"))
    13951396        .SetURL("http://www.openexr.com"));
    13961397
    13971398    // Bullet copyrights
    … …  
    14021403
    14031404    // atftp copyrights
    14041405    _AddPackageCredit(PackageCredit("atftp")
    1405         .SetCopyright(COPYRIGHT_STRING
    1406             "2000 Jean-Pierre ervbefeL and Remi Lefebvre")
     1406        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2000 Jean-Pierre "
     1407            "ervbefeL and Remi Lefebvre"))
    14071408        .SetLicense("GNU GPL v2"));
    14081409            // TODO: URL!
    14091410
    … …  
    14201421
    14211422    // unrar copyrights
    14221423    _AddPackageCredit(PackageCredit("unrar")
    1423         .SetCopyright(COPYRIGHT_STRING "2002-2008 Alexander L. Roshal. "
    1424             "All rights reserved.")
     1424        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2008 Alexander "
     1425            "L. Roshal. All rights reserved."))
    14251426        .SetLicense("UnRAR")
    14261427        .SetURL("http://www.rarlab.com"));
    14271428
    … …  
    14341435
    14351436    // libjpeg copyrights
    14361437    _AddPackageCredit(PackageCredit("libjpeg")
    1437         .SetCopyright(COPYRIGHT_STRING " 1994-2009, Thomas G. Lane,"
    1438             " Guido Vollbeding. This software is based in part on the "
    1439             "work of the Independent JPEG Group")
     1438        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1994-2009, Thomas G. "
     1439            "Lane, Guido Vollbeding. This software is based in part on the "
     1440            "work of the Independent JPEG Group"))
    14401441        .SetLicense("LibJPEG")
    14411442        .SetURL("http://www.ijg.org"));
    14421443
    14431444    // libprint copyrights
    14441445    _AddPackageCredit(PackageCredit("libprint")
    1445         .SetCopyright(COPYRIGHT_STRING
    1446             "1999-2000 Y.Takagi. All rights reserved."));
     1446        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1999-2000 Y.Takagi. "
     1447            "All rights reserved.")));
    14471448            // TODO: License!
    14481449
    14491450    // cortex copyrights
    14501451    _AddPackageCredit(PackageCredit("Cortex")
    14511452        .SetCopyright(COPYRIGHT_STRING "1999-2000 Eric Moon.")
    1452         .SetLicense("BSD (3-clause)")
     1453        .SetLicense(B_TRANSLATE("BSD (3-clause)"))
    14531454        .SetURL("http://cortex.sourceforge.net/documentation"));
    14541455
    14551456    // FluidSynth copyrights
    14561457    _AddPackageCredit(PackageCredit("FluidSynth")
    1457         .SetCopyright(COPYRIGHT_STRING "2003 Peter Hanappe and others.")
     1458        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2003 Peter Hanappe "
     1459            "and others."))
    14581460        .SetLicense("GNU LGPL v2")
    14591461        .SetURL("http://www.fluidsynth.org"));
    14601462
    … …  
    14651467
    14661468    // libxml2, libxslt, libexslt copyrights
    14671469    _AddPackageCredit(PackageCredit("libxml2, libxslt")
    1468         .SetCopyright(COPYRIGHT_STRING
    1469             "1998-2003 Daniel Veillard. All rights reserved.")
    1470         .SetLicense("MIT (no promotion)")
     1470        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1998-2003 Daniel Veillard. "
     1471            "All rights reserved."))
     1472        .SetLicense(B_TRANSLATE("MIT (no promotion)"))
    14711473        .SetURL("http://xmlsoft.org"));
    14721474
    14731475    _AddPackageCredit(PackageCredit("libexslt")
    1474         .SetCopyright(COPYRIGHT_STRING
    1475             "2001-2002 Thomas Broyer, Charlie "
    1476             "Bozeman and Daniel Veillard.  All rights reserved.")
    1477         .SetLicense("MIT (no promotion)")
     1476        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2001-2002 Thomas Broyer, "
     1477            "Charlie Bozeman and Daniel Veillard.  All rights reserved."))
     1478        .SetLicense(B_TRANSLATE("MIT (no promotion)"))
    14781479        .SetURL("http://xmlsoft.org"));
    14791480
    14801481    // Xiph.org Foundation copyrights
    14811482    _AddPackageCredit(PackageCredit("Xiph.org Foundation")
    14821483        .SetCopyrights("libvorbis, libogg, libtheora, libspeex",
    1483             COPYRIGHT_STRING "1994-2008 Xiph.Org. "
    1484             "All rights reserved.",
    1485             NULL)
    1486         .SetLicense("BSD (3-clause)")
     1484            B_TRANSLATE(COPYRIGHT_STRING "1994-2008 Xiph.Org. "
     1485            "All rights reserved."), NULL)
     1486        .SetLicense(B_TRANSLATE("BSD (3-clause)"))
    14871487        .SetURL("http://www.xiph.org"));
    14881488
    14891489    // The Tcpdump Group
    14901490    _AddPackageCredit(PackageCredit("The Tcpdump Group")
    14911491        .SetCopyright("tcpdump, libpcap")
    1492         .SetLicense("BSD (3-clause)")
     1492        .SetLicense(B_TRANSLATE("BSD (3-clause)"))
    14931493        .SetURL("http://www.tcpdump.org"));
    14941494
    14951495    // Matroska
    14961496    _AddPackageCredit(PackageCredit("libmatroska")
    1497         .SetCopyright(COPYRIGHT_STRING "2002-2003 Steve Lhomme. "
    1498             "All rights reserved.")
     1497        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2003 Steve Lhomme. "
     1498            "All rights reserved."))
    14991499        .SetLicense("GNU LGPL v2.1")
    15001500        .SetURL("http://www.matroska.org"));
    15011501
    15021502    // BColorQuantizer (originally CQuantizer code)
    15031503    _AddPackageCredit(PackageCredit("CQuantizer")
    1504         .SetCopyright(COPYRIGHT_STRING "1996-1997 Jeff Prosise. "
    1505             "All rights reserved.")
     1504        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1996-1997 Jeff Prosise. "
     1505            "All rights reserved."))
    15061506        .SetLicense("CQuantizer")
    15071507        .SetURL("http://www.xdp.it"));
    15081508
    15091509    // MAPM (Mike's Arbitrary Precision Math Library) used by DeskCalc
    15101510    _AddPackageCredit(PackageCredit("MAPM")
    1511         .SetCopyright(COPYRIGHT_STRING
    1512             "1999-2007 Michael C. Ring. All rights reserved.")
     1511        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1999-2007 Michael C. "
     1512            "Ring. All rights reserved."))
    15131513        .SetLicense("MAPM")
    15141514        .SetURL("http://tc.umn.edu/~ringx004"));
    15151515
    15161516    // MkDepend 1.7 copyright (Makefile dependency generator)
    15171517    _AddPackageCredit(PackageCredit("MkDepend")
    1518         .SetCopyright(COPYRIGHT_STRING "1995-2001 Lars Düning. "
    1519             "All rights reserved.")
     1518        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995-2001 Lars Düning. "
     1519            "All rights reserved."))
    15201520        .SetLicense("MkDepend")
    15211521        .SetURL("http://bearnip.com/lars/be"));
    15221522
    15231523    // libhttpd copyright (used as Poorman backend)
    15241524    _AddPackageCredit(PackageCredit("libhttpd")
    1525         .SetCopyright(COPYRIGHT_STRING
    1526             "1995,1998,1999,2000,2001 by "
    1527             "Jef Poskanzer. All rights reserved.")
     1525        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995, 1998, 1999, 2000, "
     1526            "2001 by Jef Poskanzer. All rights reserved."))
    15281527        .SetLicense("LibHTTPd")
    15291528        .SetURL("http://www.acme.com/software/thttpd/"));
    15301529
    15311530#ifdef __INTEL__
    15321531    // Udis86 copyrights
    15331532    _AddPackageCredit(PackageCredit("Udis86")
    1534         .SetCopyright(COPYRIGHT_STRING "2002, 2003, 2004 Vivek Mohan. "
    1535             "All rights reserved.")
     1533        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002, 2003, 2004 "
     1534            "Vivek Mohan. All rights reserved."))
    15361535        .SetURL("http://udis86.sourceforge.net"));
    15371536            // TODO: License!
    15381537#endif
    … …  
    15401539#ifdef __INTEL__
    15411540    // Intel PRO/Wireless 2100 Firmware
    15421541    _AddPackageCredit(PackageCredit("Intel PRO/Wireless 2100 Firmware")
    1543         .SetCopyright(COPYRIGHT_STRING
    1544             "2003-2006 by "
    1545             "Intel Corporation. All rights reserved.")
     1542        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2003-2006 by "
     1543            "Intel Corporation. All rights reserved."))
    15461544        .SetLicense("Intel (2xxx firmware)")
    15471545        .SetURL("http://ipw2100.sourceforge.net/"));
    15481546#endif
    … …  
    15501548#ifdef __INTEL__
    15511549    // Intel PRO/Wireless 2200BG Firmware
    15521550    _AddPackageCredit(PackageCredit("Intel PRO/Wireless 2200BG Firmware")
    1553         .SetCopyright(COPYRIGHT_STRING
    1554             "2004-2005 by "
    1555             "Intel Corporation. All rights reserved.")
     1551        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2004-2005 by "
     1552            "Intel Corporation. All rights reserved."))
    15561553        .SetLicense("Intel (2xxx firmware)")
    15571554        .SetURL("http://ipw2200.sourceforge.net/"));
    15581555#endif
    … …  
    15621559    _AddPackageCredit(
    15631560        PackageCredit(
    15641561            "Intel PRO/Wireless 3945ABG/BG Network Connection Adapter Firmware")
    1565         .SetCopyright(COPYRIGHT_STRING
    1566             "2006 - 2007 by "
    1567             "Intel Corporation. All rights reserved.")
     1562        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 by "
     1563            "Intel Corporation. All rights reserved."))
    15681564        .SetLicense("Intel (firmware)")
    15691565        .SetURL("http://www.intellinuxwireless.org/"));
    15701566#endif
    … …  
    15721568    // Intel Wireless WiFi Link 4965AGN Adapter Firmware
    15731569    _AddPackageCredit(
    15741570        PackageCredit("Intel Wireless WiFi Link 4965AGN Adapter Firmware")
    1575         .SetCopyright(COPYRIGHT_STRING
    1576             "2006 - 2007 by "
    1577             "Intel Corporation. All rights reserved.")
     1571        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 by "
     1572            "Intel Corporation. All rights reserved."))
    15781573        .SetLicense("Intel (firmware)")
    15791574        .SetURL("http://www.intellinuxwireless.org/"));
    15801575#endif
    … …  
    15821577#ifdef __INTEL__
    15831578    // Marvell 88w8363
    15841579    _AddPackageCredit(PackageCredit("Marvell 88w8363")
    1585         .SetCopyright(COPYRIGHT_STRING
    1586             "2007-2009 by "
    1587             "Marvell Semiconductor, Inc. All rights reserved.")
     1580        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2007-2009 by "
     1581            "Marvell Semiconductor, Inc. All rights reserved."))
    15881582        .SetLicense("Marvell (firmware)")
    15891583        .SetURL("http://www.marvell.com/"));
    15901584#endif