From 520d79edb516020129e751575f6aaf23eb47f8ab Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 22 Nov 2017 19:40:21 +0100 Subject: [PATCH] Updated credits --- resources/share/legal/3rdparty.html | 12 +++-- resources/share/legal/about.html | 47 ++++++++++---------- resources/share/legal/credits.html | 68 ++++++++++++++--------------- resources/share/legal/data.html | 1 + resources/share/legal/software.html | 4 +- 5 files changed, 65 insertions(+), 67 deletions(-) diff --git a/resources/share/legal/3rdparty.html b/resources/share/legal/3rdparty.html index bdbeed56c..9c495e2aa 100644 --- a/resources/share/legal/3rdparty.html +++ b/resources/share/legal/3rdparty.html @@ -3,7 +3,7 @@ -Third-Party Licenses Used in swift project +Third-Party Licenses used in swift project

Third-Party Licenses Used in swift project

@@ -434,7 +434,7 @@ https://datatracker.ietf.org/ipr/1526/ GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright © 2007 Free Software Foundation, Inc. +Copyright © 2007 Free Software Foundation, Inc. http: //fsf.org/ Everyone is permitted to copy and distribute verbatim copies of this licensedocument, but changing it is not allowed. @@ -606,11 +606,10 @@ permanent authorization for you to choose that version for the Library. 
-Copyright 2002-2008     Xiph.org Foundation
-Copyright 2002-2008     Jean-Marc Valin
+Copyright 2002-2008    Xiph.org Foundation
+Copyright 2002-2008    Jean-Marc Valin
 Copyright 2005-2007    Analog Devices Inc.
-Copyright 2005-2008    Commonwealth Scientific and Industrial Research 
-                        Organisation (CSIRO)
+Copyright 2005-2008    Commonwealth Scientific and Industrial Research Organisation (CSIRO)
 Copyright 1993, 2002, 2006 David Rowe
 Copyright 2003         EpicGames
 Copyright 1992-1994    Jutta Degener, Carsten Bormann
@@ -655,7 +654,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 	
 	
-TBW
 

 
 
\ No newline at end of file
diff --git a/resources/share/legal/about.html b/resources/share/legal/about.html
index a727b41dc..d4ab3478b 100644
--- a/resources/share/legal/about.html
+++ b/resources/share/legal/about.html
@@ -6,28 +6,29 @@
 swift about
 
 
-        
About the project

-        swift is an independent (private and non-commercial) software project creating open source software for flight simulation.
-        
Legal

-        
-        
Data copyright

-        
-        
Other swift resources

-        
-        
Credits

-        
+	
About the project

+	swift is an independent (private and non-commercial) software project creating open source software for flight simulation.
+	
Legal

+	
+	
Data copyright

+	
+	
Other swift resources

+	
+	
Credits

+	
 
 
diff --git a/resources/share/legal/credits.html b/resources/share/legal/credits.html
index 074c1a1cd..15765a862 100644
--- a/resources/share/legal/credits.html
+++ b/resources/share/legal/credits.html
@@ -6,40 +6,38 @@
 swift data copyright
 
 
-        
Credits

-        
Main contributors

-        
    
-                
  • Roland W.
    • 
-                
  • Mathew S.
    • 
-                
  • Klaus B.
    • 
-        

-        
Contributors

-        
    
-                
  • Peter B. (traffic simulator)
    • 
-                
  • Michal G.
    • 
-        

-        
Used software libraries

-        
-        
Used icons, graphics etc.

-        
    
-                
  • FAMFAMFAM icons used, both in client and on websites, see here
-                
  • DIAGONA icons: C) 2013 Yusuke Kamiyamane (site).
-                    All rights reserved. These icons are licensed under a
-                    Creative Commons Attribution 3.0 License.
-                
  • Screenshots and aviation photos courtesy of:
-                    Lukas E., Timm R., Christoph J., Rainer J., Wolfgang S.,
-                    Wiki Commons (Creative Commons) images
-                
    • 
-        

-        
Misc

-        
    
-                
  • Ben S. for X-Plane support
    • 
-                
  • Ross C. for joint development of aircraft parts concept and vPilot rules permission
    • 
-                
  • Kieran H., Kai K., Christoph N., Dominik S. for support
    • 
-                
  • Sascha S. for kicking off the project
    • 
-                
  • BitRock for sponsoring a free license for Open Source projects
    • 
-        

+	
Credits

+	
Main contributors

+	
    
+		
  • Roland W.
    • 
+		
  • Mathew S.
    • 
+		
  • Klaus B.
    • 
+	

+	
Contributors

+	
    
+		
  • Peter B. (traffic simulator)
    • 
+		
  • Michal G.
    • 
+	

+	
Used software libraries

+	
+	
Used icons, graphics etc.

+	
    
+		
  • FAMFAMFAM icons used, both in client and on websites, see here
    • 
+		
  • DIAGONA icons: © 2013 Yusuke Kamiyamane (site). All rights reserved. These icons are licensed under a Creative
+				Commons Attribution 3.0 License.
+		
    • 
+		
  • icondrawer icons: Using icons of http://www.icondrawer.com/ on web site and with client
    • 
+		
  • Screenshots and aviation photos courtesy of: Lukas E., Timm R., Christoph J., Rainer J., Wolfgang S., Wiki Commons (Creative Commons) images
    • 
+	

+	
Misc

+	
    
+		
  • Ben S. for X-Plane support
    • 
+		
  • Ross C. for joint development of aircraft parts concept and vPilot rules permission
    • 
+		
  • Kieran H., Kai K., Christoph N., Dominik S. for support
    • 
+		
  • Sascha S. for kicking off the project
    • 
+		
  • BitRock for sponsoring a free license for Open Source projects
    • 
+	

 
 
diff --git a/resources/share/legal/data.html b/resources/share/legal/data.html
index 88bb8c74d..8fa0735a3 100644
--- a/resources/share/legal/data.html
+++ b/resources/share/legal/data.html
@@ -10,6 +10,7 @@
 	
    
 		
  • All data stored in the database are legal property of swift.
 		
  • No unauthorized usage or copying allowed.
+		
  • Usage is only allowed within swift software components.
 		
  • When you ("the user") enter/upload data to this DB, swift can use them now and forever.
 	

 
diff --git a/resources/share/legal/software.html b/resources/share/legal/software.html
index a6754ebbd..aeb9370b4 100644
--- a/resources/share/legal/software.html
+++ b/resources/share/legal/software.html
@@ -18,7 +18,7 @@
 The following terms apply to all swift programs:
 
 swift pilot client suite
-Copyright (C) 2016  swift Team
+Copyright (C) 2016, 2017, 2018  swift Team
 
 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
@@ -38,7 +38,7 @@ and
 
 
 swift pilot client suite
-Copyright (C) 2016  swift Team
+Copyright (C) 2016, 2017, 2018  swift Team
 
 This program comes with ABSOLUTELY NO WARRANTY; for details see
 see here https://datastore.swift-project.org/page/legal.php.