Author: shevek Date: 2011-05-08 19:00:35 +0200 (Sun, 08 May 2011) New Revision: 1359 Modified: trunk/COPYRIGHT trunk/CREDITS Log: Credits and Copyright revisited Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2011-05-07 18:46:51 UTC (rev 1358) +++ trunk/COPYRIGHT 2011-05-08 17:00:35 UTC (rev 1359) @@ -1,11 +1,12 @@ LICENSES -------------------------------------------------------------------------------- -All programs are either under the GPL, LGPL, Artistic or BSD licenses, see +All programs are either under the AGPL, GPL, LGPL, Artistic or BSD licenses, see below for details. On Debian systems, the complete text of these licenses can be found in: +/usr/share/common-licenses/AGPL /usr/share/common-licenses/GPL-3 /usr/share/common-licenses/Artistic /usr/share/common-licenses/BSD @@ -56,12 +57,12 @@ some icons -------------------------------------------------------------------------------- -It was downloaded from http://tango.freedesktop.org/ +Some were downloaded from http://tango.freedesktop.org/ Copyright: Creative Commons Attribution-ShareAlike 2.5 License Agreement http://creativecommons.org/licenses/by-sa/2.5/ -other from: http://www.famfamfam.com/lab/icons/silk/ +others from: http://www.famfamfam.com/lab/icons/silk/ Copyright: Creative Commons Attribution 2.5 License Agreement http://creativecommons.org/licenses/by/2.5/ @@ -72,13 +73,13 @@ published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -and others icons from openoffice.org-style-human debian package +and other icons from openoffice.org-style-human debian package Copyright 2002-2007 Sun Microsystems, Inc. This product is made available subject to the terms of GNU Lesser General Public License Version 2.1. A copy of the LGPL license can be found http://www.openoffice.org/project/www/license.html -others +other stuff (libraries, etc) -------------------------------------------------------------------------------- wave / wave in a box @@ -124,6 +125,7 @@ emoticons from Adium and Kopete theme kopete adium theme by robotangel and original "Adiumicons" by Oscar Gruno under GNU GPL license + http://www.gnu.org/copyleft/gpl.html dom region library: XWiki Platform @@ -137,12 +139,12 @@ Copyright: (C) 2004 Fluendo S.L under GNU General Public License video embed dialog: - Some ideas and embeded video code from: + Some ideas and embedded video code from: http://www.jovelstefan.de/embedded-video/ (GPL) http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/ -some license description: - from Wikipedia +some license descriptions: + from Wikipedia (English) http://en.wikipedia.org/ Copyright: under GFDL http://www.gnu.org/copyleft/fdl.html some Action classes: Modified: trunk/CREDITS =================================================================== --- trunk/CREDITS 2011-05-07 18:46:51 UTC (rev 1358) +++ trunk/CREDITS 2011-05-08 17:00:35 UTC (rev 1359) @@ -11,14 +11,12 @@ Contributors -------------------------------------------------------------------------------- -* Thanks to David Trigo and http://www.esperanto-es.net/ for suggest the name of -'kune' for our initiative: +* Thanks to David Trigo and http://www.esperanto-es.net/ for suggesting the name of 'kune' for our initiative: http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469 -* Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo -Freire staff. -* Javier Picado Ladrón de Guevara and the <URL:http://iepala.es> staff for their support and infraestructure +* Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo Freire staff +* Javier Picado Ladrón de Guevara and the <URL:http://iepala.es> staff for their support and infrastructure * Javier de la Cueva and Leovigildo García-Bobadilla for the legal support -* Jonathan Araña Cruz, Roxu and all the <URL:http://xsto.info> staff for help with the infraestructure +* Jonathan Araña Cruz, Roxu and all the <URL:http://xsto.info> staff for their help with the infrastructure * Daniel Jiménez for the initial help and coordination -* Johnattan Rupire and William Austen Bradbury for web contributions and translations. +* Johnattan Rupire and William Austen Bradbury for their web contributions and translations * and <URL:http://ourproject.org> and again <URL:http://xsto.info> and <URL:http://iepala.es> for sharing with us their resources