Mercurial > trustbridge
diff ui/aboutdialog.cpp @ 1218:5f59344dbd13
(issue68) License corrections:
* the overall package is GNU GPL v==3.
* Qt has to be used as GNU GPL, so mention it.
* Oxygen is GNU LGPL v>=3.
* minor corrections like typos, better phrasing for freedom protection, use GNU consistently.
| author | Bernhard Reiter <bernhard@intevation.de> |
|---|---|
| date | Wed, 24 Sep 2014 11:17:14 +0200 |
| parents | 1171a4778562 |
| children | 6154d554b3af |
line wrap: on
line diff
--- a/ui/aboutdialog.cpp Wed Sep 24 11:03:00 2014 +0200 +++ b/ui/aboutdialog.cpp Wed Sep 24 11:17:14 2014 +0200 @@ -51,17 +51,17 @@ " <a href=\"http://www.dn-systems.de\">DN-Systems GmbH</a>, <br>" " contracted by the BSI.<br/><br/>") + tr("TrustBridge is Free Software licensed" - " under GNU GPL v>=3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit" + " under GNU GPL v==3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit" " in der Informationstechnik<br/><br/>") + tr("TrustBridge Administrator uses several Free Software components with different licenses:") + - "<ul><li>TrustBridge source code (GPL v>=2)" + - "<li>Qt (LGPL v==2.1)" + - "<li>PolarSSL (GPL v>=2)" + - "<li>Oxygen-Icons (LGPL v==3)" + - "<li>OpenSSL-based signcode utility (GPL v==3)" + + "<ul><li>TrustBridge source code (GNU GPL v>=2)" + + "<li>Qt (GNU LGPL v==2.1 | GNU GPL v==3)" + + "<li>PolarSSL (GNU GPL v>=2)" + + "<li>Oxygen-Icons (GNU LGPL v>=3)" + + "<li>OpenSSL-based signcode utility (GNU GPL v==3)" + "<li>OpenSSL (OpenSSL License)" + "<li>NSIS (zlib/libpng license & Common Public License version 1.0)</ul>" + - tr("Read more about the license information in the 'licenses' directory in the " + tr("You will find the legally binding details in the 'licenses' directory of the " "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>.")); textDesc->setTextFormat(Qt::RichText);