Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

[Copyright] Small string changes + 2014 copyright

Browse Source
This commit is contained in:
nowrep 2014-01-05 00:57:47 +01:00
parent 3a3e7341a2
commit a1f1d76404
3 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
COPYRIGHT
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2014 David Rosca <nowrep@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
@ -48,19 +48,19 @@
-----------------------------------------------------------------------------
QtSingleApplication class:
-----------------------------------------------------------------------------
**
**
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
**
** This file is part of a Qt Solutions component.
**
** Commercial Usage
** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Solutions Commercial License Agreement provided
** with the Software or, alternatively, in accordance with the terms
** contained in a written agreement between you and Nokia.
**
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
@ -68,29 +68,29 @@
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
** In addition, as a special exception, Nokia gives you certain
** additional rights. These rights are described in the Nokia Qt LGPL
** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
** package.
**
** GNU General Public License Usage
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** Please note Third Party Software included with Qt Solutions may impose
** additional restrictions and it is the user's responsibility to ensure
** that they have met the licensing requirements of the GPL, LGPL, or Qt
** Solutions Commercial license and the relevant license of the Third
** Party Software they are using.
**
**
** If you are unsure which license is appropriate for your use, please
** contact Nokia at qt-info@nokia.com.
**
**
-----------------------------------------------------------------------------
HtmlHighlighter and PlainTextEditorWithLines classes:
-----------------------------------------------------------------------------
@ -181,7 +181,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-----------------------------------------------------------------------------
OpenSearchReader + OpenSearchEngine class:
-----------------------------------------------------------------------------
@ -203,7 +203,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-----------------------------------------------------------------------------
CA certificates from Mozilla included in ca-bundle.crt:
-----------------------------------------------------------------------------
@ -211,25 +211,25 @@
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
#
# The Original Code is the Netscape security libraries.
#
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1994-2000 Netscape Communications Corporation. All
# Rights Reserved.
#
#
# Contributor(s):
#
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and
@ -242,8 +242,11 @@
QtWin class from
http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/
-----------------------------------------------------------------------------
In application are used also some icons from Faenza and Oxygen icon sets,
which are licensed under the GNU/GPL license.
More info at http://tiheum.deviantart.com/art/Faenza-Icons-173323228 and
http://www.oxygen-icons.org/
In application are used also some icons from Oxygen icon set, which are
licensed under the GNU/LGPL license.
More info at http://www.oxygen-icons.org/
-----------------------------------------------------------------------------
Speed Dial uses some icons from Faenza icon set, which are licensed under
the GNU/GPL license.
More info at http://tiheum.deviantart.com/art/Faenza-Icons-173323228
-----------------------------------------------------------------------------

4
src/lib/data/html/copyright
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2014 David Rosca <nowrep@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
@ -246,7 +246,7 @@
licensed under the GNU/LGPL license.
More info at http://www.oxygen-icons.org/
-----------------------------------------------------------------------------
Speed Dial page some icons from Faenza icon set, which are licensed under
Speed Dial uses some icons from Faenza icon set, which are licensed under
the GNU/GPL license.
More info at http://tiheum.deviantart.com/art/Faenza-Icons-173323228
-----------------------------------------------------------------------------

4
src/lib/webview/webview.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2014 David Rosca <nowrep@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
@ -962,7 +962,7 @@ void WebView::createPageContextMenu(QMenu* menu, const QPoint &pos)
else {
menu->addSeparator();
menu->addAction(tr("&Add new page"), this, SLOT(addSpeedDial()));
menu->addAction(tr("&Add New Page"), this, SLOT(addSpeedDial()));
menu->addAction(tr("&Configure Speed Dial"), this, SLOT(configureSpeedDial()));
}
}