summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lrelease
diff options
context:
space:
mode:
Diffstat (limited to 'tools/linguist/lrelease')
-rw-r--r--tools/linguist/lrelease/lrelease.149
-rw-r--r--tools/linguist/lrelease/lrelease.pro2
-rw-r--r--tools/linguist/lrelease/main.cpp4
3 files changed, 37 insertions, 18 deletions
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index 7e01d68..9e77504 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -1,21 +1,42 @@
.TH lrelease 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-
.\"
.\" Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-\" Contact: Qt Software Information (qt-info@nokia.com)
-.\"
-.\" This file may be distributed and/or modified under the terms of the
-.\" GNU General Public License version 2 as published by the Free Software
+.\" Contact: Nokia Corporation (qt-info@nokia.com)
+.\"
+.\" This file is part of the QtGui module of the Qt Toolkit.
+.\"
+.\" $QT_BEGIN_LICENSE:LGPL$
+.\" 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.
+.\"
+.\" 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
+.\" Foundation and appearing in the file LICENSE.LGPL included in the
+.\" 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
+.\" 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.
-.\"
-.\" This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-.\" WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\" See http://qtsoftware.com/gpl/ for GPL licensing information.
-.\"
-.\" Contact qt-info@nokia.com if any conditions of this licensing are
-.\" not clear to you.
-.\"
+.\" 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://www.qtsoftware.com/contact.
+.\" $QT_END_LICENSE$
+.\"
.SH NAME
lrelease \- generate Qt message files from Qt Linguist translation files
.SH SYNOPSIS
diff --git a/tools/linguist/lrelease/lrelease.pro b/tools/linguist/lrelease/lrelease.pro
index 03ea0d0..01091b3 100644
--- a/tools/linguist/lrelease/lrelease.pro
+++ b/tools/linguist/lrelease/lrelease.pro
@@ -15,10 +15,8 @@ build_all:!build_pass {
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
SOURCES += main.cpp
-include(../../../src/qt_professional.pri)
include(../shared/formats.pri)
include(../shared/proparser.pri)
-include(../shared/translatortools.pri)
target.path=$$[QT_INSTALL_BINS]
INSTALLS += target
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 7d0452f..86b7866 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the Qt Linguist of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** 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 qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/