diff options
Diffstat (limited to 'tools/linguist/lrelease')
| -rw-r--r-- | tools/linguist/lrelease/lrelease.1 | 34 | ||||
| -rw-r--r-- | tools/linguist/lrelease/main.cpp | 26 |
2 files changed, 30 insertions, 30 deletions
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1 index 3c5f9be..c170e2a 100644 --- a/tools/linguist/lrelease/lrelease.1 +++ b/tools/linguist/lrelease/lrelease.1 @@ -9,9 +9,9 @@ .\" No Commercial Usage .\" This file contains pre-release code and may not be distributed. .\" You may use this file in accordance with the terms and conditions -.\" contained in the either Technology Preview License Agreement or the -.\" Beta Release License Agreement. -.\" +.\" contained in the Technology Preview License Agreement accompanying +.\" this package. +.\" .\" 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 @@ -19,22 +19,22 @@ .\" 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.0, included in the file LGPL_EXCEPTION.txt in this +.\" 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 -.\" 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. -.\" -.\" If you are unsure which license is appropriate for your use, please -.\" contact the sales department at http://qt.nokia.com/contact. +.\" +.\" If you have questions regarding the use of this file, please contact +.\" Nokia at qt-info@nokia.com. +.\" +.\" +.\" +.\" +.\" +.\" +.\" +.\" .\" $QT_END_LICENSE$ .\" .SH NAME diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp index c0566b1..ed29f4b 100644 --- a/tools/linguist/lrelease/main.cpp +++ b/tools/linguist/lrelease/main.cpp @@ -9,8 +9,8 @@ ** No Commercial Usage ** This file contains pre-release code and may not be distributed. ** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ** 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.0, included in the file LGPL_EXCEPTION.txt in this +** 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 -** 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. +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |