mirror of
https://git.deluge-torrent.org/deluge
synced 2025-04-20 11:35:49 +00:00
Fix up some licence stuff
This commit is contained in:
Andrew Resch
parent
18cc95933a
commit
1afef3425f
8 changed files with 27 additions and 65 deletions
|
|
@ -351,7 +351,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Detta program är fri programvara. Du kan distribuera det och/eller modifiera "
|
||||
"det under villkoren i GNU General Public License, publicerad av Free "
|
||||
"Software Foundation, antingen version 2 eller (om du så vill) någon senare "
|
||||
"Software Foundation, antingen version 3 eller (om du så vill) någon senare "
|
||||
"version. Detta program distribueras i hopp om att det ska vara användbart, "
|
||||
"men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om "
|
||||
"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General "
|
||||
|
|
|
|||
|
|
@ -21,15 +21,6 @@
|
|||
# 51 Franklin Street, Fifth Floor
|
||||
# Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# In addition, as a special exception, the copyright holders give
|
||||
# permission to link the code of portions of this program with the OpenSSL
|
||||
# library.
|
||||
# You must obey the GNU General Public License in all respects for all of
|
||||
# the code used other than OpenSSL. If you modify file(s) with this
|
||||
# exception, you may extend this exception to your version of the file(s),
|
||||
# but you are not obligated to do so. If you do not wish to do so, delete
|
||||
# this exception statement from your version. If you delete this exception
|
||||
# statement from all source files in the program, then also delete it here
|
||||
|
||||
import gtk
|
||||
|
||||
|
|
|
|||
|
|
@ -19,13 +19,3 @@
|
|||
# 51 Franklin Street, Fifth Floor
|
||||
# Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# In addition, as a special exception, the copyright holders give
|
||||
# permission to link the code of portions of this program with the OpenSSL
|
||||
# library.
|
||||
# You must obey the GNU General Public License in all respects for all of
|
||||
# the code used other than OpenSSL. If you modify file(s) with this
|
||||
# exception, you may extend this exception to your version of the file(s),
|
||||
# but you are not obligated to do so. If you do not wish to do so, delete
|
||||
# this exception statement from your version. If you delete this exception
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ adapted for deluge-webui:
|
|||
-pretty errors for well known exceptions.
|
||||
|
||||
|
||||
web.py :
|
||||
adapted from Django <djangoproject.com>
|
||||
debugerror.py :
|
||||
This is adapted from Django <djangoproject.com>
|
||||
Copyright (c) 2005, the Lawrence Journal-World
|
||||
Used under the modified BSD license:
|
||||
http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
# Copyright (c) 2004-2007, CherryPy Team (team@cherrypy.org)
|
||||
# All rights reserved.
|
||||
# See LICENSE.TXT
|
||||
|
||||
"""A high-speed, production ready, thread pooled, generic WSGI server.
|
||||
|
||||
Simplest example on how to use this module directly
|
||||
|
|
@ -5,7 +9,7 @@ Simplest example on how to use this module directly
|
|||
|
||||
from cherrypy import wsgiserver
|
||||
|
||||
def my_crazy_app(environ, start_response):
|
||||
def my_crazy_a pp(environ, start_response):
|
||||
status = '200 OK'
|
||||
response_headers = [('Content-type','text/plain')]
|
||||
start_response(status, response_headers)
|
||||
|
|
@ -1016,4 +1020,3 @@ class CherryPyWSGIServer(object):
|
|||
if key and value:
|
||||
wsgikey = 'SSL_SERVER_%s_DN_%s' % (prefix, key)
|
||||
self.ssl_environ[wsgikey] = value
|
||||
|
||||
|
|
|
|||
|
|
@ -21,17 +21,8 @@
|
|||
# 51 Franklin Street, Fifth Floor
|
||||
# Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# In addition, as a special exception, the copyright holders give
|
||||
# permission to link the code of portions of this program with the OpenSSL
|
||||
# library.
|
||||
# You must obey the GNU General Public License in all respects for all of
|
||||
# the code used other than OpenSSL. If you modify file(s) with this
|
||||
# exception, you may extend this exception to your version of the file(s),
|
||||
# but you are not obligated to do so. If you do not wish to do so, delete
|
||||
# this exception statement from your version. If you delete this exception
|
||||
# statement from all source files in the program, then also delete it here.
|
||||
|
||||
#only for development/debugging.
|
||||
import deluge_webserver
|
||||
|
||||
deluge_webserver.run(debug = True)
|
||||
deluge_webserver.run(debug = True)
|
||||
|
|
|
|||
|
|
@ -17,15 +17,6 @@
|
|||
# 51 Franklin Street, Fifth Floor
|
||||
# Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# In addition, as a special exception, the copyright holders give
|
||||
# permission to link the code of portions of this program with the OpenSSL
|
||||
# library.
|
||||
# You must obey the GNU General Public License in all respects for all of
|
||||
# the code used other than OpenSSL. If you modify file(s) with this
|
||||
# exception, you may extend this exception to your version of the file(s),
|
||||
# but you are not obligated to do so. If you do not wish to do so, delete
|
||||
# this exception statement from your version. If you delete this exception
|
||||
# statement from all source files in the program, then also delete it here.
|
||||
|
||||
---------------
|
||||
all javascript is optional, everything should work web 1.0
|
||||
|
|
@ -235,22 +226,3 @@ if (document.cookie.length>0)
|
|||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,22 @@
|
|||
/*
|
||||
(c) Martijn Voncken mvoncken@gmail.com
|
||||
License : GPLv3
|
||||
# Copyright (C) Martijn Voncken 2008 <mvoncken@gmail.com>
|
||||
#
|
||||
# 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, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; 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 General Public License
|
||||
# along with this program. If not, write to:
|
||||
# The Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor
|
||||
# Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
quick and dirty auto-refresh timer.
|
||||
Our users have waited too long for a new auto-refresh.
|
||||
|
|
@ -53,4 +69,3 @@ function toggle_timer() {
|
|||
start_timer();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue