diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index 82cc470c3..82db4e6e4 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1456,17 +1456,9 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) ).arg(QLatin1String(QT_VERSION_STR)); QString translatedTextAboutQtText = QMessageBox::tr( "
Katie is a C++ toolkit derived from the Qt 4.8 framework.
" - "Katie is available under two different licensing options designed " - "to accommodate the needs of our various users.
" - "Katie licensed under the GNU LGPL version 3 is appropriate for the " - "development of Qt applications provided you can comply with the terms " - "and conditions of the GNU LGPL version 3.
" - "Katie licensed under the GNU LGPL version 2.1 is appropriate for the " - "development of applications provided you can comply with the terms " - "and conditions of the GNU LGPL version 2.1.
" + "Katie is licensed under the GNU LGPL version 2.1
" "Copyright (C) 2015 The Qt Company Ltd and other contributors.
" "Copyright (C) 2016 Ivailo Monev
" - "Qt and the Qt logo are trademarks of The Qt Company Ltd.
" "See github.com/fluxer/katie for more information.
" ); QMessageBox *msgBox = new QMessageBox(parent); diff --git a/src/tools/moc/moc.1 b/src/tools/moc/moc.1 index 5734d8805..fdd973f61 100644 --- a/src/tools/moc/moc.1 +++ b/src/tools/moc/moc.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "MOC 1" -.TH MOC 1 "2021-07-14" "Katie 4.11.0" "Katie Manual" +.TH MOC 1 "2021-09-06" "Katie 4.11.0" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -323,9 +323,7 @@ limitations is not a high priority for us. .Ve .SH "AUTHORS" .IX Header "AUTHORS" -The Qt Company Ltd. -.PP Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev .PP -Licensed through \s-1GNU\s0 Lesser General Public License/GNU General Public License. +Licensed through \s-1GNU\s0 Lesser General Public License. diff --git a/src/tools/moc/moc.pod b/src/tools/moc/moc.pod index 33a174f25..683a78e04 100644 --- a/src/tools/moc/moc.pod +++ b/src/tools/moc/moc.pod @@ -241,9 +241,7 @@ limitations is not a high priority for us. =head1 AUTHORS -The Qt Company Ltd. - Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev -Licensed through GNU Lesser General Public License/GNU General Public License. +Licensed through GNU Lesser General Public License. diff --git a/src/tools/qdbus/qdbus.1 b/src/tools/qdbus/qdbus.1 index 7af420298..0900ef166 100644 --- a/src/tools/qdbus/qdbus.1 +++ b/src/tools/qdbus/qdbus.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUS 1" -.TH QDBUS 1 "2021-07-14" "Katie 4.11.0" "Katie Manual" +.TH QDBUS 1 "2021-09-06" "Katie 4.11.0" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -119,12 +119,10 @@ and properties available on the object. qdbus returns 0 on success and other on unexcepted failure. .SH "AUTHORS" .IX Header "AUTHORS" -The Qt Company Ltd. -.PP Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev .PP -Licensed through \s-1GNU\s0 Lesser General Public License/GNU General Public License. +Licensed through \s-1GNU\s0 Lesser General Public License. .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fBdbus\-cleanup\-sockets\fR\|(1), \fBdbus\-launch\fR\|(1), \fBdbus\-send\fR\|(1), \fBdbus\-daemon\fR\|(1), diff --git a/src/tools/qdbus/qdbus.pod b/src/tools/qdbus/qdbus.pod index c3faaa691..c82ca47dd 100644 --- a/src/tools/qdbus/qdbus.pod +++ b/src/tools/qdbus/qdbus.pod @@ -45,12 +45,10 @@ qdbus returns 0 on success and other on unexcepted failure. =head1 AUTHORS -The Qt Company Ltd. - Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev -Licensed through GNU Lesser General Public License/GNU General Public License. +Licensed through GNU Lesser General Public License. =head1 SEE ALSO diff --git a/src/tools/qdbus/qdbuscpp2xml.1 b/src/tools/qdbus/qdbuscpp2xml.1 index ff49c580b..0071aa773 100644 --- a/src/tools/qdbus/qdbuscpp2xml.1 +++ b/src/tools/qdbus/qdbuscpp2xml.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUSCPP2XML 1" -.TH QDBUSCPP2XML 1 "2021-07-14" "Katie 4.11.0" "Katie Manual" +.TH QDBUSCPP2XML 1 "2021-09-06" "Katie 4.11.0" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -114,9 +114,7 @@ class and produces the D\-Bus Introspection \s-1XML.\s0 qdbuscpp2xml returns 0 on success and other on unexcepted failure. .SH "AUTHORS" .IX Header "AUTHORS" -The Qt Company Ltd. -.PP Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev .PP -Licensed through \s-1GNU\s0 Lesser General Public License/GNU General Public License. +Licensed through \s-1GNU\s0 Lesser General Public License. diff --git a/src/tools/qdbus/qdbuscpp2xml.pod b/src/tools/qdbus/qdbuscpp2xml.pod index b3d74eb6d..6c789023b 100644 --- a/src/tools/qdbus/qdbuscpp2xml.pod +++ b/src/tools/qdbus/qdbuscpp2xml.pod @@ -40,9 +40,7 @@ qdbuscpp2xml returns 0 on success and other on unexcepted failure. =head1 AUTHORS -The Qt Company Ltd. - Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev -Licensed through GNU Lesser General Public License/GNU General Public License. +Licensed through GNU Lesser General Public License. diff --git a/src/tools/qdbus/qdbusxml2cpp.1 b/src/tools/qdbus/qdbusxml2cpp.1 index e6553eb74..4d50b78d8 100644 --- a/src/tools/qdbus/qdbusxml2cpp.1 +++ b/src/tools/qdbus/qdbusxml2cpp.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUSXML2CPP 1" -.TH QDBUSXML2CPP 1 "2021-07-14" "Katie 4.11.0" "Katie Manual" +.TH QDBUSXML2CPP 1 "2021-09-06" "Katie 4.11.0" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -131,9 +131,7 @@ to the standard output. qdbusxml2cpp returns 0 on success and other on unexcepted failure. .SH "AUTHORS" .IX Header "AUTHORS" -The Qt Company Ltd. -.PP Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev .PP -Licensed through \s-1GNU\s0 Lesser General Public License/GNU General Public License. +Licensed through \s-1GNU\s0 Lesser General Public License. diff --git a/src/tools/qdbus/qdbusxml2cpp.pod b/src/tools/qdbus/qdbusxml2cpp.pod index a3cc7589d..b5760580b 100644 --- a/src/tools/qdbus/qdbusxml2cpp.pod +++ b/src/tools/qdbus/qdbusxml2cpp.pod @@ -57,9 +57,7 @@ qdbusxml2cpp returns 0 on success and other on unexcepted failure. =head1 AUTHORS -The Qt Company Ltd. - Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev -Licensed through GNU Lesser General Public License/GNU General Public License. +Licensed through GNU Lesser General Public License. diff --git a/src/tools/qscript/qscript.1 b/src/tools/qscript/qscript.1 index 77082a3ca..495336609 100644 --- a/src/tools/qscript/qscript.1 +++ b/src/tools/qscript/qscript.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QSCRIPT 1" -.TH QSCRIPT 1 "2021-07-14" "Katie 4.11.0" "Katie Manual" +.TH QSCRIPT 1 "2021-09-06" "Katie 4.11.0" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -105,8 +105,6 @@ qscript returns 0 on success, 1 on wrong usage and other on unexpected failure. .SH "AUTHORS" .IX Header "AUTHORS" -The Qt Company Ltd. -.PP Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev .PP diff --git a/src/tools/qscript/qscript.pod b/src/tools/qscript/qscript.pod index f35af3301..bfc491093 100644 --- a/src/tools/qscript/qscript.pod +++ b/src/tools/qscript/qscript.pod @@ -31,8 +31,6 @@ failure. =head1 AUTHORS -The Qt Company Ltd. - Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2016 Ivailo Monev diff --git a/src/tools/rcc/rcc.1 b/src/tools/rcc/rcc.1 index 2153beb2d..8594d050f 100644 --- a/src/tools/rcc/rcc.1 +++ b/src/tools/rcc/rcc.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "RCC 1" -.TH RCC 1 "2021-07-14" "Katie 4.11.0" "Katie Manual" +.TH RCC 1 "2021-09-06" "Katie 4.11.0" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -128,9 +128,7 @@ rcc [options]Katie is a C++ toolkit derived from the Qt 4.8 framework.
Katie is " -"available under two different licensing options designed to accommodate the " -"needs of our various users.
Katie licensed under the GNU LGPL version " -"3 is appropriate for the development of Qt applications provided you " -"can comply with the terms and conditions of the GNU LGPL version 3." -"p>
Katie licensed under the GNU LGPL version 2.1 is appropriate for the " -"development of applications provided you can comply with the terms and " -"conditions of the GNU LGPL version 2.1.
Copyright (C) 2015 The Qt " +"licensed under the GNU LGPL version 2.1
Copyright (C) 2015 The Qt " "Company Ltd and other contributors.
Copyright (C) 2016 Ivailo Monev" -"p>
Qt and the Qt logo are trademarks of The Qt Company Ltd.
See github.com/fluxer/katie for " -"more information.
" +"p>See github.com/fluxer/" +"katie for more information.
" msgstr "" -#: src/gui/dialogs/qmessagebox.cpp:1474 +#: src/gui/dialogs/qmessagebox.cpp:1466 msgid "About Katie" msgstr "" @@ -4851,11 +4844,11 @@ msgstr "" msgid "Connection timed out" msgstr "" -#: src/network/socket/qabstractsocket.cpp:1651 +#: src/network/socket/qabstractsocket.cpp:1646 msgid "Socket operation timed out" msgstr "" -#: src/network/socket/qabstractsocket.cpp:2062 +#: src/network/socket/qabstractsocket.cpp:2057 msgid "Socket is not connected" msgstr "" @@ -5209,32 +5202,32 @@ msgctxt "QHttp" msgid "HTTP request failed" msgstr "" -#: src/network/access/qhttp.cpp:2699 +#: src/network/access/qhttp.cpp:2698 msgctxt "QHttp" msgid "Invalid HTTP response header" msgstr "" -#: src/network/access/qhttp.cpp:2727 +#: src/network/access/qhttp.cpp:2726 msgctxt "QHttp" msgid "Unknown authentication method" msgstr "" -#: src/network/access/qhttp.cpp:2737 +#: src/network/access/qhttp.cpp:2736 msgctxt "QHttp" msgid "Proxy authentication required" msgstr "" -#: src/network/access/qhttp.cpp:2741 +#: src/network/access/qhttp.cpp:2740 msgctxt "QHttp" msgid "Authentication required" msgstr "" -#: src/network/access/qhttp.cpp:2824 src/network/access/qhttp.cpp:2872 +#: src/network/access/qhttp.cpp:2823 src/network/access/qhttp.cpp:2871 msgctxt "QHttp" msgid "Invalid HTTP chunked body" msgstr "" -#: src/network/access/qhttp.cpp:2910 +#: src/network/access/qhttp.cpp:2909 msgctxt "QHttp" msgid "Error writing response to device" msgstr "" @@ -5255,99 +5248,99 @@ msgctxt "QNetworkReply" msgid "backend start error." msgstr "" -#: src/network/access/qnetworkreplyimpl.cpp:767 -#: src/network/access/qnetworkreplyimpl.cpp:797 +#: src/network/access/qnetworkreplyimpl.cpp:766 +#: src/network/access/qnetworkreplyimpl.cpp:796 msgid "Operation canceled" msgstr "" -#: src/network/access/qftp.cpp:843 +#: src/network/access/qftp.cpp:842 msgid "Not connected" msgstr "" -#: src/network/access/qftp.cpp:922 +#: src/network/access/qftp.cpp:921 msgid "Host %1 not found" msgstr "" -#: src/network/access/qftp.cpp:926 +#: src/network/access/qftp.cpp:925 msgid "Connection refused to host %1" msgstr "" -#: src/network/access/qftp.cpp:930 +#: src/network/access/qftp.cpp:929 msgid "Connection timed out to host %1" msgstr "" -#: src/network/access/qftp.cpp:1034 +#: src/network/access/qftp.cpp:1033 msgid "Connected to host %1" msgstr "" -#: src/network/access/qftp.cpp:1242 +#: src/network/access/qftp.cpp:1241 msgid "Connection refused for data connection" msgstr "" -#: src/network/access/qftp.cpp:2312 +#: src/network/access/qftp.cpp:2311 msgctxt "QFtp" msgid "" "Connecting to host failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2316 +#: src/network/access/qftp.cpp:2315 msgctxt "QFtp" msgid "" "Login failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2320 +#: src/network/access/qftp.cpp:2319 msgctxt "QFtp" msgid "" "Listing directory failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2324 +#: src/network/access/qftp.cpp:2323 msgctxt "QFtp" msgid "" "Changing directory failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2328 +#: src/network/access/qftp.cpp:2327 msgctxt "QFtp" msgid "" "Downloading file failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2332 +#: src/network/access/qftp.cpp:2331 msgctxt "QFtp" msgid "" "Uploading file failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2336 +#: src/network/access/qftp.cpp:2335 msgctxt "QFtp" msgid "" "Removing file failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2340 +#: src/network/access/qftp.cpp:2339 msgctxt "QFtp" msgid "" "Creating directory failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2344 +#: src/network/access/qftp.cpp:2343 msgctxt "QFtp" msgid "" "Removing directory failed:\n" "%1" msgstr "" -#: src/network/access/qftp.cpp:2372 +#: src/network/access/qftp.cpp:2371 msgctxt "QFtp" msgid "Connection closed" msgstr "" diff --git a/translations/qt_tools.pot b/translations/qt_tools.pot index b685139a3..64a53e3e3 100644 --- a/translations/qt_tools.pot +++ b/translations/qt_tools.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-25 17:50+0300\n" +"POT-Creation-Date: 2021-09-07 01:25+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME