diff --git a/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java index 5ce88cc1b..edfde1bda 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java @@ -57,12 +57,12 @@ public class LicenseDialog extends JDialog { final String orLicense = "GNU GENERAL PUBLIC LICENSE" + "
" + "
" + "OpenRocket - A model rocket simulator
" + - "Copyright " + Chars.COPY + " 2007-" + copyrightYear + "Sampo Niskanen and others
" + + "Copyright " + Chars.COPY + " 2007-" + copyrightYear + " Sampo Niskanen and others
" + "Project page: https://openrocket.info/
" + "
" + "This program is free software: you can redistribute it and/or modify it under the terms of the " + "GNU General Public License as published by the Free Software Foundation, either version 3 " + - "of the License, or any later version.
" + + "of the License, or any later version. " + "The license may be viewed " + "here.
" + "
" + @@ -70,13 +70,12 @@ public class LicenseDialog extends JDialog { "without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. " + "See the GNU General Public License for more details.
" + "
" + - "You should have received a copy of the GNU Public License along with this program. If not, see
" + - "
" + + "You should have received a copy of the GNU Public License along with this program. If not, you may obtain a copy at " + "https://www.gnu.org/licenses/gpl-3.0.html
" + "
" + "OpenRocket developers may be contacted electronically at:
" + - "
" + - "mailto:openrocket-devel@lists.sourceforge.net
" + + "mailto:openrocket-devel@lists.sourceforge.net
" + + "https://openrocket.slack.com
" + "https://github.com/openrocket
" + "
"; @@ -91,20 +90,19 @@ public class LicenseDialog extends JDialog { "Project page: https://github.com/dbcook/openrocket-database
" + "
" + "Licensed under the Apache License, Version 2.0 (the \"License\"); you may not use this work except in compliance with the License. " + - " A copy of the Apache License may be viewed " + + "You may view the License " + "here.
" + - "You may also obtain a copy of the License at:
" + - "
" + - "http://www.apache.org/licenses/LICENSE-2.0

" + + "You may also obtain a copy of the License at " + + "http://www.apache.org/licenses/LICENSE-2.0
" + "
" + "OpenRocket uses the Work or Derivative Works of Ant, a product which includes software developed by the Apache " + "Software Foundation
" + "
" + - "Ant product also includes software developed by:
" + - "" + "The names \"Ant\" and \"Apache Software Foundation\" must not be used to endorse or " + "promote products derived from this software without prior written permission. For written permission, "+ "please contact apache@apache.org.
" + @@ -114,18 +112,19 @@ public class LicenseDialog extends JDialog { /* BITSTREAM VERA: Deja Vu font */ /*****************************************************************************************************************************/ final String fontLicense = - "Bitstream Vera Font License
" + + "BITSTREAM VERA FONT LICENSE
" + "
" + "OpenRocket makes use of the DejaVu Serif Font
" + "Fonts are Copyright " + Chars.COPY + " 2003 by Bitstream, Inc. All Rights Reserved. " + "Bitstream Vera is a trademark of Bitstream, Inc.
" + "DejaVu changes are in the public domain
" + "Glyphs imported from Arev Fonts Copyright " + Chars.COPY + " 2006 by Tavmjong Bah. All Rights Reserved.
" + + "Project page: https://github.com/dejavu-fonts/dejavu-fonts/
" + "
" + "Licensed according to the Bitstream Vera Font License which may be found " + "
here." + "
" + - "The license is also available at " + + "You may also obtain a copy of the License at " + "https://github.com/dejavu-fonts/dejavu-fonts/blob/master/LICENSE
" + "
"; @@ -134,13 +133,12 @@ public class LicenseDialog extends JDialog { /*****************************************************************************************************************************/ final String commonmarkLicense = "BSD 2-Clause License
" + - "
" + + "
" + "OpenRocket makes use of the Commonmark-Java Library
" + - "Copyright " + Chars.COPY + " 2015-2016 Atlassian Pty Ltd
" + - "All rights reserved.
" + + "Copyright " + Chars.COPY + " 2015-2016 Atlassian Pty Ltd. All rights reserved.
" + + "Project page: https://github.com/commonmark/commonmark-java/
" + "
" + - "See
https://github.com/commonmark/commonmark-java/blob/main/LICENSE.txt " + - "for full terms of use" + + "You may obtain a copy of the License at https://github.com/commonmark/commonmark-java/blob/main/LICENSE.txt." + "
"; /*****************************************************************************************************************************/