diff options
409 files changed, 12465 insertions, 11378 deletions
@@ -61,7 +61,7 @@ configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-ope Recommended configuration options for Linux: -configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns +configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns ### OS X diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt index 7e2e30ff9..7c9dcac17 100644 --- a/LGPL_EXCEPTION.txt +++ b/LGPL_EXCEPTION.txt @@ -1,4 +1,4 @@ -Digia Qt LGPL Exception version 1.1 +The Qt Company LGPL Exception version 1.1 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index aed671a0c..8fbb74390 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. diff --git a/dist/config/watermark.png b/dist/config/watermark.png Binary files differindex fc44c44f4..c154c5400 100644 --- a/dist/config/watermark.png +++ b/dist/config/watermark.png diff --git a/dist/packages/org.qtproject.ifw/meta/3RDPARTY b/dist/packages/org.qtproject.ifw/meta/3RDPARTY index 58b055221..59325fa83 100644 --- a/dist/packages/org.qtproject.ifw/meta/3RDPARTY +++ b/dist/packages/org.qtproject.ifw/meta/3RDPARTY @@ -20,7 +20,7 @@ KD Tools Sources for the KD Tools library are under src/libs/kdtools. The library is released under the same license as the rest -of the installer framework (GPL 3.0/LGPL 2.1 with Digia -exception/Digia Commercial License). +of the installer framework (LGPL 3.0/LGPL 2.1 with The Qt Company +exception/The Qt Company Commercial License). The copyright is owned by Klaralvdalens Datakonsult AB. diff --git a/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt b/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt index add80b931..918157a31 100644 --- a/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt +++ b/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt @@ -1,4 +1,4 @@ -Digia Qt LGPL Exception version 1.1 +The Qt Company LGPL Exception version 1.1 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate diff --git a/dist/packages/org.qtproject.ifw/meta/package.xml b/dist/packages/org.qtproject.ifw/meta/package.xml index 2c7f592bb..3a54cb9d3 100644 --- a/dist/packages/org.qtproject.ifw/meta/package.xml +++ b/dist/packages/org.qtproject.ifw/meta/package.xml @@ -6,7 +6,7 @@ <ReleaseDate>2013-12-12</ReleaseDate> <Licenses> <License name="LGPL 2.1" file="LICENSE.LGPL" /> - <License name="Digial Qt LGPL Exception 1.1" file="LGPL_EXCEPTION.txt" /> + <License name="The Qt Company LGPL Exception 1.1" file="LGPL_EXCEPTION.txt" /> <License name="Third Party Code Licenses" file="3RDPARTY" /> </Licenses> <Script>installscript.qs</Script> diff --git a/doc/config/ifw.qdocconf b/doc/config/ifw.qdocconf index a767ccc56..f399ca872 100644 --- a/doc/config/ifw.qdocconf +++ b/doc/config/ifw.qdocconf @@ -18,7 +18,7 @@ exampledirs = $SRCDIR ../../examples headers.fileextensions = "*.h" sources.fileextensions = "*.qdoc *.qdocinc *.cpp" -examples.fileextensions = "*.js *.qs *.txt *.xml *.ui" +examples.fileextensions = "*.js *.qs *.txt *.xml *.ui *.ts" examples.imageextensions = "*.png" indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \ @@ -59,3 +59,85 @@ outputprefixes = QML outputprefixes.QML = navigation.homepage = "Qt Installer Framework Manual" + +defines += ABSTRACTTASK_H \ + ADMINAUTHORIZATION_H \ + COMPONENT_H \ + COMPONENT_P_H \ + COMPONENTCHECKER_H \ + CONSTANTS_H \ + CONSUMEOUTPUTOPERATION_H \ + COPYDIRECTORYOPERATION_H \ + COPYFILETASK_H \ + CREATEDESKTOPENTRYOPERATION_H \ + CREATELINKOPERATION_H \ + CREATELOCALREPOSITORYOPERATION_H \ + CREATESHORTCUTOPERATION_H \ + DOWNLOADARCHIVESJOB_H \ + DOWNLOADFILETASK_H \ + DOWNLOADFILETASK_P_H \ + ELEVATEDEXECUTEOPERATION_H \ + ENVIRONMENTVARIABLESOPERATION_H \ + ERRORS_H \ + EXTRACTARCHIVEOPERATION_H \ + EXTRACTARCHIVEOPERATION_P_H \ + FAKESTOPPROCESSFORUPDATEOPERATION_H \ + FILEIO_H \ + FILEUTILS_H \ + GLOBALS_H \ + GLOBALSETTINGSOPERATION_H \ + GRAPH_H \ + INSTALLERCALCULATOR_H \ + INSTALLICONSOPERATION_H \ + KD_UPDATER_H \ + KD_UPDATER_UPDATE_INFO_DATA_H \ + KD_UPDATER_UPDATE_INFO_H \ + KD_UPDATER_UPDATE_OPERATIONS_H \ + KDSYSINFO_H \ + KEEPALIVEOBJECT_H \ + LIBINSTALLER_ENVIRONMENT_H \ + LICENSEOPERATION_H \ + LINEREPLACEOPERATION_H \ + METADATAJOB_H \ + METADATAJOB_P_H \ + MINIMUMPROGRESSOPERATION_H \ + OBSERVER_H \ + PACKAGEMANAGERCORE_P_H \ + PACKAGEMANAGERCOREDATA_H \ + PACKAGEMANAGERPAGEFACTORY_H \ + PACKAGEMANAGERPROXYFACTORY_H \ + PERMISSIONSETTINGS_H \ + PROGRESSCOORDINATOR_H \ + PROTOCOL_H \ + PROXYCREDENTIALSDIALOG_H \ + Q_OS_.* \ + QINSTALLER_FILEUTILS_H \ + QINSTALLER_GLOBAL_H \ + QINSTALLER_INIT_H \ + QINSTALLER_MESSAGEBOXHANDLER_H \ + QINSTALLER_UTILS_H \ + QPROCESSWRAPPER_H \ + QSETTINGSWRAPPER_H \ + QT_VERSION \ + REGISTERFILETYPEOPERATION_H \ + REMOTECLIENT_H \ + REMOTECLIENT_P_H \ + REMOTEFILEENGINE_H \ + REMOTEOBJECT_H \ + REMOTESERVER_H \ + REMOTESERVER_P_H \ + REMOTESERVERCONNECTION_H \ + REPLACEOPERATION_H \ + REPOSITORY_H \ + SCRIPTENGINE_P_H \ + SELFRESTARTOPERATION_H \ + SERVERAUTHENTICATIONDIALOG_H \ + SETTINGS_H \ + SETTINGSOPERATION_H \ + SIMPLEMOVEFILEOPERATION_H \ + SYSTEMINFO_H \ + TESTREPOSITORY_H \ + UI_PROXYCREDENTIALSDIALOG_H \ + UI_SERVERAUTHENTICATIONDIALOG_H \ + UNINSTALLERCALCULATOR_H \ + UNZIPTASK_H diff --git a/doc/fixnavi.pl b/doc/fixnavi.pl index 93147e8c3..be5c811a6 100644 --- a/doc/fixnavi.pl +++ b/doc/fixnavi.pl @@ -1,8 +1,8 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/doc/installerfw-cpp-classes.qdoc b/doc/installerfw-cpp-classes.qdoc index 04d077314..d1ab8747d 100644 --- a/doc/installerfw-cpp-classes.qdoc +++ b/doc/installerfw-cpp-classes.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/doc/installerfw-examples.qdoc b/doc/installerfw-examples.qdoc index 1b0bd5a0b..95d995788 100644 --- a/doc/installerfw-examples.qdoc +++ b/doc/installerfw-examples.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index 134ccce60..55d5ccfc4 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -94,7 +94,7 @@ We recommend that you use the following configuration options for Linux: \code - configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns + configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns \endcode \section3 Configuring Qt for OS X diff --git a/doc/installerfw-online.qdocconf b/doc/installerfw-online.qdocconf index 96a119a03..f216ff02c 100644 --- a/doc/installerfw-online.qdocconf +++ b/doc/installerfw-online.qdocconf @@ -4,13 +4,13 @@ include(config/ifw.qdocconf) HTML.footer = \ " </div>\n" \ " <p class=\"copy-notice\">\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ " License version 1.3</a> as published by the Free Software Foundation. " \ - " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " The Qt Company, Qt and their respective logos are trademarks of The Qt Company Ltd " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. </p>\n" diff --git a/doc/installerfw-overview.qdoc b/doc/installerfw-overview.qdoc index f3af75fc2..5c863f76a 100644 --- a/doc/installerfw-overview.qdoc +++ b/doc/installerfw-overview.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/doc/installerfw-reference.qdoc b/doc/installerfw-reference.qdoc index d768083c6..2a243df8c 100644 --- a/doc/installerfw-reference.qdoc +++ b/doc/installerfw-reference.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/doc/installerfw-using.qdoc b/doc/installerfw-using.qdoc index 743fa2ab4..bd2d60823 100644 --- a/doc/installerfw-using.qdoc +++ b/doc/installerfw-using.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 283537124..596efeed7 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -453,7 +453,17 @@ interfaces, create QTranslator files that the installation system loads along with the component. The installer loads the translation file that matches the current system locale. For example, if the system locale is - German, the de_de.qm file is loaded. + German, the de.qm file is loaded. In addition, a localized \c license_de.txt + is shown instead of the default \c license.txt if it is found. + + Translations need to be added to the \c package.xml file to be activated for + a component: + + \code + <Translations> + <Translation>de.qm</Translation> + </Translations> + \endcode Use the \c {qsTr()} function for literal text within scripts. Additionally, you can add the \c Component.prototype.retranslateUi method to the script. @@ -462,10 +472,11 @@ The context being used for translation is the basename of the script file when using \c qsTr or the class name of the UI file when translating a user - interface. + interface. For example, if the script file is called \c installscript.qs, the + context will be installscript. \note The translation system can also be used to customize the UI. Use e.g. - an \c en_en.ts file to replace any text in the installer with a custom English + an \c en.ts file to replace any text in the installer with a custom English version. */ @@ -563,8 +574,20 @@ \l{Component Dependencies}. \row \li AutoDependOn - \li Opposite of dependencies. Defines that this component should be - loaded if all of the specified components are loaded. + \li Comma-separated list of identifiers of components that + this component has an automatic dependency on. + The component is installed if and only if + all of the specified dependencies are fulfilled. + If a component has an automatic dependency on other components, + the check box will not be visible next to the component in the component tree. + The selection will be performed automatically. + If the component was not installed before, it will + be selected for installation only when all components + from this list are also selected for installation. + If the component was already installed, it will + be selected for uninstallation when at least one of the components + from this list is also selected for uninstallation. + For more information, see \l{Component Dependencies}. \row \li Virtual \li Set to \c true to hide the component from the installer. @@ -686,11 +709,11 @@ \list - \li \c installerbase + \li \l installerbase - \li \c binarycreator + \li \l binarycreator - \li \c repogen + \li \l repogen \endlist @@ -1150,7 +1173,7 @@ <Repository action="remove" url="http://www.example.com/repository" /> \endcode - \section2 Replacing repositories + \section2 Replacing Repositories To replace one repository with another, add a \c <Repository> child element to the \c <RepositoryUpdate> element with the following options: diff --git a/doc/noninteractive.qdoc b/doc/noninteractive.qdoc index fb5663c1c..deba297c6 100644 --- a/doc/noninteractive.qdoc +++ b/doc/noninteractive.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -40,6 +40,8 @@ It also gives an overview of installer pages and the widgets that are available on each page, such as push buttons, radio buttons, and line edits. + \section1 Writing Control Scripts + A minimal valid script needs to contain at least a constructor, which can look like this: \code function Controller() @@ -47,7 +49,11 @@ } \endcode - A bit more advanced script is presented here: + The following example presents a more advanced script that uses the \l gui + JavaScript global object methods to set a new page title and welcome message + on the introduction page and to automatically click the \uicontrol Next + button on the target directory page: + \code function Controller() { @@ -68,8 +74,33 @@ } \endcode + For more information about the JavaScript global objects that you can use + in control scripts, see \l{Scripting API}. + + \section1 Predefined Installer Pages + + The QInstaller JavaScript object provides access to the following predefined + installer pages: + + \list + \li \c Introduction + \li \c TargetDirectory + \li \c ComponentSelection + \li \c LicenseCheck + \li \c StartMenuSelection + \li \c ReadyForInstallation + \li \c PerformInstallation + \li \c InstallationFinished + \endlist + + The \l buttons JavaScript object provides a set of buttons that can be used + on installer pages. + + The following sections describe the functions that you can implement to + interact with installer pages and the widgets that are available on each + page. - \section1 Introduction Page + \section2 Introduction Page Implement the \c Controller.prototype.IntroductionPageCallback() function to interact with widgets on the introduction page. @@ -87,16 +118,16 @@ \row \li \c ErrorLabel - \li Can be used to show an error message. + \li Displays an error message. \row \li \c MessageLabel - \li Can be used to show a message. By default, it shows the + \li Displays a message. By default, it displays the "Welcome to the \l{ProductNameTarget}{<Name>} Setup Wizard" message. \row \li \c InformationLabel - \li Label to show some progress information. + \li Displays progress information. \endtable \table @@ -159,7 +190,7 @@ \endcode - \section1 License Agreement Page + \section2 License Agreement Page Implement the \c Controller.prototype.LicenseAgreementPageCallback() function to interact with widgets on the license agreement page. @@ -186,7 +217,7 @@ \row \li \c AcceptLicenseLabel - \li Shows the text next to the accept radio license button. + \li Shows the text next to the accept license radio button. \row \li \c RejectLicenseLabel @@ -207,16 +238,16 @@ \li Rejects the license agreement. Selected by default. \endtable - \section1 Target Directory Page + \section2 Target Directory Page Implement the \c Controller.prototype.TargetDirectoryPageCallback() function to interact with widgets on the target directory selection page. Wizard buttons: \list - \li \c Next - \li \c Cancel - \li \c Back + \li \c NextButton + \li \c CancelButton + \li \c BackButton \endlist \table @@ -226,18 +257,18 @@ \row \li \c MessageLabel - \li Can be used to show a message. + \li Displays a message. \row \li \c TargetDirectoryLineEdit - \li Shows the value of the installation's target directory. + \li Displays the value of the installation's target directory. \row \li \c WarningLabel - \li Can be used to show a warning. + \li Displays a warning. \endtable - \section1 Component Selection Page + \section2 Component Selection Page Implement the \c Controller.prototype.ComponentSelectionPageCallback() function to interact with widgets on the component selection page. @@ -294,11 +325,11 @@ \row \li \c ResetComponentsButton - \li Reset to already installed components. + \li Resets to already installed components. \endtable - \section1 Start Menu Directory Page + \section2 Start Menu Directory Page Implement the \c Controller.prototype.StartMenuDirectoryPage() function to interact with widgets on the ready for installation page. @@ -321,7 +352,7 @@ \endtable - \section1 Ready for Installation Page + \section2 Ready for Installation Page Implement the \c Controller.prototype.ReadyForInstallationPageCallback() function to interact with widgets on the ready for installation page. @@ -340,14 +371,14 @@ \row \li \c MessageLabel - \li Can be used to show a message. + \li Displays a message. \row \li \c TaskDetailsBrowser - \li Shows some more detailed information about the installation. + \li Displays some more detailed information about the installation. \endtable - \section1 Perform Installation Page + \section2 Perform Installation Page Implement the \c Controller.prototype.PerformInstallationPageCallback() function to interact with widgets on the perform installation page. @@ -359,7 +390,7 @@ \endlist - \section1 Finished Page + \section2 Finished Page Implement the \c Controller.prototype.FinishedPageCallback() function to interact with widgets on the installation finished page. @@ -378,11 +409,11 @@ \row \li \c MessageLabel - \li Can be used to show a message. + \li Displays a message. \row \li \c RunItCheckBox - \li Text field to shows some information that the user can start an application after + \li Text field that informs users that they can start an application after the installation process has finished. \endtable @@ -412,9 +443,10 @@ \section1 Message Boxes - While executing for example the installer application, it might show some message boxes - about an error that occurred. This is OK while running the application on the end users - system, though it might break automated test suites. To overcome this issue, all message + While executing the installer application, for example, the application + might show some message boxes about an error that occurred. This is fine + while running the application on the end user's system, but it might break + automated test suites. To overcome this issue, all message boxes shown by the Qt Installer Framework are addressable by a specific identifier. \table @@ -437,7 +469,8 @@ \row \li \c installationErrorWithRetry \li Retry, Ignore, Cancel - \li An error occurred while performing the installation. End users can select \c Retry to + \li An error occurred while performing the installation. End users can + select \uicontrol Retry to try again. \row @@ -465,14 +498,14 @@ \row \li \c DownloadError \li Retry, Cancel - \li An error occurred while downloading a archive hash from a remote repository. End users - can select \c Retry to try again. + \li An error occurred while downloading an archive hash from a remote + repository. End users can select \uicontrol Retry to try again. \row \li \c archiveDownloadError \li Retry, Cancel \li An error occurred while downloading a archive from a remote repository. End users can - select \c Retry to try again. + select \uicontrol Retry to try again. \row \li \c WriteError @@ -498,7 +531,8 @@ \li \c stopProcessesForUpdates \li Retry, Ignore, Cancel \li An error occurred while updating a package. Some running application or process needs - to be quit before the update can be performed. End users can select \c Retry to try + to be quit before the update can be performed. End users can select + \uicontrol Retry to try again once they have been stopped. \row diff --git a/doc/operations.qdoc b/doc/operations.qdoc index ed1465648..34d4e2683 100644 --- a/doc/operations.qdoc +++ b/doc/operations.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/doc/scripting-qmlmodule.qdoc b/doc/scripting-qmlmodule.qdoc index 2134f1e4b..b487a0eb0 100644 --- a/doc/scripting-qmlmodule.qdoc +++ b/doc/scripting-qmlmodule.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/doc/scripting.qdoc b/doc/scripting.qdoc index e8bce396d..9199d40e0 100644 --- a/doc/scripting.qdoc +++ b/doc/scripting.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -57,8 +57,8 @@ } \endcode - For more information, see the documentation for \l QInstaller::addWizardPage and - \l Component::userInterface. + For more information, see the documentation for \l installer::addWizardPage() and + \l component::userInterface(). \section1 Installer Hooks @@ -73,13 +73,13 @@ \li Called when the language of the installer changes. \row \li \c{Component.prototype.createOperations} - \li See \l Component::createOperations. + \li See \l component::createOperations(). \row \li \c{Component.prototype.createOperationsForArchive} - \li See \l Component::createOperationsForArchive. + \li See \l component::createOperationsForArchive(). \row \li \c{Component.prototype.createOperationsForPath} - \li See \l Component::createOperationsForPath. + \li See \l component::createOperationsForPath(). \endtable \section1 Global Variables @@ -117,23 +117,21 @@ You might want to add custom operations after extracting the content, when copying files or patching file content, for example. You can create and add - update operations to the installation from within - a script using \c QInstaller::Component::addOperation. - If you need to run an operation that requires administrative rights, use - \c QInstaller::Component::addElevatedOperation instead. + update operations to the installation from within a script using + component::addOperation(). If you need to run an operation that requires + administrative rights, use component::addElevatedOperation() instead. Each operation has a unique key used for identification and can take up to five parameters. In the parameter values, you can use variables as set in - \c QInstaller::Installer::setValue. For more information, see - \l{Predefined Variables}. + installer::setValue(). For more information, see \l{Predefined Variables}. For a summary of all available operations, see \l{Operations}. \section1 Registering Custom Operations You can register custom installation operations in the installer by deriving - \c KDUpdater::UpdateOperation. The following code displays the methods that - you must implement: + the KDUpdater::UpdateOperation class. The following code displays the + methods that you must implement: \code #include <KDUpdater/UpdateOperation> @@ -286,7 +284,7 @@ Only available on Windows. \endtable - The variables can be resolved by calls to \c installer.value(). If embedded + The variables can be resolved by calls to installer::value(). If embedded in '@' they can also be part of strings passed as arguments to installation operations: diff --git a/doc/tutorial.qdoc b/doc/tutorial.qdoc index 4360c0125..6b3333623 100644 --- a/doc/tutorial.qdoc +++ b/doc/tutorial.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs b/examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs index 02af0b821..081ba1e06 100644 --- a/examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs +++ b/examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/componenterror/packages/root.component1/meta/installscript.js b/examples/componenterror/packages/root.component1/meta/installscript.js index 28e615a2a..2f8ae4216 100644 --- a/examples/componenterror/packages/root.component1/meta/installscript.js +++ b/examples/componenterror/packages/root.component1/meta/installscript.js @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/componenterror/packages/root.component2/meta/installscript.js b/examples/componenterror/packages/root.component2/meta/installscript.js index 28e615a2a..2f8ae4216 100644 --- a/examples/componenterror/packages/root.component2/meta/installscript.js +++ b/examples/componenterror/packages/root.component2/meta/installscript.js @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/componenterror/packages/root/meta/installscript.js b/examples/componenterror/packages/root/meta/installscript.js index 2779af0e5..211b07ba4 100644 --- a/examples/componenterror/packages/root/meta/installscript.js +++ b/examples/componenterror/packages/root/meta/installscript.js @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/dependencies/README b/examples/dependencies/README new file mode 100644 index 000000000..e7b510d7e --- /dev/null +++ b/examples/dependencies/README @@ -0,0 +1,5 @@ +Create an installer that shows how the dependency solving works + +Generate installer with: + +binarycreator -c config/config.xml -p packages installer diff --git a/examples/dependencies/config/config.xml b/examples/dependencies/config/config.xml new file mode 100644 index 000000000..4a1b42501 --- /dev/null +++ b/examples/dependencies/config/config.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Installer> + <Name>Dependency Solving Example</Name> + <Version>1.0.0</Version> + <Title>Dependency Solving Example</Title> + <Publisher>Qt-Project</Publisher> + <StartMenuDir>Qt IFW Examples</StartMenuDir> + <TargetDir>@HomeDir@/IfwDependencySolvingExample</TargetDir> + <CreateLocalRepository>true</CreateLocalRepository> +</Installer> diff --git a/examples/dependencies/dependencies.pro b/examples/dependencies/dependencies.pro new file mode 100644 index 000000000..415df49d5 --- /dev/null +++ b/examples/dependencies/dependencies.pro @@ -0,0 +1,13 @@ +TEMPLATE = aux + +INSTALLER = installer + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine + +QMAKE_EXTRA_COMPILERS += example + +OTHER_FILES = README diff --git a/examples/dependencies/packages/componentA/data/installcontent.txt b/examples/dependencies/packages/componentA/data/installcontent.txt new file mode 100644 index 000000000..f40001983 --- /dev/null +++ b/examples/dependencies/packages/componentA/data/installcontent.txt @@ -0,0 +1,2 @@ +This file will be installed into the target directory.... + diff --git a/examples/dependencies/packages/componentA/meta/package.xml b/examples/dependencies/packages/componentA/meta/package.xml new file mode 100644 index 000000000..095735eb1 --- /dev/null +++ b/examples/dependencies/packages/componentA/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Component A</DisplayName> + <Description>This component does not depend on any other component.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>100</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentB/meta/package.xml b/examples/dependencies/packages/componentB/meta/package.xml new file mode 100644 index 000000000..2d51fee6e --- /dev/null +++ b/examples/dependencies/packages/componentB/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Component B</DisplayName> + <Description>This component does not depend on any other component.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>90</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentC/meta/package.xml b/examples/dependencies/packages/componentC/meta/package.xml new file mode 100644 index 000000000..c829970e7 --- /dev/null +++ b/examples/dependencies/packages/componentC/meta/package.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Component C (depends on A and B)</DisplayName> + <Description>This component depends on Component A and Component B. Selecting this component for installation also marks Component A and Component B for installation, which in turn marks Component D, because it has an automatic dependency on Component A and Component B.</Description> + <Dependencies>componentA, componentB</Dependencies> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>80</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentD/meta/package.xml b/examples/dependencies/packages/componentD/meta/package.xml new file mode 100644 index 000000000..d2af2e64c --- /dev/null +++ b/examples/dependencies/packages/componentD/meta/package.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Component D (auto depends on A and B)</DisplayName> + <Description>This component has an automatic dependency on Component A and Component B. If both A and B are marked for installation, this component is also installed.</Description> + <AutoDependOn>componentA, componentB</AutoDependOn> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>70</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentE/meta/package.xml b/examples/dependencies/packages/componentE/meta/package.xml new file mode 100644 index 000000000..3f41c095c --- /dev/null +++ b/examples/dependencies/packages/componentE/meta/package.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Component E (forced)</DisplayName> + <Description>This is a forced component that is always installed.</Description> + <ForcedInstallation>true</ForcedInstallation> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>60</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentF.subcomponent1.subsubcomponent1/meta/package.xml b/examples/dependencies/packages/componentF.subcomponent1.subsubcomponent1/meta/package.xml new file mode 100644 index 000000000..4bb53fca2 --- /dev/null +++ b/examples/dependencies/packages/componentF.subcomponent1.subsubcomponent1/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Subsubcomponent 1</DisplayName> + <Description>This component does not depend on any other component.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>100</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentF.subcomponent1.subsubcomponent2/meta/package.xml b/examples/dependencies/packages/componentF.subcomponent1.subsubcomponent2/meta/package.xml new file mode 100644 index 000000000..ade4cf15a --- /dev/null +++ b/examples/dependencies/packages/componentF.subcomponent1.subsubcomponent2/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Subsubcomponent 2</DisplayName> + <Description>This component does not depend on any other component.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>50</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentF.subcomponent1/meta/package.xml b/examples/dependencies/packages/componentF.subcomponent1/meta/package.xml new file mode 100644 index 000000000..5eb6fd46a --- /dev/null +++ b/examples/dependencies/packages/componentF.subcomponent1/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Subcomponent 1</DisplayName> + <Description>This component contains 2 leaf components.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>100</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentF.subcomponent2.subsubcomponent1/meta/package.xml b/examples/dependencies/packages/componentF.subcomponent2.subsubcomponent1/meta/package.xml new file mode 100644 index 000000000..4bb53fca2 --- /dev/null +++ b/examples/dependencies/packages/componentF.subcomponent2.subsubcomponent1/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Subsubcomponent 1</DisplayName> + <Description>This component does not depend on any other component.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>100</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentF.subcomponent2.subsubcomponent2/meta/package.xml b/examples/dependencies/packages/componentF.subcomponent2.subsubcomponent2/meta/package.xml new file mode 100644 index 000000000..ade4cf15a --- /dev/null +++ b/examples/dependencies/packages/componentF.subcomponent2.subsubcomponent2/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Subsubcomponent 2</DisplayName> + <Description>This component does not depend on any other component.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>50</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentF.subcomponent2/meta/package.xml b/examples/dependencies/packages/componentF.subcomponent2/meta/package.xml new file mode 100644 index 000000000..8f2cfdc64 --- /dev/null +++ b/examples/dependencies/packages/componentF.subcomponent2/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Subcomponent 2</DisplayName> + <Description>This component contains 2 leaf components.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>50</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentF/meta/package.xml b/examples/dependencies/packages/componentF/meta/package.xml new file mode 100644 index 000000000..74756bae6 --- /dev/null +++ b/examples/dependencies/packages/componentF/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Component F</DisplayName> + <Description>This component contains 2 subcomponents.</Description> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <SortingPriority>40</SortingPriority> +</Package> diff --git a/examples/dependencies/packages/componentG/meta/package.xml b/examples/dependencies/packages/componentG/meta/package.xml new file mode 100644 index 000000000..3e14256b4 --- /dev/null +++ b/examples/dependencies/packages/componentG/meta/package.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Component G (default, depends on A)</DisplayName> + <Description>By default, this component is selected for installation. It depends on component A.</Description> + <Default>true</Default> + <Version>1.0.0</Version> + <ReleaseDate>2014-08-25</ReleaseDate> + <Dependencies>componentA</Dependencies> + <SortingPriority>30</SortingPriority> +</Package> diff --git a/examples/doc/changeuserinterface.qdoc b/examples/doc/changeuserinterface.qdoc index 15212756c..46d1c5a40 100644 --- a/examples/doc/changeuserinterface.qdoc +++ b/examples/doc/changeuserinterface.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -36,7 +36,7 @@ \e {Change Installer UI} demonstrates how to use the \c Component() function to modify the default text for the radio button labels on the - \l{License Check Page}{license check page}. This example does not install + \l{License Agreement Page}{license check page}. This example does not install any components, but we specify a dummy component in the package information file, because installers without components are not allowed. @@ -47,11 +47,11 @@ \include installerfw-examples-packaging.qdocinc \list - \li The \c <Default> section specifies whether the component is + \li The \c <Default> element specifies whether the component is preselected for installation in the user interface by default. - \li The \c <Script> section specifies the file name of the JavaScript + \li The \c <Script> element specifies the file name of the JavaScript file that is loaded to perform operations. - \li The \c <Licenses> section specifies the \c name of the license + \li The \c <Licenses> element specifies the \c name of the license agreement to be accepted by the end user and the filename of the \c file that contains the license. \endlist diff --git a/examples/doc/componenterror.qdoc b/examples/doc/componenterror.qdoc index 39a0dcb84..28e307069 100644 --- a/examples/doc/componenterror.qdoc +++ b/examples/doc/componenterror.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -45,7 +45,7 @@ \include installerfw-examples-packaging.qdocinc \list - \li The \c <Script> section specifies the file name of the JavaScript + \li The \c <Script> element specifies the file name of the JavaScript file that is loaded to perform operations. \endlist diff --git a/examples/doc/dependencies.qdoc b/examples/doc/dependencies.qdoc new file mode 100644 index 000000000..914c331cb --- /dev/null +++ b/examples/doc/dependencies.qdoc @@ -0,0 +1,118 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example dependencies + \ingroup qtifwexamples + \title Dependency Solving Example + + \brief Using components' package.xml files to define dependencies and + automatic dependencies between components. + + \image qtifw-examples-dependencies.png + + \e{Dependency Solving} illustrates how to specify dependencies and automatic + dependencies between components in the package information files and how + that influences the installation and maintenance processes. + + \include installerfw-examples-configuring.qdocinc + + \list + \li The \c <CreateLocalRepository> element is set to \c true to create + a local repository. This enables end users to run the maintenance + tool after the initial installation to install additional components + or to uninstall components. The changes in the installation will + respect the dependencies defined in the example. + \endlist + + \quotefile dependencies/config/config.xml + + \include installerfw-examples-packaging.qdocinc + + \list + \li The \c <SortingPriority> element specifies the location of the + component in the component tree. The tree is sorted from highest to + lowest priority, with the highest priority on the top. + \endlist + + In this example, the package.xml files for the components contain additional + elements that specify the dependencies. The following sections illustrate + how the elements are used. + + \section1 Specifying Dependencies on Other Components + + We define a dependency for \e{Component C} on \e{Component A} and + \e{Component B}. Thus, if we select Component C for installation, both + Component A and Component B are installed as well. We define the + dependencies in the \c <Dependencies> element in Component C's package.xml + file as a comma-separated list of the identifiers of the components that + this component depends on: + + \quotefile dependencies/packages/componentC/meta/package.xml + + \section1 Specifying Automatic Dependencies on Other Components + + We define an automatic dependency for \e{Component D} on Component A and + Component B. Thus, if Component A and Component B are both marked for + installation, Component D is automatically installed as well. + We define the automatic dependency in the \c <AutoDependOn> element in + Component D's package.xml file: + + \quotefile dependencies/packages/componentD/meta/package.xml + + \section1 Forcing the Installation of a Component + + We define that \e{Component E} is always automatically installed and the end + user cannot deselect it. To define this, we set the \c <ForcedInstallation> + element to \c true in Component E's package.xml file: + + \quotefile dependencies/packages/componentE/meta/package.xml + + \section1 Installing Components by Default + + We define a dependency for \e{Component G} on Component A, and we mark G as + a default component. Thus, Component G is marked for installation by + default, and so is Component A, because it is required by G. To define this, + we set the value of the \c <Default> element to \c true in Component G's + package.xml file: + + \quotefile dependencies/packages/componentG/meta/package.xml + + \section1 Solving the Dependencies + + Selecting component C for installation also selects the following + components: + + \list + \li Component A and Component B, because Component C requires them. + \li Component D, because both Component A and Component B are marked for + installation and thus the conditions for installing Component D are + met. + \endlist + + \include installerfw-examples-generating.qdocinc +*/ diff --git a/examples/doc/dynamicpage.qdoc b/examples/doc/dynamicpage.qdoc index 6c68fe336..1549b49f6 100644 --- a/examples/doc/dynamicpage.qdoc +++ b/examples/doc/dynamicpage.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -49,11 +49,11 @@ \include installerfw-examples-packaging.qdocinc \list - \li The \c <Script> section specifies the file name of the JavaScript + \li The \c <Script> element specifies the file name of the JavaScript file that is loaded to perform operations. - \li The \c <UserInterfaces> section specifies the file names of the + \li The \c <UserInterfaces> element specifies the file names of the installer pages (.ui files) to use. - \li The \c <Name> section provides domain-like identification for the + \li The \c <Name> element provides domain-like identification for the component. \endlist diff --git a/examples/doc/images/qtifw-examples-dependencies.png b/examples/doc/images/qtifw-examples-dependencies.png Binary files differnew file mode 100644 index 000000000..2af737d66 --- /dev/null +++ b/examples/doc/images/qtifw-examples-dependencies.png diff --git a/examples/doc/images/qtifw-examples-online-1.png b/examples/doc/images/qtifw-examples-online-1.png Binary files differnew file mode 100644 index 000000000..fc0fe5a94 --- /dev/null +++ b/examples/doc/images/qtifw-examples-online-1.png diff --git a/examples/doc/images/qtifw-examples-online.png b/examples/doc/images/qtifw-examples-online.png Binary files differnew file mode 100644 index 000000000..b527b3e2d --- /dev/null +++ b/examples/doc/images/qtifw-examples-online.png diff --git a/examples/doc/images/qtifw-examples-translations.png b/examples/doc/images/qtifw-examples-translations.png Binary files differnew file mode 100644 index 000000000..1025c7c0c --- /dev/null +++ b/examples/doc/images/qtifw-examples-translations.png diff --git a/examples/doc/modifyextract.qdoc b/examples/doc/modifyextract.qdoc index 7dbd455c2..6cc8dbdef 100644 --- a/examples/doc/modifyextract.qdoc +++ b/examples/doc/modifyextract.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -46,9 +46,9 @@ \include installerfw-examples-packaging.qdocinc \list - \li The \c <Default> section is set to \c true to preselect the + \li The \c <Default> element is set to \c true to preselect the component in the installer. - \li The \c <Script> section specifies the file name of the JavaScript + \li The \c <Script> element specifies the file name of the JavaScript file that is loaded to perform operations. \endlist diff --git a/examples/doc/online.qdoc b/examples/doc/online.qdoc new file mode 100644 index 000000000..83e17a24f --- /dev/null +++ b/examples/doc/online.qdoc @@ -0,0 +1,160 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example online + \ingroup qtifwexamples + \title Online Installer Example + + \brief Using the repogen tool and the configuration file to set up an + online installer. + + \image qtifw-examples-online.png + + \e{Online Installer} illustrates how to set up an online installer that + fetches the original packages and updates to them from a server. + + \include installerfw-examples-configuring.qdocinc + + \list + \li The \c <RemoteRepositories> element is specific to an online + installer. It can contain one or several \c <Repository> child + elements that specify a connection to an online repository. For more + information about the available options, see + \l{Configuring Repositories}. + \endlist + + \quotefile online/config/config.xml + + \include installerfw-examples-packaging.qdocinc + + \list + \li The \c <Default> element is set to \c true to preselect the + component in the installer. + \endlist + + \quotefile online/packages/A/meta/package.xml + + This installer contains two components, A and B, that each have their own + package information file with slightly different contents. + + \section1 Generating the Online Repository + + The packages need to be converted to a file structure that the installer can + fetch at runtime. To use the \c repogen tool to convert the packages, switch + to the example source directory on the command line and enter the following + command: + + \list + \li On Windows: + \code + ..\..\bin\repogen.exe -p packages repository + \endcode + \li On Linux or OS X: + \code + ../../bin/repogen -p packages repository + \endcode + \endlist + + The generated \c repository directory will now contain a full copy of the + package data and some additionally generated metadata, such as SHA + checksums. + + The directory now needs to be made available at the URL set in + \c config.xml: \c{http://localhost/repository}. How this is done depends on + the platform and web server used. If you do not have a running web server + yet, but have Python available, you should be able to start a minimal web + server from the command line. Make sure you are in the example directory, + and then enter: + + \code + python -m SimpleHTTPServer 80 + \endcode + + You should now be able to open and explore \l{http://localhost/repository} + in your web browser. + + \note If you do not have enough permissions to set up a web server locally, + you can also specify an absolute \c{file:///} URL as the value of the \c URL + element in \c config.xml. For example, + \c file:///C:/Qt/QtIFW/examples/online/repository would be a valid URL on + Windows if \c repository is located in \c C:\Qt\QtIFW\examples\online. + + \section1 Generating the Example Installer + + To create the example installer, switch to the example source directory on + the command line and enter the following command: + + \list + \li On Windows: + \code + ..\..\bin\binarycreator.exe --online-only -c config\config.xml -p packages installer.exe + \endcode + \li On Linux or OS X: + \code + ../../bin/binarycreator --online-only -c config/config.xml -p packages installer + \endcode + \endlist + + You should now be able to run the installer and install from the repository. + + \section1 Providing Updates + + A benefit of using an online installer is that you can add new packages over + time or update the existing ones. During new installations, the new and + updated packages are automatically used, and existing installations can be + upgraded to use them. + + To update a package, you need to increase its \c <Version> element in + \c package.xml. The \c packages_update directory in the example folder is + a copy of \c the package directory, with an updated component + A. To deploy an update, you again use \c{repogen}: + + \list + \li On Windows: + \code + ..\..\bin\repogen.exe --update-new-components -p packages_update repository + \endcode + \li On Linux or OS X: + \code + ../../bin/repogen --update-new-components -p packages_update repository + \endcode + \endlist + + \c {--update-new-components} lets \c {repogen} compare the version + numbers of components in the repository and the packages directory, and + only updates packages that are new, or have a higher version number. + See also the \l{Summary of repogen Parameters}. + + If you then run the maintenance tool from the previous installation and + select \gui {Update Components}, you should see that an update of package + \c A is available. + + For more information on providing updates, see \l {Promoting Updates}. + + \image qtifw-examples-online-1.png +*/ diff --git a/examples/doc/openreadme.qdoc b/examples/doc/openreadme.qdoc index be24df084..b57a30e40 100644 --- a/examples/doc/openreadme.qdoc +++ b/examples/doc/openreadme.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -46,11 +46,11 @@ \include installerfw-examples-packaging.qdocinc \list - \li The \c <Default> section is set to \c true to preselect the + \li The \c <Default> element is set to \c true to preselect the component in the installer. - \li The \c <Script> section specifies the file name of the JavaScript + \li The \c <Script> element specifies the file name of the JavaScript file that is loaded to perform operations. - \li The \c <UserInterfaces> section specifies the file name of the + \li The \c <UserInterfaces> element specifies the file name of the installer page (.ui file) to use. \endlist diff --git a/examples/doc/quit_installer.qdoc b/examples/doc/quit_installer.qdoc index c73dddd48..e4d23e671 100644 --- a/examples/doc/quit_installer.qdoc +++ b/examples/doc/quit_installer.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/examples/doc/registerfileextension.qdoc b/examples/doc/registerfileextension.qdoc index 4c1cc5769..5899a6c76 100644 --- a/examples/doc/registerfileextension.qdoc +++ b/examples/doc/registerfileextension.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/examples/doc/startmenu.qdoc b/examples/doc/startmenu.qdoc index 33ed6d31f..36be95e85 100644 --- a/examples/doc/startmenu.qdoc +++ b/examples/doc/startmenu.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/examples/doc/systeminfo.qdoc b/examples/doc/systeminfo.qdoc index da3b99c10..14da74993 100644 --- a/examples/doc/systeminfo.qdoc +++ b/examples/doc/systeminfo.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/examples/doc/translations.qdoc b/examples/doc/translations.qdoc new file mode 100644 index 000000000..09896f997 --- /dev/null +++ b/examples/doc/translations.qdoc @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example translations + \ingroup qtifwexamples + \title Translation Example + + \brief Using translations to localize installer pages and licenses. + + \image qtifw-examples-translations.png + + \e{Translations} illustrates how to use translations to localize the output + of component scripts and component UI files into another language. It also shows + how to select the license according to the system language. + + To add a new language, you first need to create a translation source (TS) file for + the package that contains all the translatable strings. Run the following command in + the package's meta directory: + + \code + lupdate installscript.qs page.ui -ts <language>.ts + \endcode + + Replace <language> with the two letter lowercase code for the language you want to + translate to. After finishing translating you need to use lrelease on that + TS file to generate the binary Qt messages (QM) file. Do not forget to include + that in the package.xml as shown below. Run the following command in + the package's meta directory: + + \code + lrelase <language>.ts + \endcode + + + \include installerfw-examples-configuring.qdocinc + + \quotefile translations/config/config.xml + + \include installerfw-examples-packaging.qdocinc + + \list + \li The \c <Default> element is set to \c true to preselect the + component in the installer. + \li The \c <Script> element specifies the file name of the JavaScript + file that is loaded to perform operations. + \li The \c <License> element specifies the file name of the license file + that is shown when this component is selected for installation. + \li The \c <Translations> element specifies the file name of the QM + file containing translations for this compontent's UI and script files. + \endlist + + \quotefile translations/packages/com.vendor.product/meta/package.xml + + \include installerfw-examples-generating.qdocinc +*/ diff --git a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage.node1/meta/installscript.qs b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage.node1/meta/installscript.qs index 875619e16..8f2ffefb9 100644 --- a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage.node1/meta/installscript.qs +++ b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage.node1/meta/installscript.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage.node2/meta/installscript.qs b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage.node2/meta/installscript.qs index 875619e16..8f2ffefb9 100644 --- a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage.node2/meta/installscript.qs +++ b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage.node2/meta/installscript.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js index 37a79c983..66fc7de18 100644 --- a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js +++ b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/examples.pro b/examples/examples.pro index 1e5a816cd..75cb2e20b 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -3,9 +3,11 @@ TEMPLATE = subdirs SUBDIRS += \ changeuserinterface \ componenterror \ + dependencies \ dynamicpage \ licenseagreement \ modifyextract \ + online \ openreadme \ quit_installer \ registerfileextension \ diff --git a/examples/modifyextract/packages/org.qtproject.ifw.example.modifyextract/meta/installscript.js b/examples/modifyextract/packages/org.qtproject.ifw.example.modifyextract/meta/installscript.js index 12e0a89a4..6eec60973 100644 --- a/examples/modifyextract/packages/org.qtproject.ifw.example.modifyextract/meta/installscript.js +++ b/examples/modifyextract/packages/org.qtproject.ifw.example.modifyextract/meta/installscript.js @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/online/README b/examples/online/README new file mode 100644 index 000000000..a29944668 --- /dev/null +++ b/examples/online/README @@ -0,0 +1,26 @@ +Shows how to set up an online installer. + +The example uses a very simple web server shipped with python. + +Generate online repository with + + repogen -p packages repository + +Generate installer with + + binarycreator --online-only -c config/config.xml -p packages installer + +Now launch a minimal web server in the local directory + + python -m SimpleHTTPServer 80 + +This should make the content of the local directory available under +http://localhost + +You should be able to now launch the installer. + +To deploy an update, run + + repogen --update-new-components -p packages_update repository + +and launch the maintenance tool in your installation. diff --git a/examples/online/config/config.xml b/examples/online/config/config.xml new file mode 100644 index 000000000..9aeedd00d --- /dev/null +++ b/examples/online/config/config.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Installer> + <Name>Online Installer Example</Name> + <Version>1.0.0</Version> + <Title>Online Installer Example</Title> + <Publisher>The Qt Company</Publisher> + <!-- Directory name is used in component.xml --> + <StartMenuDir>Qt IFW Examples</StartMenuDir> + <TargetDir>@HomeDir@/IfwExample</TargetDir> + <RemoteRepositories> + <Repository> + <Url>http://localhost/repository</Url> + </Repository> + </RemoteRepositories> +</Installer> diff --git a/examples/online/online.pro b/examples/online/online.pro new file mode 100644 index 000000000..37a0144b7 --- /dev/null +++ b/examples/online/online.pro @@ -0,0 +1,13 @@ +TEMPLATE = aux + +INSTALLER = installer + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator --online-only -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine + +QMAKE_EXTRA_COMPILERS += example + +OTHER_FILES = README diff --git a/examples/online/packages/A/data/A.txt b/examples/online/packages/A/data/A.txt new file mode 100644 index 000000000..98114dd6e --- /dev/null +++ b/examples/online/packages/A/data/A.txt @@ -0,0 +1,2 @@ +Example content for package A. + diff --git a/examples/online/packages/A/meta/package.xml b/examples/online/packages/A/meta/package.xml new file mode 100644 index 000000000..08cef59c0 --- /dev/null +++ b/examples/online/packages/A/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Package> + <DisplayName>A</DisplayName> + <Description>Example component A</Description> + <Version>1.0.2-1</Version> + <ReleaseDate>2015-01-01</ReleaseDate> + <Default>true</Default> +</Package> diff --git a/examples/online/packages/B/data/B.txt b/examples/online/packages/B/data/B.txt new file mode 100644 index 000000000..1ee864074 --- /dev/null +++ b/examples/online/packages/B/data/B.txt @@ -0,0 +1,2 @@ +Example content for package B. + diff --git a/examples/online/packages/B/meta/package.xml b/examples/online/packages/B/meta/package.xml new file mode 100644 index 000000000..44e90b9a2 --- /dev/null +++ b/examples/online/packages/B/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Package> + <DisplayName>B</DisplayName> + <Description>Example component B</Description> + <Version>1.0.0-1</Version> + <ReleaseDate>2015-01-01</ReleaseDate> + <Default>true</Default> +</Package> diff --git a/examples/online/packages_update/A/data/A.txt b/examples/online/packages_update/A/data/A.txt new file mode 100644 index 000000000..ed7f1ea55 --- /dev/null +++ b/examples/online/packages_update/A/data/A.txt @@ -0,0 +1,2 @@ +Example content for package A (new version!). + diff --git a/examples/online/packages_update/A/meta/package.xml b/examples/online/packages_update/A/meta/package.xml new file mode 100644 index 000000000..d8010a2c0 --- /dev/null +++ b/examples/online/packages_update/A/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Package> + <DisplayName>A</DisplayName> + <Description>Example component A</Description> + <Version>1.0.3-1</Version> + <ReleaseDate>2015-01-01</ReleaseDate> + <Default>true</Default> +</Package> diff --git a/examples/online/packages_update/B/data/B.txt b/examples/online/packages_update/B/data/B.txt new file mode 100644 index 000000000..1ee864074 --- /dev/null +++ b/examples/online/packages_update/B/data/B.txt @@ -0,0 +1,2 @@ +Example content for package B. + diff --git a/examples/online/packages_update/B/meta/package.xml b/examples/online/packages_update/B/meta/package.xml new file mode 100644 index 000000000..44e90b9a2 --- /dev/null +++ b/examples/online/packages_update/B/meta/package.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Package> + <DisplayName>B</DisplayName> + <Description>Example component B</Description> + <Version>1.0.0-1</Version> + <ReleaseDate>2015-01-01</ReleaseDate> + <Default>true</Default> +</Package> diff --git a/examples/openreadme/packages/or.qtproject.ifw.example.openreadme/meta/installscript.qs b/examples/openreadme/packages/or.qtproject.ifw.example.openreadme/meta/installscript.qs index 9dd576258..6f33f1e71 100644 --- a/examples/openreadme/packages/or.qtproject.ifw.example.openreadme/meta/installscript.qs +++ b/examples/openreadme/packages/or.qtproject.ifw.example.openreadme/meta/installscript.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js b/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js index 713f86765..463554675 100644 --- a/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js +++ b/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/registerfileextension/packages/org.qtproject.ifw.example.registerfileextension/meta/installscript.qs b/examples/registerfileextension/packages/org.qtproject.ifw.example.registerfileextension/meta/installscript.qs index c4724e509..b906f9d77 100644 --- a/examples/registerfileextension/packages/org.qtproject.ifw.example.registerfileextension/meta/installscript.qs +++ b/examples/registerfileextension/packages/org.qtproject.ifw.example.registerfileextension/meta/installscript.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs b/examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs index 7fbdf258d..c1ae45054 100644 --- a/examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs +++ b/examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/systeminfo/packages/root/meta/installscript.qs b/examples/systeminfo/packages/root/meta/installscript.qs index 213a3c42c..4eb4dcc29 100644 --- a/examples/systeminfo/packages/root/meta/installscript.qs +++ b/examples/systeminfo/packages/root/meta/installscript.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/examples/translations/README b/examples/translations/README new file mode 100644 index 000000000..13fb2b685 --- /dev/null +++ b/examples/translations/README @@ -0,0 +1,20 @@ +Shows how to translate the installer UI. + +You have to call lrelease on the included .ts file before building the installer. + +Generate installer with + +binarycreator --offline-only -c config/config.xml -p packages installer + +You can now run the installer in German. + +Linux: + +LANG=de ./installer + +Windows: + +set LANG=de +installer.exe + +On OS X you need to adapt the system settings to set German as preferred language, and then start the installer. diff --git a/examples/translations/config/config.xml b/examples/translations/config/config.xml new file mode 100644 index 000000000..bacf61cce --- /dev/null +++ b/examples/translations/config/config.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Installer> + <Name>Translations Example</Name> + <Version>1.0.0</Version> + <Title>Package Translations Example</Title> + <Publisher>Qt Project</Publisher> + <StartMenuDir>Qt Installer Framework Examples</StartMenuDir> + <TargetDir>@HomeDir@/IfwExample</TargetDir> +</Installer> diff --git a/examples/translations/packages/com.vendor.product/data/installcontent.txt b/examples/translations/packages/com.vendor.product/data/installcontent.txt new file mode 100644 index 000000000..f40001983 --- /dev/null +++ b/examples/translations/packages/com.vendor.product/data/installcontent.txt @@ -0,0 +1,2 @@ +This file will be installed into the target directory.... + diff --git a/examples/translations/packages/com.vendor.product/meta/de.ts b/examples/translations/packages/com.vendor.product/meta/de.ts new file mode 100644 index 000000000..dd6000354 --- /dev/null +++ b/examples/translations/packages/com.vendor.product/meta/de.ts @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="de_DE"> +<context> + <name>Page</name> + <message> + <source>Translations Example</source> + <translation>Beispiel für Ãœbersetzungen</translation> + </message> + <message> + <source>This is some text.</source> + <translation>Dies ist ein Text.</translation> + </message> +</context> +<context> + <name>installscript</name> + <message> + <source>This is a dynamically created page.</source> + <translation>Diese Seite wurde dynamisch erzeugt.</translation> + </message> +</context> +</TS> diff --git a/examples/translations/packages/com.vendor.product/meta/installscript.qs b/examples/translations/packages/com.vendor.product/meta/installscript.qs new file mode 100644 index 000000000..dcfb17515 --- /dev/null +++ b/examples/translations/packages/com.vendor.product/meta/installscript.qs @@ -0,0 +1,66 @@ +/************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** 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 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ + +function Component() +{ + // constructor + component.loaded.connect(this, Component.prototype.loaded); + installer.addWizardPage(component, "Page", QInstaller.TargetDirectory) +} + +Component.prototype.createOperations = function() +{ + try { + // call the base create operations function + component.createOperations(); + } catch (e) { + print(e); + } +} + +Component.prototype.loaded = function () +{ + var page = gui.pageByObjectName("DynamicPage"); + if (page != null) { + page.entered.connect(Component.prototype.dynamicPageEntered); + } +} + +Component.prototype.dynamicPageEntered = function () +{ + var pageWidget = gui.pageWidgetByObjectName("DynamicPage"); + if (pageWidget != null) { + pageWidget.m_pageLabel.text = qsTr("This is a dynamically created page."); + } +} diff --git a/examples/translations/packages/com.vendor.product/meta/license.txt b/examples/translations/packages/com.vendor.product/meta/license.txt new file mode 100644 index 000000000..61a94dce7 --- /dev/null +++ b/examples/translations/packages/com.vendor.product/meta/license.txt @@ -0,0 +1 @@ +The fantastic license, have you heard of the Beer Public License Agreement yet? diff --git a/examples/translations/packages/com.vendor.product/meta/license_de.txt b/examples/translations/packages/com.vendor.product/meta/license_de.txt new file mode 100644 index 000000000..1af6f50fa --- /dev/null +++ b/examples/translations/packages/com.vendor.product/meta/license_de.txt @@ -0,0 +1 @@ +Lizenz auf deutsch. diff --git a/examples/translations/packages/com.vendor.product/meta/license_pl.txt b/examples/translations/packages/com.vendor.product/meta/license_pl.txt new file mode 100644 index 000000000..685636262 --- /dev/null +++ b/examples/translations/packages/com.vendor.product/meta/license_pl.txt @@ -0,0 +1 @@ +Licencja po polsku. diff --git a/examples/translations/packages/com.vendor.product/meta/package.xml b/examples/translations/packages/com.vendor.product/meta/package.xml new file mode 100644 index 000000000..1bdf34970 --- /dev/null +++ b/examples/translations/packages/com.vendor.product/meta/package.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Package> + <DisplayName>The root component</DisplayName> + <Description>This component contains a license and translations to German.</Description> + <Version>0.5.0-1</Version> + <ReleaseDate>2015-01-29</ReleaseDate> + <Licenses> + <License name="Beer Public License Agreement" file="license.txt" /> + </Licenses> + <Default>true</Default> + <Script>installscript.qs</Script> + <UserInterfaces> + <UserInterface>page.ui</UserInterface> + </UserInterfaces> + <Translations> + <Translation>de.qm</Translation> + <Translation>pl.qm</Translation> + </Translations> +</Package> diff --git a/examples/translations/packages/com.vendor.product/meta/page.ui b/examples/translations/packages/com.vendor.product/meta/page.ui new file mode 100644 index 000000000..0b5a2a68d --- /dev/null +++ b/examples/translations/packages/com.vendor.product/meta/page.ui @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Page</class> + <widget class="QWidget" name="Page"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Translations Example</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="m_pageLabel"> + <property name="frameShape"> + <enum>QFrame::Box</enum> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="m_pageLabel2"> + <property name="frameShape"> + <enum>QFrame::Box</enum> + </property> + <property name="text"> + <string>This is some text.</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/examples/translations/packages/com.vendor.product/meta/pl.ts b/examples/translations/packages/com.vendor.product/meta/pl.ts new file mode 100644 index 000000000..7f7649b51 --- /dev/null +++ b/examples/translations/packages/com.vendor.product/meta/pl.ts @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="pl_PL"> +<context> + <name>Page</name> + <message> + <location filename="page.ui" line="14"/> + <source>Translations Example</source> + <translation>PrzykÅ‚ad obrazujÄ…cy przekÅ‚ad na inny jÄ™zyk</translation> + </message> + <message> + <location filename="page.ui" line="36"/> + <source>This is some text.</source> + <translation>To jest pewien tekst.</translation> + </message> +</context> +<context> + <name>installscript</name> + <message> + <location filename="installscript.qs" line="64"/> + <source>This is a dynamically created page.</source> + <translation>Jest to strona utworzona dynamicznie.</translation> + </message> +</context> +</TS> diff --git a/examples/translations/translations.pro b/examples/translations/translations.pro new file mode 100644 index 000000000..415df49d5 --- /dev/null +++ b/examples/translations/translations.pro @@ -0,0 +1,13 @@ +TEMPLATE = aux + +INSTALLER = installer + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine + +QMAKE_EXTRA_COMPILERS += example + +OTHER_FILES = README diff --git a/examples/tutorial/packages/com.vendor.product/meta/installscript.qs b/examples/tutorial/packages/com.vendor.product/meta/installscript.qs index 2ea05fc86..d9054833e 100644 --- a/examples/tutorial/packages/com.vendor.product/meta/installscript.qs +++ b/examples/tutorial/packages/com.vendor.product/meta/installscript.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/7zip/unix/CPP/myWindows/myDateAndTime.cpp b/src/libs/7zip/unix/CPP/myWindows/myDateAndTime.cpp index 51ce3a815..96554c900 100644 --- a/src/libs/7zip/unix/CPP/myWindows/myDateAndTime.cpp +++ b/src/libs/7zip/unix/CPP/myWindows/myDateAndTime.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/abstractfiletask.cpp b/src/libs/installer/abstractfiletask.cpp index 4b37b261e..e4b268850 100644 --- a/src/libs/installer/abstractfiletask.cpp +++ b/src/libs/installer/abstractfiletask.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -44,6 +44,12 @@ namespace QInstaller { */ /*! + \inmodule QtInstallerFramework + \namespace TaskRole + \brief Contains identifiers for tasks. +*/ + +/*! \enum TaskRole::TaskRole \value Checksum @@ -54,6 +60,80 @@ namespace QInstaller { */ /*! + \inmodule QtInstallerFramework + \class QInstaller::FileTaskItem + \brief The FileTaskItem class represents an item in a file task object. +*/ + +/*! + \fn FileTaskItem::FileTaskItem() + + Creates a file task item. +*/ + +/*! + \fn FileTaskItem::FileTaskItem(const QString &s) + + Creates a file task item using the source specified by \a s. +*/ + +/*! + \fn FileTaskItem::FileTaskItem(const QString &s, const QString &t) + + Creates a file task item using the source specified by \a s and target + specified by \a t. +*/ + +/*! + \fn FileTaskItem::source() const + + Returns the source file of the file task item. +*/ + +/*! + \fn FileTaskItem::target() const + + Returns the target file of the file task item. +*/ + +/*! + \inmodule QtInstallerFramework + \class QInstaller::FileTaskResult + \brief The FileTaskResult class represents the results of a file task. +*/ + +/*! + \fn FileTaskResult::FileTaskResult() + + Creates file task results. +*/ + +/*! + \fn FileTaskResult::FileTaskResult(const QString &t, const QByteArray &c, const FileTaskItem &i) + + Creates file task results using the target file specified by \a t, checksum + specified by \a c, and file task item specified by \a i. +*/ + +/*! + \fn FileTaskResult::target() const + + Returns the target file of the task result. +*/ + +/*! + \fn FileTaskResult::checkSum() const + + Returns the checksum of the task result. +*/ + +/*! + \fn FileTaskResult::taskItem() const + + Returns file task items. +*/ + +/*! Constructs an empty abstract file task object. */ AbstractFileTask::AbstractFileTask() diff --git a/src/libs/installer/abstractfiletask.h b/src/libs/installer/abstractfiletask.h index d346e58f6..f0f2062a8 100644 --- a/src/libs/installer/abstractfiletask.h +++ b/src/libs/installer/abstractfiletask.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/abstracttask.h b/src/libs/installer/abstracttask.h index 36faa0e1e..8e6a16867 100644 --- a/src/libs/installer/abstracttask.h +++ b/src/libs/installer/abstracttask.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/adminauthorization.h b/src/libs/installer/adminauthorization.h index 454464bef..45fb7b29e 100644 --- a/src/libs/installer/adminauthorization.h +++ b/src/libs/installer/adminauthorization.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/adminauthorization_mac.cpp b/src/libs/installer/adminauthorization_mac.cpp index af4a0ee3d..a305ab0e4 100644 --- a/src/libs/installer/adminauthorization_mac.cpp +++ b/src/libs/installer/adminauthorization_mac.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/adminauthorization_win.cpp b/src/libs/installer/adminauthorization_win.cpp index c9475ee42..56d912ae7 100644 --- a/src/libs/installer/adminauthorization_win.cpp +++ b/src/libs/installer/adminauthorization_win.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp index cd10ac0cd..565c0df77 100644 --- a/src/libs/installer/adminauthorization_x11.cpp +++ b/src/libs/installer/adminauthorization_x11.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binarycontent.cpp b/src/libs/installer/binarycontent.cpp index 4add1420b..0aa3de84b 100644 --- a/src/libs/installer/binarycontent.cpp +++ b/src/libs/installer/binarycontent.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binarycontent.h b/src/libs/installer/binarycontent.h index 6ea0fa47d..ca2339444 100644 --- a/src/libs/installer/binarycontent.h +++ b/src/libs/installer/binarycontent.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp index 015e21b2f..425767954 100644 --- a/src/libs/installer/binaryformat.cpp +++ b/src/libs/installer/binaryformat.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -73,8 +73,8 @@ namespace QInstaller { \brief The Resource class is an interface for wrapping a file as read only device. Resource is an interface for reading inside a file, but is not supposed to write to the file it - wraps. The resource class is created by passing a path to an existing binary (such as a zipped - archive or a Qt resource file). + wraps. The \c Resource class is created by passing a path to an existing + binary (such as a zipped archive or a Qt resource file). The resource name can be set at any time using setName() or during construction. The segment supplied during construction represents the offset and size of the resource inside the file. @@ -156,7 +156,7 @@ void Resource::setName(const QByteArray &name) } /*! - A Resource will always be opened in QIODevice::ReadOnly mode. The function will return true + Opens a resource in QIODevice::ReadOnly mode. The function returns \c true if successful. */ bool Resource::open() @@ -340,7 +340,7 @@ QSharedPointer<Resource> ResourceCollection::resourceByName(const QByteArray &na \brief The ResourceCollectionManager class is an abstraction that groups together a number of resource collections. - The resources collections it groups can be written to and read from a QFileDevice. + The resource collections it groups can be written to and read from a QFileDevice. */ /*! diff --git a/src/libs/installer/binaryformat.h b/src/libs/installer/binaryformat.h index 551c701ce..7a06e70f7 100644 --- a/src/libs/installer/binaryformat.h +++ b/src/libs/installer/binaryformat.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binaryformatengine.cpp b/src/libs/installer/binaryformatengine.cpp index 2d70bbe77..fbc1232ee 100644 --- a/src/libs/installer/binaryformatengine.cpp +++ b/src/libs/installer/binaryformatengine.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binaryformatengine.h b/src/libs/installer/binaryformatengine.h index a439fb280..731886a9e 100644 --- a/src/libs/installer/binaryformatengine.h +++ b/src/libs/installer/binaryformatengine.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binaryformatenginehandler.cpp b/src/libs/installer/binaryformatenginehandler.cpp index 7f82236cc..202b65908 100644 --- a/src/libs/installer/binaryformatenginehandler.cpp +++ b/src/libs/installer/binaryformatenginehandler.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binaryformatenginehandler.h b/src/libs/installer/binaryformatenginehandler.h index 4c273f2fe..00aa89032 100644 --- a/src/libs/installer/binaryformatenginehandler.h +++ b/src/libs/installer/binaryformatenginehandler.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binarylayout.cpp b/src/libs/installer/binarylayout.cpp index 9c0ea0733..ca3abfcc6 100644 --- a/src/libs/installer/binarylayout.cpp +++ b/src/libs/installer/binarylayout.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/binarylayout.h b/src/libs/installer/binarylayout.h index bf7d1d594..c98c3bb4a 100644 --- a/src/libs/installer/binarylayout.h +++ b/src/libs/installer/binarylayout.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 86388cc2e..51dc9d91a 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -156,7 +156,7 @@ static const QLatin1String scForcedInstallation("ForcedInstallation"); /*! \qmlproperty stringlist component::autoDependencies - Returns the value of the \c <AutoDependOn> tag in the package information file. + Returns the value of the \c <AutoDependOn> element in the package information file. */ /*! @@ -277,7 +277,6 @@ void Component::loadDataFromPackage(const LocalPackage &package) setValue(scForcedInstallation, package.forcedInstallation ? scTrue : scFalse); if (package.forcedInstallation & !PackageManagerCore::noForceInstallation()) { - setEnabled(false); setCheckable(false); setCheckState(Qt::Checked); } @@ -285,6 +284,10 @@ void Component::loadDataFromPackage(const LocalPackage &package) setValue(scCurrentState, scInstalled); } +/*! + Sets variables according to the values set in the package.xml file of \a package. + Also loads UI files, licenses and translations if they are referenced in the package.xml. +*/ void Component::loadDataFromPackage(const Package &package) { Q_ASSERT(&package); @@ -317,7 +320,6 @@ void Component::loadDataFromPackage(const Package &package) forced = scFalse; setValue(scForcedInstallation, forced); if (forced == scTrue) { - setEnabled(false); setCheckable(false); setCheckState(Qt::Checked); } @@ -605,9 +607,15 @@ void Component::loadLicenses(const QString &directory, const QHash<QString, QVar QFileInfo fileInfo(fileName); QFile file(QString::fromLatin1("%1%2_%3.%4").arg(directory, fileInfo.baseName(), QLocale().name().toLower(), fileInfo.completeSuffix())); + if (!file.exists()) { + file.setFileName(QString::fromLatin1("%1%2_%3.%4").arg(directory, fileInfo.baseName(), + QLocale().name().left(2), fileInfo.completeSuffix())); + } + if (!file.open(QIODevice::ReadOnly)) { // No translated license, use untranslated file - qDebug("Unable to open translated license file. Using untranslated fallback."); + qDebug().nospace() << "Unable to open translated license file" << file.fileName() + << ". Using untranslated fallback."; file.setFileName(directory + fileName); if (!file.open(QIODevice::ReadOnly)) { throw Error(tr("Could not open the requested license file '%1'. Error: %2").arg(fileName, diff --git a/src/libs/installer/component.h b/src/libs/installer/component.h index 0267905d1..257965c8d 100644 --- a/src/libs/installer/component.h +++ b/src/libs/installer/component.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/component_p.cpp b/src/libs/installer/component_p.cpp index 18ba4b7b5..9f257483a 100644 --- a/src/libs/installer/component_p.cpp +++ b/src/libs/installer/component_p.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/component_p.h b/src/libs/installer/component_p.h index 87e067ba4..01d96f092 100644 --- a/src/libs/installer/component_p.h +++ b/src/libs/installer/component_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/componentchecker.cpp b/src/libs/installer/componentchecker.cpp index 64ce851a0..381fcf9c1 100644 --- a/src/libs/installer/componentchecker.cpp +++ b/src/libs/installer/componentchecker.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/componentchecker.h b/src/libs/installer/componentchecker.h index fe94a2cd7..84c4e3d14 100644 --- a/src/libs/installer/componentchecker.h +++ b/src/libs/installer/componentchecker.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/componentmodel.cpp b/src/libs/installer/componentmodel.cpp index d2537dea0..1a368af8d 100644 --- a/src/libs/installer/componentmodel.cpp +++ b/src/libs/installer/componentmodel.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -50,23 +50,30 @@ namespace QInstaller { /*! \enum ComponentModel::ModelStateFlag + This enum value holds the checked state of the components available for + installation. + \value AllChecked + All components are checked. \value AllUnchecked + No components are checked. \value DefaultChecked + The components to be installed by default are checked. \value PartiallyChecked + Some components are checked. */ /*! \fn void ComponentModel::checkStateChanged(const QModelIndex &index) - This signal is emitted whenever the check state of a component is changed. The \a index value + This signal is emitted whenever the checked state of a component is changed. The \a index value indicates the QModelIndex representation of the component as seen from the model. */ /*! \fn void ComponentModel::checkStateChanged(QInstaller::ComponentModel::ModelState state) - This signal is emitted whenever the check state of a model is changed after all state + This signal is emitted whenever the checked state of a model is changed after all state calculations have taken place. The \a state is a combination of \c ModelStateFlag values indicating whether the model has its default checked state, all components are checked or unchecked, or some individual component's checked state has changed. @@ -88,7 +95,7 @@ private: Q_GLOBAL_STATIC(IconCache, iconCache) /*! - Constructs an component model with the given number of \a columns and \a core as parent. + Constructs a component model with the given number of \a columns and \a core as parent. */ ComponentModel::ComponentModel(int columns, PackageManagerCore *core) : QAbstractItemModel(core) @@ -124,7 +131,7 @@ Qt::ItemFlags ComponentModel::flags(const QModelIndex &index) const } /*! - Returns the number of items under the given \a parent. When the parent index is invalid the + Returns the number of items under the given \a parent. When the parent index is invalid, the returned value is the root item count. */ int ComponentModel::rowCount(const QModelIndex &parent) const @@ -216,6 +223,12 @@ QVariant ComponentModel::data(const QModelIndex &index, int role) const if (role == Qt::EditRole || role == Qt::DisplayRole || role == Qt::ToolTipRole) return component->data(Qt::UserRole + index.column()); } + if (role == Qt::CheckStateRole) { + if (!component->isCheckable()) + return QVariant(); + if (!component->autoDependencies().isEmpty()) + return QVariant(); + } return component->data(role); } return QVariant(); @@ -224,7 +237,7 @@ QVariant ComponentModel::data(const QModelIndex &index, int role) const /*! Sets the \a role data for the item at \a index to \a value. Returns true if successful; otherwise returns false. The dataChanged() signal is emitted if the data was successfully set. - The checkStateChanged() signals are emitted in addition if the check state of the item is set. + The checkStateChanged() signals are emitted in addition if the checked state of the item is set. */ bool ComponentModel::setData(const QModelIndex &index, const QVariant &value, int role) { @@ -316,7 +329,7 @@ QSet<Component *> ComponentModel::unchecked() const } /*! - Returns a list of components whose check state cannot be changed. If package manager + Returns a list of components whose checked state cannot be changed. If package manager core is run with no forced installation argument, the list will always be empty. */ QSet<Component *> ComponentModel::uncheckable() const @@ -333,7 +346,7 @@ PackageManagerCore *ComponentModel::core() const } /*! - Returns the current state check state of the model. + Returns the current checked state of the model. */ ComponentModel::ModelState ComponentModel::checkedState() const { @@ -356,7 +369,8 @@ QModelIndex ComponentModel::indexFromComponentName(const QString &name) const /*! Translates between a given QModelIndex \a index and its associated Component. - Returns the component if the index is valid or 0 if an invalid QModelIndex is given. + Returns the component if the index is valid or \c 0 if an invalid + QModelIndex is given. */ Component *ComponentModel::componentFromIndex(const QModelIndex &index) const { @@ -369,9 +383,9 @@ Component *ComponentModel::componentFromIndex(const QModelIndex &index) const // -- public slots /*! - Sets the passed \a rootComponents to be the list of currently shown components. + Sets \a rootComponents to be the list of currently shown components. - The model is repopulated and the individual component checked state is used to show the check + The model is repopulated and the individual component's checked state is used to show the check mark in front of the visual component representation. The modelAboutToBeReset() and modelReset() signals are emitted. */ @@ -404,7 +418,7 @@ void ComponentModel::setRootComponents(QList<QInstaller::Component*> rootCompone } /*! - Sets the check state of every component in the model to be \a state. + Sets the checked state of every component in the model to be \a state. The ComponentModel::PartiallyChecked flag is ignored by this function. Note that components are not changed if they are not checkable. The dataChanged() and checkStateChanged() signals diff --git a/src/libs/installer/componentmodel.h b/src/libs/installer/componentmodel.h index 093ef47aa..5eeed7e4c 100644 --- a/src/libs/installer/componentmodel.h +++ b/src/libs/installer/componentmodel.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h index 8ad1b2f79..60511ea13 100644 --- a/src/libs/installer/constants.h +++ b/src/libs/installer/constants.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -87,6 +87,7 @@ static const QLatin1String scWizardStyle("WizardStyle"); static const QLatin1String scTitleColor("TitleColor"); static const QLatin1String scWizardDefaultWidth("WizardDefaultWidth"); static const QLatin1String scWizardDefaultHeight("WizardDefaultHeight"); +static const QLatin1String scProductUUID("ProductUUID"); } #endif // CONSTANTS_H diff --git a/src/libs/installer/consumeoutputoperation.cpp b/src/libs/installer/consumeoutputoperation.cpp index ab190f5e1..00b396ad6 100644 --- a/src/libs/installer/consumeoutputoperation.cpp +++ b/src/libs/installer/consumeoutputoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/consumeoutputoperation.h b/src/libs/installer/consumeoutputoperation.h index 50217b079..614a75a1c 100644 --- a/src/libs/installer/consumeoutputoperation.h +++ b/src/libs/installer/consumeoutputoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/copydirectoryoperation.cpp b/src/libs/installer/copydirectoryoperation.cpp index aef7e3f24..cd2b1b341 100644 --- a/src/libs/installer/copydirectoryoperation.cpp +++ b/src/libs/installer/copydirectoryoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/copydirectoryoperation.h b/src/libs/installer/copydirectoryoperation.h index 3f1159d5a..0dd876f05 100644 --- a/src/libs/installer/copydirectoryoperation.h +++ b/src/libs/installer/copydirectoryoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/copyfiletask.cpp b/src/libs/installer/copyfiletask.cpp index 236720b3c..0ec9c6d27 100644 --- a/src/libs/installer/copyfiletask.cpp +++ b/src/libs/installer/copyfiletask.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/copyfiletask.h b/src/libs/installer/copyfiletask.h index 94ca64051..44b81ff0b 100644 --- a/src/libs/installer/copyfiletask.h +++ b/src/libs/installer/copyfiletask.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/createdesktopentryoperation.cpp b/src/libs/installer/createdesktopentryoperation.cpp index 168dcba01..11e977d08 100644 --- a/src/libs/installer/createdesktopentryoperation.cpp +++ b/src/libs/installer/createdesktopentryoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/createdesktopentryoperation.h b/src/libs/installer/createdesktopentryoperation.h index 94c583833..786f2891d 100644 --- a/src/libs/installer/createdesktopentryoperation.h +++ b/src/libs/installer/createdesktopentryoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/createlinkoperation.cpp b/src/libs/installer/createlinkoperation.cpp index 55241883f..6117ef602 100644 --- a/src/libs/installer/createlinkoperation.cpp +++ b/src/libs/installer/createlinkoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/createlinkoperation.h b/src/libs/installer/createlinkoperation.h index c72e94a04..1d825d4f9 100644 --- a/src/libs/installer/createlinkoperation.h +++ b/src/libs/installer/createlinkoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/createlocalrepositoryoperation.cpp b/src/libs/installer/createlocalrepositoryoperation.cpp index c53cebee6..55453a916 100644 --- a/src/libs/installer/createlocalrepositoryoperation.cpp +++ b/src/libs/installer/createlocalrepositoryoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/createlocalrepositoryoperation.h b/src/libs/installer/createlocalrepositoryoperation.h index a3c69ef76..2eebb0dc9 100644 --- a/src/libs/installer/createlocalrepositoryoperation.h +++ b/src/libs/installer/createlocalrepositoryoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp index 8079aaf97..060672bd8 100644 --- a/src/libs/installer/createshortcutoperation.cpp +++ b/src/libs/installer/createshortcutoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/createshortcutoperation.h b/src/libs/installer/createshortcutoperation.h index 6f4c383e0..29c9e2574 100644 --- a/src/libs/installer/createshortcutoperation.h +++ b/src/libs/installer/createshortcutoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp index 50e63795f..8d619267b 100644 --- a/src/libs/installer/downloadarchivesjob.cpp +++ b/src/libs/installer/downloadarchivesjob.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/downloadarchivesjob.h b/src/libs/installer/downloadarchivesjob.h index 3990ebe67..61600c596 100644 --- a/src/libs/installer/downloadarchivesjob.h +++ b/src/libs/installer/downloadarchivesjob.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/downloadfiletask.cpp b/src/libs/installer/downloadfiletask.cpp index a89e3a240..d5ab2acda 100644 --- a/src/libs/installer/downloadfiletask.cpp +++ b/src/libs/installer/downloadfiletask.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/downloadfiletask.h b/src/libs/installer/downloadfiletask.h index e11c86ae6..2d0d4cf41 100644 --- a/src/libs/installer/downloadfiletask.h +++ b/src/libs/installer/downloadfiletask.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/downloadfiletask_p.h b/src/libs/installer/downloadfiletask_p.h index 16c38cba5..d91d335b3 100644 --- a/src/libs/installer/downloadfiletask_p.h +++ b/src/libs/installer/downloadfiletask_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp index 09ad55f18..3e766f801 100644 --- a/src/libs/installer/elevatedexecuteoperation.cpp +++ b/src/libs/installer/elevatedexecuteoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/elevatedexecuteoperation.h b/src/libs/installer/elevatedexecuteoperation.h index 6b05a7bae..ef659efca 100644 --- a/src/libs/installer/elevatedexecuteoperation.h +++ b/src/libs/installer/elevatedexecuteoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/environmentvariablesoperation.cpp b/src/libs/installer/environmentvariablesoperation.cpp index 941471850..f41b90893 100644 --- a/src/libs/installer/environmentvariablesoperation.cpp +++ b/src/libs/installer/environmentvariablesoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/environmentvariablesoperation.h b/src/libs/installer/environmentvariablesoperation.h index 8b79fd67a..e765478bb 100644 --- a/src/libs/installer/environmentvariablesoperation.h +++ b/src/libs/installer/environmentvariablesoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/errors.h b/src/libs/installer/errors.h index bcf32f3f8..f8c105fcf 100644 --- a/src/libs/installer/errors.h +++ b/src/libs/installer/errors.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp index 652a8e5cc..dba695593 100644 --- a/src/libs/installer/extractarchiveoperation.cpp +++ b/src/libs/installer/extractarchiveoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/extractarchiveoperation.h b/src/libs/installer/extractarchiveoperation.h index 962d9eb6f..b0898313b 100644 --- a/src/libs/installer/extractarchiveoperation.h +++ b/src/libs/installer/extractarchiveoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/extractarchiveoperation_p.h b/src/libs/installer/extractarchiveoperation_p.h index cb871552a..10af703aa 100644 --- a/src/libs/installer/extractarchiveoperation_p.h +++ b/src/libs/installer/extractarchiveoperation_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -57,6 +57,7 @@ public: , m_files(files) , m_op(op) { + setObjectName(QLatin1String("ExtractArchive")); } void run() diff --git a/src/libs/installer/fakestopprocessforupdateoperation.cpp b/src/libs/installer/fakestopprocessforupdateoperation.cpp index b8680adc8..d30aa370e 100644 --- a/src/libs/installer/fakestopprocessforupdateoperation.cpp +++ b/src/libs/installer/fakestopprocessforupdateoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/fakestopprocessforupdateoperation.h b/src/libs/installer/fakestopprocessforupdateoperation.h index fa4b21388..e21188e5a 100644 --- a/src/libs/installer/fakestopprocessforupdateoperation.h +++ b/src/libs/installer/fakestopprocessforupdateoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/fileio.cpp b/src/libs/installer/fileio.cpp index 9dda600c7..70f2be147 100644 --- a/src/libs/installer/fileio.cpp +++ b/src/libs/installer/fileio.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/fileio.h b/src/libs/installer/fileio.h index 90d20d869..ea211fce0 100644 --- a/src/libs/installer/fileio.h +++ b/src/libs/installer/fileio.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp index 5556e9eb0..9f7890fbc 100644 --- a/src/libs/installer/fileutils.cpp +++ b/src/libs/installer/fileutils.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -239,6 +239,7 @@ public: , p(path) , ignore(ignoreErrors) { + setObjectName(QLatin1String("RemoveDirectory")); } const QString &error() const diff --git a/src/libs/installer/fileutils.h b/src/libs/installer/fileutils.h index e2a868134..ca85bbf89 100644 --- a/src/libs/installer/fileutils.h +++ b/src/libs/installer/fileutils.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/globals.cpp b/src/libs/installer/globals.cpp index 99be72acf..05e19304e 100644 --- a/src/libs/installer/globals.cpp +++ b/src/libs/installer/globals.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/globals.h b/src/libs/installer/globals.h index d6b7af464..4df5878b9 100644 --- a/src/libs/installer/globals.h +++ b/src/libs/installer/globals.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/globalsettingsoperation.cpp b/src/libs/installer/globalsettingsoperation.cpp index a05a0d7c5..3623487a3 100644 --- a/src/libs/installer/globalsettingsoperation.cpp +++ b/src/libs/installer/globalsettingsoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/globalsettingsoperation.h b/src/libs/installer/globalsettingsoperation.h index 118229aa5..3a15f03f9 100644 --- a/src/libs/installer/globalsettingsoperation.h +++ b/src/libs/installer/globalsettingsoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/graph.h b/src/libs/installer/graph.h index 43cc3746a..622ab3393 100644 --- a/src/libs/installer/graph.h +++ b/src/libs/installer/graph.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index 5d9f8a162..1b7734463 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -175,7 +175,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt QString ba = QLatin1Char('[') + QString::number(uptime.elapsed()) + QStringLiteral("] ") + trimAndPrepend(type, msg); - if (type != QtDebugMsg) { + if (type != QtDebugMsg && context.file) { ba += QString(QStringLiteral(" (%1:%2, %3)")).arg( QString::fromLatin1(context.file)).arg(context.line).arg( QString::fromLatin1(context.function)); diff --git a/src/libs/installer/init.h b/src/libs/installer/init.h index 8cb054683..ca79e74b9 100644 --- a/src/libs/installer/init.h +++ b/src/libs/installer/init.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 34c7adba9..ac6354309 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -66,6 +66,7 @@ HEADERS += packagemanagercore.h \ installiconsoperation.h \ selfrestartoperation.h \ settings.h \ + permissionsettings.h \ downloadarchivesjob.h \ init.h \ adminauthorization.h \ @@ -164,6 +165,7 @@ SOURCES += packagemanagercore.cpp \ qprocesswrapper.cpp \ qsettingswrapper.cpp \ settings.cpp \ + permissionsettings.cpp \ packagemanagerproxyfactory.cpp \ createlocalrepositoryoperation.cpp \ lib7z_facade.cpp \ @@ -180,6 +182,7 @@ SOURCES += packagemanagercore.cpp \ unziptask.cpp \ observer.cpp \ metadatajob.cpp \ + protocol.cpp \ remoteobject.cpp \ remoteclient.cpp \ remoteserver.cpp \ diff --git a/src/libs/installer/installer_global.h b/src/libs/installer/installer_global.h index dfd2a9cf6..886955534 100644 --- a/src/libs/installer/installer_global.h +++ b/src/libs/installer/installer_global.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/installercalculator.cpp b/src/libs/installer/installercalculator.cpp index 10f7327db..79c085c55 100644 --- a/src/libs/installer/installercalculator.cpp +++ b/src/libs/installer/installercalculator.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/installercalculator.h b/src/libs/installer/installercalculator.h index df26eb0ba..6000fc243 100644 --- a/src/libs/installer/installercalculator.h +++ b/src/libs/installer/installercalculator.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/installiconsoperation.cpp b/src/libs/installer/installiconsoperation.cpp index 1861594cd..f957623bb 100644 --- a/src/libs/installer/installiconsoperation.cpp +++ b/src/libs/installer/installiconsoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/installiconsoperation.h b/src/libs/installer/installiconsoperation.h index b887e6af2..e93e55914 100644 --- a/src/libs/installer/installiconsoperation.h +++ b/src/libs/installer/installiconsoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/keepaliveobject.cpp b/src/libs/installer/keepaliveobject.cpp index b9e07f333..514ca5a7a 100644 --- a/src/libs/installer/keepaliveobject.cpp +++ b/src/libs/installer/keepaliveobject.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -38,7 +38,7 @@ #include <QCoreApplication> #include <QElapsedTimer> #include <QHostAddress> -#include <QTcpSocket> +#include <QLocalSocket> #include <QTimer> namespace QInstaller { @@ -67,12 +67,12 @@ void KeepAliveObject::onTimeout() { // Try to connect to the privileged running server. If we succeed the server side // watchdog gets restarted and the server keeps running for another 30 seconds. - QTcpSocket socket; - socket.connectToHost(RemoteClient::instance().address(), RemoteClient::instance().port()); + QLocalSocket socket; + socket.connectToServer(RemoteClient::instance().socketName()); QElapsedTimer stopWatch; stopWatch.start(); - while ((socket.state() == QAbstractSocket::ConnectingState) + while ((socket.state() == QLocalSocket::ConnectingState) && (stopWatch.elapsed() < 10000) && (!m_quit)) { if ((stopWatch.elapsed() % 2500) == 0) QCoreApplication::processEvents(); diff --git a/src/libs/installer/keepaliveobject.h b/src/libs/installer/keepaliveobject.h index 41e5d9a3f..eca6819e2 100644 --- a/src/libs/installer/keepaliveobject.h +++ b/src/libs/installer/keepaliveobject.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/lazyplaintextedit.cpp b/src/libs/installer/lazyplaintextedit.cpp index b8f174335..81603f95e 100644 --- a/src/libs/installer/lazyplaintextedit.cpp +++ b/src/libs/installer/lazyplaintextedit.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/lazyplaintextedit.h b/src/libs/installer/lazyplaintextedit.h index 3eb2f2875..4cc1e8985 100644 --- a/src/libs/installer/lazyplaintextedit.h +++ b/src/libs/installer/lazyplaintextedit.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp index b0ce95c41..900b09e65 100644 --- a/src/libs/installer/lib7z_facade.cpp +++ b/src/libs/installer/lib7z_facade.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/lib7z_facade.h b/src/libs/installer/lib7z_facade.h index b0077c318..52c23c8f4 100644 --- a/src/libs/installer/lib7z_facade.h +++ b/src/libs/installer/lib7z_facade.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/licenseoperation.cpp b/src/libs/installer/licenseoperation.cpp index 78d625bbd..9f4a232f8 100644 --- a/src/libs/installer/licenseoperation.cpp +++ b/src/libs/installer/licenseoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/licenseoperation.h b/src/libs/installer/licenseoperation.h index 235752615..542b8fe1b 100644 --- a/src/libs/installer/licenseoperation.h +++ b/src/libs/installer/licenseoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/linereplaceoperation.cpp b/src/libs/installer/linereplaceoperation.cpp index c99d06103..9063f8848 100644 --- a/src/libs/installer/linereplaceoperation.cpp +++ b/src/libs/installer/linereplaceoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/linereplaceoperation.h b/src/libs/installer/linereplaceoperation.h index 9903c28d9..38714b619 100644 --- a/src/libs/installer/linereplaceoperation.h +++ b/src/libs/installer/linereplaceoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/link.cpp b/src/libs/installer/link.cpp index c1c4e8618..9462f5358 100644 --- a/src/libs/installer/link.cpp +++ b/src/libs/installer/link.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/link.h b/src/libs/installer/link.h index cc8de5ec5..8df2cb0b3 100644 --- a/src/libs/installer/link.h +++ b/src/libs/installer/link.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/messageboxhandler.cpp b/src/libs/installer/messageboxhandler.cpp index 86e28eb39..4a583a15b 100644 --- a/src/libs/installer/messageboxhandler.cpp +++ b/src/libs/installer/messageboxhandler.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -56,7 +56,7 @@ } \endcode - \section2 Buttons + \section2 Buttons in Message Boxes QMessageBox defines a list of common buttons: \list diff --git a/src/libs/installer/messageboxhandler.h b/src/libs/installer/messageboxhandler.h index dc35ef177..b6b5d27ef 100644 --- a/src/libs/installer/messageboxhandler.h +++ b/src/libs/installer/messageboxhandler.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp index a7359ace8..41c0265bc 100644 --- a/src/libs/installer/metadatajob.cpp +++ b/src/libs/installer/metadatajob.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/metadatajob.h b/src/libs/installer/metadatajob.h index b90f9d523..5dbb5d833 100644 --- a/src/libs/installer/metadatajob.h +++ b/src/libs/installer/metadatajob.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/metadatajob_p.h b/src/libs/installer/metadatajob_p.h index 5039d8a23..034445cfa 100644 --- a/src/libs/installer/metadatajob_p.h +++ b/src/libs/installer/metadatajob_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/minimumprogressoperation.cpp b/src/libs/installer/minimumprogressoperation.cpp index bd0a2be89..1146bf598 100644 --- a/src/libs/installer/minimumprogressoperation.cpp +++ b/src/libs/installer/minimumprogressoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/minimumprogressoperation.h b/src/libs/installer/minimumprogressoperation.h index 5cbfb3823..0afa5d190 100644 --- a/src/libs/installer/minimumprogressoperation.h +++ b/src/libs/installer/minimumprogressoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/observer.cpp b/src/libs/installer/observer.cpp index 4bc6d6721..dab9f8711 100644 --- a/src/libs/installer/observer.cpp +++ b/src/libs/installer/observer.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/observer.h b/src/libs/installer/observer.h index c9e88afe5..09c4d237a 100644 --- a/src/libs/installer/observer.h +++ b/src/libs/installer/observer.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 99b4970e5..0cf21bfe4 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -166,8 +166,8 @@ /*! \qmlsignal installer::metaJobProgress(int progress) - Triggered with progress updates of the while communicating with a remote repository. Progress - ranges from 0 to 100. + Triggered with progress updates of the communication with a remote + repository. Progress ranges from 0 to 100. */ /*! @@ -496,7 +496,7 @@ void PackageManagerCore::setMessageBoxAutomaticAnswer(const QString &identifier, static_cast<QMessageBox::Button>(button)); } -quint64 size(QInstaller::Component *component, const QString &value) +quint64 PackageManagerCore::size(QInstaller::Component *component, const QString &value) const { if (component->installAction() == ComponentModelHelper::Install) return component->value(value).toLongLong(); @@ -591,8 +591,8 @@ int PackageManagerCore::downloadNeededArchives(double partProgressSize) } /*! - If a component marked as important was installed during update - process true is returned. + Returns \c true if a component marked as essential was installed during the + update process. */ bool PackageManagerCore::needsHardRestart() const { @@ -720,7 +720,7 @@ PackageManagerCore::PackageManagerCore() } PackageManagerCore::PackageManagerCore(qint64 magicmaker, const QList<OperationBlob> &operations, - quint16 port, const QString &key, Protocol::Mode mode) + const QString &socketName, const QString &key, Protocol::Mode mode) : d(new PackageManagerCorePrivate(this, magicmaker, operations)) { Repository::registerMetaType(); // register, cause we stream the type as QVariant @@ -729,7 +729,7 @@ PackageManagerCore::PackageManagerCore(qint64 magicmaker, const QList<OperationB // Creates and initializes a remote client, makes us get admin rights for QFile, QSettings // and QProcess operations. Init needs to called to set the server side authorization key. - RemoteClient::instance().init(port, key, mode, Protocol::StartAs::SuperUser); + RemoteClient::instance().init(socketName, key, mode, Protocol::StartAs::SuperUser); d->initialize(QHash<QString, QString>()); @@ -1062,7 +1062,7 @@ void PackageManagerCore::setValidatorForCustomPage(Component *component, const Q /*! \qmlmethod boolean installer::addWizardPageItem(Component component, string name, int page) - Adds the widget with objectName() \a name registered by \a component as an GUI element + Adds the widget with objectName() \a name registered by \a component as a GUI element into the installer's GUI wizard. The widget is added on \a page. See \l{Controller Scripting} for the possible values of \a page. @@ -1129,7 +1129,8 @@ void PackageManagerCore::setTemporaryRepositories(const QStringList &repositorie } /*! - Checks if the downloader should try to download sha1 checksums for archives. + Checks whether the downloader should try to download SHA-1 checksums for + archives. */ bool PackageManagerCore::testChecksum() const { @@ -1137,7 +1138,8 @@ bool PackageManagerCore::testChecksum() const } /*! - Defines if the downloader should try to download sha1 checksums for archives. + The \a test argument determines whether the downloader should try to + download SHA-1 checksums for archives. */ void PackageManagerCore::setTestChecksum(bool test) { @@ -1155,8 +1157,9 @@ ScriptEngine *PackageManagerCore::controlScriptEngine() const } /*! - Appends a component as root component to the internal storage for installer or package manager components. - To append a component as a child to an already existing component, use Component::appendComponent(). Emits + Appends \a component as the root component to the internal storage for + installer or package manager components. To append a component as a child to + an already existing component, use Component::appendComponent(). Emits the componentAdded() signal. */ void PackageManagerCore::appendRootComponent(Component *component) @@ -1222,7 +1225,8 @@ QList<Component *> PackageManagerCore::components(ComponentTypes mask) const } /*! - Appends a component to the internal storage for updater components. Emits the componentAdded() signal. + Appends \a component to the internal storage for updater components. Emits + the componentAdded() signal. */ void PackageManagerCore::appendUpdaterComponent(Component *component) { @@ -1326,7 +1330,7 @@ QList<Component*> PackageManagerCore::orderedComponentsToInstall() const Calculates a list of components to uninstall based on the current run mode. Auto installed dependencies are not yet resolved. The aboutCalculateComponentsToUninstall() signal is emitted before the calculation starts, the finishedCalculateComponentsToUninstall() signal once all - calculations are done. Returns always true. + calculations are done. Always returns \c true. */ bool PackageManagerCore::calculateComponentsToUninstall() const { @@ -1363,9 +1367,13 @@ QString PackageManagerCore::componentsToInstallError() const } /*! - Returns the reason why the component needs to be installed. Reasons can be: The component was scheduled - for installation, the component was added as a dependency for an other component or added as an automatic - dependency. + Returns the reason why \a component needs to be installed: + + \list + \li The component was scheduled for installation. + \li The component was added as a dependency for another component. + \li The component was added as an automatic dependency. + \endlist */ QString PackageManagerCore::installReason(Component *component) const { @@ -1373,8 +1381,10 @@ QString PackageManagerCore::installReason(Component *component) const } /*! - Returns a list of components that depend on \a component. The list can be empty. Note: Auto - installed dependencies are not resolved. + Returns a list of components that depend on \a _component. The list can be + empty. + + \note Automatic dependencies are not resolved. */ QList<Component*> PackageManagerCore::dependees(const Component *_component) const { @@ -1462,7 +1472,7 @@ void PackageManagerCore::dropAdminRights() /*! \qmlmethod boolean installer::isProcessRunning(string name) - Returns true, if a process with \a name is running. On Windows, the comparison + Returns \c true if a process with \a name is running. On Windows, the comparison is case-insensitive. */ bool PackageManagerCore::isProcessRunning(const QString &name) const @@ -1473,7 +1483,8 @@ bool PackageManagerCore::isProcessRunning(const QString &name) const /*! \qmlmethod boolean installer::killProcess(string absoluteFilePath) - Returns true, if a process with \a absoluteFilePath could be killed or isn't running + Returns \c true if a process with \a absoluteFilePath could be killed or is + not running. \note This is implemented in a semi blocking way (to keep the main thread to paint the UI). */ @@ -1624,7 +1635,7 @@ bool PackageManagerCore::executeDetached(const QString &program, const QStringLi /*! \qmlmethod string installer::environmentVariable(string name) - Returns content of an environment variable \a name. An empty string is returned if the + Returns the content of the environment variable \a name. An empty string is returned if the environment variable is not set. */ QString PackageManagerCore::environmentVariable(const QString &name) const @@ -1667,7 +1678,7 @@ bool PackageManagerCore::operationExists(const QString &name) /*! \qmlmethod boolean installer::performOperation(string name, stringlist arguments) - Instantly performs an operation \a name with \a arguments. + Instantly performs the operation \a name with \a arguments. */ bool PackageManagerCore::performOperation(const QString &name, const QStringList &arguments) { @@ -1688,7 +1699,7 @@ bool PackageManagerCore::performOperation(const QString &name, const QStringList \qmlmethod boolean installer::versionMatches(string version, string requirement) Returns \c true when \a version matches the \a requirement. - \a requirement can be a fixed version number or it can be prefix by the comparators '>', '>=', + \a requirement can be a fixed version number or it can be prefixed by the comparators '>', '>=', '<', '<=' and '='. */ bool PackageManagerCore::versionMatches(const QString &version, const QString &requirement) @@ -1784,7 +1795,8 @@ QString PackageManagerCore::findPath(const QString &name, const QStringList &pat Sets the "installerbase" binary to use when writing the maintenance tool. Set this if an update to installerbase is available. - If not set, the executable segment of the running un/installer will be used. + If not set, the executable segment of the running installer or uninstaller + will be used. */ void PackageManagerCore::setInstallerBaseBinary(const QString &path) { @@ -1896,8 +1908,8 @@ QString PackageManagerCore::error() const } /*! - Returns \c true if at least one complete installation/update was successful, even if the user cancelled the - newest installation process. + Returns \c true if at least one complete installation or update was + successful, even if the user cancelled the latest installation process. */ bool PackageManagerCore::finishedWithSuccess() const { @@ -1939,7 +1951,8 @@ QString PackageManagerCore::replaceVariables(const QString &str) const /*! \overload - Replaces all variables in any of \a str by their respective values and returns the results. + Replaces all variables in any instance of \a str by their respective values + and returns the results. */ QStringList PackageManagerCore::replaceVariables(const QStringList &str) const { @@ -2109,7 +2122,8 @@ void PackageManagerCore::languageChanged() } /*! - Runs the installer, un-installer, updater or package manager, depending on the type of this binary. + Runs the installer, uninstaller, updater, or package manager, depending on + the type of this binary. */ bool PackageManagerCore::run() { diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h index 8c11288f1..04bee2f71 100644 --- a/src/libs/installer/packagemanagercore.h +++ b/src/libs/installer/packagemanagercore.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -66,7 +66,7 @@ class INSTALLER_EXPORT PackageManagerCore : public QObject public: PackageManagerCore(); PackageManagerCore(qint64 magicmaker, const QList<OperationBlob> &ops, - quint16 port = Protocol::DefaultPort, + const QString &socketName = QString(), const QString &key = QLatin1String(Protocol::DefaultAuthorizationKey), Protocol::Mode mode = Protocol::Mode::Production); ~PackageManagerCore(); @@ -186,6 +186,8 @@ public: Q_INVOKABLE void autoRejectMessageBoxes(); Q_INVOKABLE void setMessageBoxAutomaticAnswer(const QString &identifier, int button); + quint64 size(QInstaller::Component *component, const QString &value) const; + Q_INVOKABLE bool isFileExtensionRegistered(const QString &extension) const; Q_INVOKABLE bool fileExists(const QString &filePath) const; diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 8003bc393..87ce55e35 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -65,6 +65,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QDirIterator> +#include <QtCore/QUuid> #include <QtCore/QFuture> #include <QtCore/QFutureWatcher> #include <QtCore/QTemporaryFile> @@ -1351,6 +1352,8 @@ void PackageManagerCorePrivate::writeMaintenanceTool(OperationList performedOper QInstaller::appendInt64(&file, BinaryContent::MagicCookie); } input.close(); + if (m_core->isInstaller()) + registerMaintenanceTool(); writeMaintenanceConfigFiles(); deferredRename(dataFile + QLatin1String(".new"), dataFile, false); @@ -1375,19 +1378,22 @@ void PackageManagerCorePrivate::writeMaintenanceTool(OperationList performedOper m_needToWriteMaintenanceTool = false; } -QString PackageManagerCorePrivate::registerPath() const +QString PackageManagerCorePrivate::registerPath() { #ifdef Q_OS_WIN - const QString productName = m_data.value(QLatin1String("ProductName")).toString(); - if (productName.isEmpty()) - throw Error(tr("ProductName should be set")); + QString guid = m_data.value(scProductUUID).toString(); + if (guid.isEmpty()) { + guid = QUuid::createUuid().toString(); + m_data.setValue(scProductUUID, guid); + writeMaintenanceConfigFiles(); // save uuid persistently + } QString path = QLatin1String("HKEY_CURRENT_USER"); - if (m_data.value(QLatin1String("AllUsers")).toString() == scTrue) + if (m_data.value(QLatin1String("AllUsers"), scFalse).toString() == scTrue) path = QLatin1String("HKEY_LOCAL_MACHINE"); return path + QLatin1String("\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\") - + productName; + + guid; #endif return QString(); } @@ -1499,10 +1505,20 @@ bool PackageManagerCorePrivate::runInstaller() Operation *createRepo = createOwnedOperation(QLatin1String("CreateLocalRepository")); if (createRepo) { + QString binaryFile = QCoreApplication::applicationFilePath(); +#ifdef Q_OS_OSX + // The installer binary on OSX does not contain the binary content, it's put into + // the resources folder as separate file. Adjust the actual binary path. No error + // checking here since we will fail later while reading the binary content. + QDir resourcePath(QFileInfo(binaryFile).dir()); + resourcePath.cdUp(); + resourcePath.cd(QLatin1String("Resources")); + binaryFile = resourcePath.filePath(QLatin1String("installer.dat")); +#endif createRepo->setValue(QLatin1String("uninstall-only"), true); createRepo->setValue(QLatin1String("installer"), QVariant::fromValue(m_core)); - createRepo->setArguments(QStringList() << QCoreApplication::applicationFilePath() - << target + QLatin1String("/repository")); + createRepo->setArguments(QStringList() << binaryFile << target + + QLatin1String("/repository")); connectOperationToInstaller(createRepo, progressOperationSize); @@ -1533,7 +1549,6 @@ bool PackageManagerCorePrivate::runInstaller() emit m_core->titleMessageChanged(tr("Creating Maintenance Tool")); writeMaintenanceTool(m_performedOperationsOld + m_performedOperationsCurrentSession); - registerMaintenanceTool(); // fake a possible wrong value to show a full progress bar const int progress = ProgressCoordinator::instance()->progressInPercentage(); @@ -1982,7 +1997,23 @@ void PackageManagerCorePrivate::registerMaintenanceTool() settings.setValue(QLatin1String("UninstallString"), maintenanceTool); settings.setValue(QLatin1String("ModifyPath"), QString(maintenanceTool + QLatin1String(" --manage-packages"))); - settings.setValue(QLatin1String("EstimatedSize"), QFileInfo(installerBinaryPath()).size()); + // required disk space of the installed components + quint64 estimatedSizeKB = m_core->requiredDiskSpace() / 1024; + // add required space for the maintenance tool + estimatedSizeKB += QFileInfo(maintenanceTool).size() / 1024; + if (m_core->createLocalRepositoryFromBinary()) { + // add required space for a local repository + quint64 result(0); + foreach (QInstaller::Component *component, + m_core->components(PackageManagerCore::ComponentType::All)) { + result += m_core->size(component, scCompressedSize); + } + estimatedSizeKB += result / 1024; + } + // Windows can only handle 32bit REG_DWORD (max. recordable installation size is 4TiB) + const quint64 limit = std::numeric_limits<quint32>::max(); // maximum 32 bit value + if (estimatedSizeKB <= limit) + settings.setValue(QLatin1String("EstimatedSize"), static_cast<quint32>(estimatedSizeKB)); settings.setValue(QLatin1String("NoModify"), 0); settings.setValue(QLatin1String("NoRepair"), 1); #endif diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h index 55a25f9a8..d8b7778ac 100644 --- a/src/libs/installer/packagemanagercore_p.h +++ b/src/libs/installer/packagemanagercore_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -117,7 +117,7 @@ public: void setStatus(int status, const QString &error = QString()); QString targetDir() const; - QString registerPath() const; + QString registerPath(); QString maintenanceToolName() const; QString installerBinaryPath() const; diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index 3acc24a76..0da18d218 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/packagemanagercoredata.h b/src/libs/installer/packagemanagercoredata.h index f3c6d1038..b9e94878d 100644 --- a/src/libs/installer/packagemanagercoredata.h +++ b/src/libs/installer/packagemanagercoredata.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index ebbf3e201..67e3d3a8c 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -247,6 +247,52 @@ public: \brief The PackageManagerGui class provides the core functionality for non-interactive installations. */ + +/*! + \fn void PackageManagerGui::interrupted() + This signal is emitted when the end user chooses to cancel the installation + and quit the installer. +*/ + +/*! + \fn void PackageManagerGui::languageChanged() + This signal is emitted when the application language changes. +*/ + +/*! + \fn void PackageManagerGui::finishButtonClicked() + This signal is emitted when the \uicontrol Finish button is clicked. +*/ + +/*! + \fn void PackageManagerGui::gotRestarted() + This signal is emitted when the installer is restarted. +*/ + +/*! + \fn void PackageManagerGui::settingsButtonClicked() + This signal is emitted when the \uicontrol Settings button is clicked. +*/ + +/*! + \fn void PackageManagerGui::setValidatorForCustomPageRequested(QInstaller::Component *component, + const QString &name, + const QString &callbackName) + + Sets a validator for the custom page specified by \a name and + \a callbackName requested by \a component. +*/ + +/*! + \fn void PackageManagerGui::packageManagerCore() const + + Returns the package manager core. +*/ + +/*! + Constructs a package manager UI with package manager specified by \a core + and \a parent as parent. +*/ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent) : QWizard(parent) , d(new Private) @@ -320,11 +366,25 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent) m_core->setGuiObject(this); } +/*! + Destructs a package manager UI. +*/ PackageManagerGui::~PackageManagerGui() { + m_core->setGuiObject(0); delete d; } +/*! + Returns the style of the package manager UI depending on \a name: + + \list + \li \c Classic - Classic UI style for Windows 7 and earlier. + \li \c Modern - Modern UI style for Windows 8. + \li \c Mac - UI style for OS X. + \li \c Aero - Aero Peek for Windows 7. + \endlist +*/ QWizard::WizardStyle PackageManagerGui::getStyle(const QString &name) { if (name == QLatin1String("Classic")) @@ -341,11 +401,17 @@ QWizard::WizardStyle PackageManagerGui::getStyle(const QString &name) return QWizard::ModernStyle; } +/*! + Enables automatic page switching when \a request is \c true. +*/ void PackageManagerGui::setAutomatedPageSwitchEnabled(bool request) { d->m_autoSwitchPage = request; } +/*! + Returns the default text for the button specified by \a wizardButton. +*/ QString PackageManagerGui::defaultButtonText(int wizardButton) const { return d->m_defaultButtonText.value(wizardButton); @@ -371,6 +437,9 @@ static bool swapFinishButton(PackageManagerCore *core, int currentId, int button return true; } +/*! + Clicks the button specified by \a wb after the delay specified by \a delay. +*/ void PackageManagerGui::clickButton(int wb, int delay) { // We need to to swap here, cause scripts expect to call this function with FinishButton on the @@ -384,6 +453,10 @@ void PackageManagerGui::clickButton(int wb, int delay) qWarning() << "Button with type: " << d->buttonType(wb) << "not found!"; } +/*! + Returns \c true if the button specified by \a wb is enabled. Returns \c false + if a button of the specified type is not found. +*/ bool PackageManagerGui::isButtonEnabled(int wb) { // We need to to swap here, cause scripts expect to call this function with FinishButton on the @@ -398,6 +471,10 @@ bool PackageManagerGui::isButtonEnabled(int wb) return false; } +/*! + Sets a validator for the custom page specified by \a name and + \a callbackName requested by \a component. +*/ void PackageManagerGui::setValidatorForCustomPageRequested(Component *component, const QString &name, const QString &callbackName) { @@ -415,8 +492,9 @@ void PackageManagerGui::setValidatorForCustomPageRequested(Component *component, } /*! - Loads a script to perform the installation non-interactively. - @throws QInstaller::Error if the script is not readable/cannot be parsed + Loads the script specified by \a scriptPath to perform the installation non-interactively. + Throws QInstaller::Error if the script is not readable or it cannot be + parsed. */ void PackageManagerGui::loadControlScript(const QString &scriptPath) { @@ -425,6 +503,9 @@ void PackageManagerGui::loadControlScript(const QString &scriptPath) qDebug() << "Loaded control script" << scriptPath; } +/*! + Calls the control script method specified by \a methodName. +*/ void PackageManagerGui::callControlScriptMethod(const QString &methodName) { if (d->m_controlScriptContext.isUndefined()) @@ -441,12 +522,19 @@ void PackageManagerGui::callControlScriptMethod(const QString &methodName) } } +/*! + Executes the control script on the page specified by \a pageId. +*/ void PackageManagerGui::executeControlScript(int pageId) { if (PackageManagerPage *const p = qobject_cast<PackageManagerPage*> (page(pageId))) callControlScriptMethod(p->objectName() + QLatin1String("Callback")); } +/*! + Replaces the default button text with translated text when the application + language changes. +*/ void PackageManagerGui::onLanguageChanged() { d->m_defaultButtonText.clear(); @@ -454,6 +542,9 @@ void PackageManagerGui::onLanguageChanged() d->m_defaultButtonText.insert(i, buttonText(QWizard::WizardButton(i))); } +/*! + \reimp +*/ bool PackageManagerGui::event(QEvent *event) { switch(event->type()) { @@ -466,6 +557,9 @@ bool PackageManagerGui::event(QEvent *event) return QWizard::event(event); } +/*! + \reimp +*/ void PackageManagerGui::showEvent(QShowEvent *event) { if (!event->spontaneous()) { @@ -489,6 +583,11 @@ void PackageManagerGui::showEvent(QShowEvent *event) QMetaObject::invokeMethod(this, "dependsOnLocalInstallerBinary", Qt::QueuedConnection); } +/*! + Requests the insertion of the page specified by \a widget at the position specified by \a page. + If that position is already occupied by another page, the value is decremented until an empty + slot is found. +*/ void PackageManagerGui::wizardPageInsertionRequested(QWidget *widget, QInstaller::PackageManagerCore::WizardPage page) { @@ -503,6 +602,9 @@ void PackageManagerGui::wizardPageInsertionRequested(QWidget *widget, setPage(pageId, new DynamicInstallerPage(widget, m_core)); } +/*! + Requests the removal of the page specified by \a widget. +*/ void PackageManagerGui::wizardPageRemovalRequested(QWidget *widget) { foreach (int pageId, pageIds()) { @@ -518,6 +620,9 @@ void PackageManagerGui::wizardPageRemovalRequested(QWidget *widget) } } +/*! + Requests the insertion of \a widget on \a page. +*/ void PackageManagerGui::wizardWidgetInsertionRequested(QWidget *widget, QInstaller::PackageManagerCore::WizardPage page) { @@ -529,6 +634,9 @@ void PackageManagerGui::wizardWidgetInsertionRequested(QWidget *widget, } } +/*! + Requests the removal of \a widget from installer pages. +*/ void PackageManagerGui::wizardWidgetRemovalRequested(QWidget *widget) { Q_ASSERT(widget); @@ -537,6 +645,10 @@ void PackageManagerGui::wizardWidgetRemovalRequested(QWidget *widget) packageManagerCore()->componentScriptEngine()->removeFromGlobalObject(widget); } +/*! + Requests changing the visibility of the page specified by \a p to + \a visible. +*/ void PackageManagerGui::wizardPageVisibilityChangeRequested(bool visible, int p) { if (visible && page(p) == 0) { @@ -547,11 +659,17 @@ void PackageManagerGui::wizardPageVisibilityChangeRequested(bool visible, int p) } } +/*! + Returns the page specified by \a id. +*/ QWidget *PackageManagerGui::pageById(int id) const { return page(id); } +/*! + Returns the page specified by the object name \a name from a UI file. +*/ QWidget *PackageManagerGui::pageByObjectName(const QString &name) const { const QList<int> ids = pageIds(); @@ -564,11 +682,18 @@ QWidget *PackageManagerGui::pageByObjectName(const QString &name) const return 0; } +/*! + Returns the current page. +*/ QWidget *PackageManagerGui::currentPageWidget() const { return currentPage(); } +/*! + For dynamic pages, returns the widget specified by \a name read from the UI + file. +*/ QWidget *PackageManagerGui::pageWidgetByObjectName(const QString &name) const { QWidget *const widget = pageByObjectName(name); @@ -583,6 +708,10 @@ QWidget *PackageManagerGui::pageWidgetByObjectName(const QString &name) const return 0; } +/*! + Asks end users whether they want to cancel the operation and quit the installer, uninstaller, + or package manager. +*/ void PackageManagerGui::cancelButtonClicked() { const int id = currentId(); @@ -622,21 +751,34 @@ void PackageManagerGui::cancelButtonClicked() } } +/*! + Quits the installer, uninstaller, or package manager without asking end + users for confirmation. +*/ void PackageManagerGui::rejectWithoutPrompt() { QDialog::reject(); } +/*! + \reimp +*/ void PackageManagerGui::reject() { cancelButtonClicked(); } +/*! + \internal +*/ void PackageManagerGui::setModified(bool value) { d->m_modified = value; } +/*! + Shows the next page. +*/ void PackageManagerGui::showFinishedPage() { qDebug() << "SHOW FINISHED PAGE"; @@ -646,6 +788,9 @@ void PackageManagerGui::showFinishedPage() qobject_cast<QPushButton*>(button(QWizard::CancelButton))->setEnabled(false); } +/*! + Shows the \uicontrol Settings button if \a show is \c true. +*/ void PackageManagerGui::showSettingsButton(bool show) { if (d->m_showSettingsButton == show) @@ -659,8 +804,8 @@ void PackageManagerGui::showSettingsButton(bool show) } /*! - Force an update of our own button layout, needs to be called whenever a button option has been - set. + Forces an update of our own button layout. Needs to be called whenever a + button option has been set. */ void PackageManagerGui::updateButtonLayout() { @@ -694,18 +839,29 @@ void PackageManagerGui::updateButtonLayout() setButtonLayout(buttons.toList()); } +/*! + Enables the \uicontrol Settings button by setting \a enabled to \c true. +*/ void PackageManagerGui::setSettingsButtonEnabled(bool enabled) { if (QAbstractButton *btn = button(QWizard::CustomButton1)) btn->setEnabled(enabled); } +/*! + Emits the settingsButtonClicked() signal when the custom button specified by \a which is + clicked if \a which is the \uicontrol Settings button. +*/ void PackageManagerGui::customButtonClicked(int which) { if (QWizard::WizardButton(which) == QWizard::CustomButton1 && d->m_showSettingsButton) emit settingsButtonClicked(); } +/*! + Prevents installation from a network location by determining that a local + installer binary must be used. +*/ void PackageManagerGui::dependsOnLocalInstallerBinary() { if (m_core->settings().dependsOnLocalInstallerBinary() && !m_core->localInstallerBinaryUsed()) { @@ -717,10 +873,15 @@ void PackageManagerGui::dependsOnLocalInstallerBinary() } } +/*! + Called when the current page changes to \a newId. Calls the leaving() method for the old page + and the entering() method for the new one. Also, executes the control script associated with the + new page by calling executeControlScript(). + + Emits the left() and entered() signals. +*/ void PackageManagerGui::currentPageChanged(int newId) { - executeControlScript(newId); - PackageManagerPage *oldPage = qobject_cast<PackageManagerPage *>(page(d->m_currentId)); if (oldPage) { oldPage->leaving(); @@ -734,10 +895,87 @@ void PackageManagerGui::currentPageChanged(int newId) newPage->entering(); emit newPage->entered(); } + + executeControlScript(newId); } // -- PackageManagerPage +/*! + \class QInstaller::PackageManagerPage + \inmodule QtInstallerFramework + \brief The PackageManagerPage class displays information about the product + to install. +*/ + +/*! + \fn PackageManagerPage::~PackageManagerPage() + + Destructs a package manager page. +*/ + +/*! + \fn PackageManagerPage::gui() const + + Returns the wizard this page belongs to. +*/ + +/*! + \fn PackageManagerPage::isInterruptible() const + + Returns \c true if the installation can be interrupted. +*/ + +/*! + \fn PackageManagerPage::setValidatePageComponent(QInstaller::Component *component) + + Sets \a component as the component that validates the page. +*/ + +/*! + \fn PackageManagerPage::settingsButtonRequested() const + + Returns \c true if the page requests the wizard to show the \uicontrol Settings button. +*/ + +/*! + \fn PackageManagerPage::setSettingsButtonRequested(bool request) + + Determines that the page should request the \uicontrol Settings button if \a request is \c true. +*/ + +/*! + \fn PackageManagerPage::entered() + + This signal is called when a page is entered. +*/ + +/*! + \fn PackageManagerPage::left() + + This signal is called when a page is left. +*/ + +/*! + \fn PackageManagerPage::entering() + + Called when end users enter the page and the PackageManagerGui:currentPageChanged() + signal is triggered. Supports the QWizardPage::​initializePage() function to ensure + that the page's fields are properly initialized based on fields from previous pages. + Otherwise, \c initializePage() would only be called once if the installer has been + set to QWizard::IndependentPages. +*/ + +/*! + \fn PackageManagerPage::leaving() + + Called when end users leave the page and the PackageManagerGui:currentPageChanged() + signal is triggered. +*/ + +/*! + Constructs a package manager page with \a core as parent. +*/ PackageManagerPage::PackageManagerPage(PackageManagerCore *core) : m_complete(true) , m_needsSettingsButton(false) @@ -755,46 +993,78 @@ PackageManagerPage::PackageManagerPage(PackageManagerCore *core) setPixmap(QWizard::LogoPixmap, logoPixmap()); } +/*! + Returns the package manager core. +*/ PackageManagerCore *PackageManagerPage::packageManagerCore() const { return m_core; } +/*! + Returns the watermark pixmap specified in the \c <Watermark> element of the package information + file. +*/ QPixmap PackageManagerPage::watermarkPixmap() const { return QPixmap(m_core->value(QLatin1String("WatermarkPixmap"))); } +/*! + Returns the banner pixmap specified in the \c <Banner> element of the package information file. + Only used by the modern UI style. +*/ QPixmap PackageManagerPage::bannerPixmap() const { return QPixmap(m_core->value(QLatin1String("BannerPixmap"))); } +/*! + Returns the logo pixmap specified in the \c <Logo> element of the package information file. +*/ QPixmap PackageManagerPage::logoPixmap() const { return QPixmap(m_core->value(QLatin1String("LogoPixmap"))); } +/*! + Returns the product name of the application being installed. +*/ QString PackageManagerPage::productName() const { return m_core->value(QLatin1String("ProductName")); } +/*! + Sets the font color of \a title. The title is specified in the \c <Title> + element of the package information file. It is the name of the installer as + displayed on the title bar. +*/ void PackageManagerPage::setColoredTitle(const QString &title) { setTitle(QString::fromLatin1("<font color=\"%1\">%2</font>").arg(m_titleColor, title)); } +/*! + Sets the font color of \a subTitle. +*/ void PackageManagerPage::setColoredSubTitle(const QString &subTitle) { setSubTitle(QString::fromLatin1("<font color=\"%1\">%2</font>").arg(m_titleColor, subTitle)); } +/*! + Returns \c true if the page is complete; otherwise, returns \c false. +*/ bool PackageManagerPage::isComplete() const { return m_complete; } +/*! + Sets the package manager page to complete if \a complete is \c true. Emits + the completeChanged() signal. +*/ void PackageManagerPage::setComplete(bool complete) { m_complete = complete; @@ -809,11 +1079,17 @@ void PackageManagerPage::setComplete(bool complete) emit completeChanged(); } +/*! + Sets the \a component that validates the page. +*/ void PackageManagerPage::setValidatePageComponent(Component *component) { validatorComponent = component; } +/*! + Returns \c true if the end user has entered complete and valid information. +*/ bool PackageManagerPage::validatePage() { if (validatorComponent) @@ -821,6 +1097,11 @@ bool PackageManagerPage::validatePage() return true; } +/*! + Inserts \a widget at the position specified by \a offset in relation to + another widget specified by \a siblingName. The default position is directly + behind the sibling. +*/ void PackageManagerPage::insertWidget(QWidget *widget, const QString &siblingName, int offset) { QWidget *sibling = findChild<QWidget *>(siblingName); @@ -834,11 +1115,21 @@ void PackageManagerPage::insertWidget(QWidget *widget, const QString &siblingNam } } +/*! + Returns the widget specified by \a objectName. +*/ QWidget *PackageManagerPage::findWidget(const QString &objectName) const { return findChild<QWidget*> (objectName); } +/*! + Determines which page should be shown next depending on whether the + application is being installed, updated, or uninstalled. + + The license check page is shown only if a component that provides a license + is selected for installation. It is hidden during uninstallation and update. +*/ int PackageManagerPage::nextId() const { const int next = QWizardPage::nextId(); // the page to show next @@ -866,6 +1157,22 @@ int PackageManagerPage::nextId() const // -- IntroductionPage +/*! + \class QInstaller::IntroductionPage + \inmodule QtInstallerFramework + \brief The IntroductionPage class displays information about the product to + install. +*/ + +/*! + \fn IntroductionPage::packageManagerCoreTypeChanged() + + This signal is emitted when the package manager core type changes. +*/ + +/*! + Constructs an introduction page with \a core as parent. +*/ IntroductionPage::IntroductionPage(PackageManagerCore *core) : PackageManagerPage(core) , m_updatesFetched(false) @@ -949,6 +1256,10 @@ IntroductionPage::IntroductionPage(PackageManagerCore *core) #endif } +/*! + Determines which page should be shown next depending on whether the + application is being installed, updated, or uninstalled. +*/ int IntroductionPage::nextId() const { if (packageManagerCore()->isUninstaller()) @@ -960,6 +1271,11 @@ int IntroductionPage::nextId() const return PackageManagerPage::nextId(); } +/*! + For an uninstaller, always returns \c true. For the package manager and updater, at least + one valid repository is required. For the online installer, package manager, and updater, valid + meta data has to be fetched successfully to return \c true. +*/ bool IntroductionPage::validatePage() { PackageManagerCore *core = packageManagerCore(); @@ -1047,16 +1363,25 @@ bool IntroductionPage::validatePage() return isComplete(); } +/*! + Shows all widgets on the page. +*/ void IntroductionPage::showAll() { showWidgets(true); } +/*! + Hides all widgets on the page. +*/ void IntroductionPage::hideAll() { showWidgets(false); } +/*! + Hides the widgets on the page except a text label and progress bar. +*/ void IntroductionPage::showMetaInfoUpdate() { showWidgets(false); @@ -1064,6 +1389,9 @@ void IntroductionPage::showMetaInfoUpdate() m_progressBar->setVisible(true); } +/*! + Shows the options to install, add, and unistall components on the page. +*/ void IntroductionPage::showMaintenanceTools() { showWidgets(true); @@ -1071,6 +1399,10 @@ void IntroductionPage::showMaintenanceTools() m_progressBar->setVisible(false); } +/*! + Sets \a enable to \c true to enable the options to install, add, and + uninstall components on the page. +*/ void IntroductionPage::setMaintenanceToolsEnabled(bool enable) { m_packageManager->setEnabled(enable); @@ -1080,17 +1412,26 @@ void IntroductionPage::setMaintenanceToolsEnabled(bool enable) // -- public slots +/*! + Displays the message \a msg on the page. +*/ void IntroductionPage::setMessage(const QString &msg) { m_label->setText(msg); } +/*! + Updates the value of \a progress on the progress bar. +*/ void IntroductionPage::onProgressChanged(int progress) { m_progressBar->setRange(0, 100); m_progressBar->setValue(progress); } +/*! + Displays the error message \a error on the page. +*/ void IntroductionPage::setErrorMessage(const QString &error) { QPalette palette; @@ -1110,6 +1451,9 @@ void IntroductionPage::setErrorMessage(const QString &error) #endif } +/*! + Returns \c true if at least one valid and enabled repository is available. +*/ bool IntroductionPage::validRepositoriesAvailable() const { const PackageManagerCore *const core = packageManagerCore(); @@ -1158,6 +1502,10 @@ void IntroductionPage::setPackageManager(bool value) } } +/*! + Resets the internal page state, so that on clicking \uicontrol Next the metadata needs to be + fetched again. +*/ void IntroductionPage::onCoreNetworkSettingsChanged() { m_updatesFetched = false; @@ -1166,6 +1514,9 @@ void IntroductionPage::onCoreNetworkSettingsChanged() // -- private +/*! + Initializes the page's fields. +*/ void IntroductionPage::entering() { setComplete(true); @@ -1184,6 +1535,10 @@ void IntroductionPage::entering() setSettingsButtonRequested((!core->isOfflineOnly()) && (!core->isUninstaller())); } +/*! + Called when end users leave the page and the PackageManagerGui:currentPageChanged() + signal is triggered. +*/ void IntroductionPage::leaving() { m_progressBar->setValue(0); @@ -1191,6 +1546,9 @@ void IntroductionPage::leaving() setButtonText(QWizard::CancelButton, gui()->defaultButtonText(QWizard::CancelButton)); } +/*! + Displays widgets on the page. +*/ void IntroductionPage::showWidgets(bool show) { m_label->setVisible(show); @@ -1200,6 +1558,9 @@ void IntroductionPage::showWidgets(bool show) m_removeAllComponents->setVisible(show); } +/*! + Displays the text \a text on the page. +*/ void IntroductionPage::setText(const QString &text) { m_msgLabel->setText(text); @@ -1234,6 +1595,20 @@ private: // -- LicenseAgreementPage +/*! + \class QInstaller::LicenseAgreementPage + \inmodule QtInstallerFramework + \brief The LicenseAgreementPage presents a license agreement to the end + users for acceptance. + + The license check page is displayed if you specify a license file in the + package information file and copy the file to the meta directory. End users must + accept the terms of the license agreement for the installation to continue. +*/ + +/*! + Constructs a license check page with \a core as parent. +*/ LicenseAgreementPage::LicenseAgreementPage(PackageManagerCore *core) : PackageManagerPage(core) { @@ -1298,6 +1673,10 @@ LicenseAgreementPage::LicenseAgreementPage(PackageManagerCore *core) m_rejectRadioButton->setChecked(true); } +/*! + Initializes the page's fields based on values from fields on previous + pages. +*/ void LicenseAgreementPage::entering() { m_licenseListWidget->clear(); @@ -1317,6 +1696,10 @@ void LicenseAgreementPage::entering() updateUi(); } +/*! + Returns \c true if the accept license radio button is checked; otherwise, + returns \c false. +*/ bool LicenseAgreementPage::isComplete() const { return m_acceptRadioButton->isChecked(); @@ -1577,7 +1960,12 @@ public: /*! \class QInstaller::ComponentSelectionPage \inmodule QtInstallerFramework - \brief The ComponentSelectionPage class can be used to change the checked state of components. + \brief The ComponentSelectionPage class changes the checked state of + components. +*/ + +/*! + Constructs a component selection page with \a core as parent. */ ComponentSelectionPage::ComponentSelectionPage(PackageManagerCore *core) : PackageManagerPage(core) @@ -1588,11 +1976,19 @@ ComponentSelectionPage::ComponentSelectionPage(PackageManagerCore *core) setColoredTitle(tr("Select Components")); } +/*! + Destructs a component selection page. +*/ ComponentSelectionPage::~ComponentSelectionPage() { delete d; } +/*! + Initializes the page's fields based on values from fields on previous + pages. The text to display depends on whether the page is being used in an + installer, updater, or uninstaller. +*/ void ComponentSelectionPage::entering() { static const char *strings[] = { @@ -1613,6 +2009,13 @@ void ComponentSelectionPage::entering() setModified(isComplete()); } +/*! + Called when the show event \a event occurs. Switching pages back and forth might restore or + remove the checked state of certain components the end users have checked or not checked, + because the dependencies are resolved and checked when clicking \uicontrol Next. So as not to + confuse the end users with newly checked components they did not check, the state they left the + page in is restored. +*/ void ComponentSelectionPage::showEvent(QShowEvent *event) { // remove once we deprecate isSelected, setSelected etc... @@ -1621,16 +2024,26 @@ void ComponentSelectionPage::showEvent(QShowEvent *event) QWizardPage::showEvent(event); } +/*! + Selects all components in the component tree. +*/ void ComponentSelectionPage::selectAll() { d->selectAll(); } +/*! + Deselects all components in the component tree. +*/ void ComponentSelectionPage::deselectAll() { d->deselectAll(); } +/*! + Selects the components that have the \c <Default> element set to \c true in + the package information file. +*/ void ComponentSelectionPage::selectDefault() { if (packageManagerCore()->isInstaller()) @@ -1638,7 +2051,7 @@ void ComponentSelectionPage::selectDefault() } /*! - Selects the component with /a id in the component tree. + Selects the component with \a id in the component tree. */ void ComponentSelectionPage::selectComponent(const QString &id) { @@ -1648,7 +2061,7 @@ void ComponentSelectionPage::selectComponent(const QString &id) } /*! - Deselects the component with /a id in the component tree. + Deselects the component with \a id in the component tree. */ void ComponentSelectionPage::deselectComponent(const QString &id) { @@ -1662,6 +2075,9 @@ void ComponentSelectionPage::setModified(bool modified) setComplete(modified); } +/*! + Returns \c true if at least one component is checked on the page. +*/ bool ComponentSelectionPage::isComplete() const { if (packageManagerCore()->isInstaller() || packageManagerCore()->isUpdater()) @@ -1672,6 +2088,32 @@ bool ComponentSelectionPage::isComplete() const // -- TargetDirectoryPage +/*! + \class QInstaller::TargetDirectoryPage + \inmodule QtInstallerFramework + \brief The TargetDirectoryPage class specifies the target directory for the + installation. + + End users can leave the page to continue the installation only if certain criteria are + fulfilled. Some of them are checked in the validatePage() function, some in the + targetDirWarning() function: + + \list + \li No empty path given as target. + \li No relative path given as target. + \li Only ASCII characters are allowed in the path if the <AllowNonAsciiCharacters> element + in the configuration file is set to \c false. + \li The following ambiguous characters are not allowed in the path: [\"~<>|?*!@#$%^&:,;] + \li No root or home directory given as target. + \li On Windows, path names must be less than 260 characters long. + \li No spaces in the path if the <AllowSpaceInPath> element in the configuration file is set + to \c false. + \endlist +*/ + +/*! + Constructs a target directory selection page with \a core as parent. +*/ TargetDirectoryPage::TargetDirectoryPage(PackageManagerCore *core) : PackageManagerPage(core) { @@ -1715,16 +2157,26 @@ TargetDirectoryPage::TargetDirectoryPage(PackageManagerCore *core) setLayout(layout); } +/*! + Returns the target directory for the installation. +*/ QString TargetDirectoryPage::targetDir() const { return m_lineEdit->text().trimmed(); } +/*! + Sets the directory specified by \a dirName as the target directory for the + installation. +*/ void TargetDirectoryPage::setTargetDir(const QString &dirName) { m_lineEdit->setText(dirName); } +/*! + Initializes the page. +*/ void TargetDirectoryPage::initializePage() { QString targetDir = packageManagerCore()->value(scTargetDir); @@ -1744,6 +2196,17 @@ void TargetDirectoryPage::initializePage() PackageManagerPage::initializePage(); } +/*! + Checks whether the target directory exists and has contents: + + \list + \li Returns \c true if the directory exists and is empty. + \li Returns \c false if the directory already exists and contains an installation. + \li Returns \c false if the target is a file or a symbolic link. + \li Returns \c true or \c false if the directory exists but is not empty, depending on the + choice that the end users make in the displayed message box. + \endlist +*/ bool TargetDirectoryPage::validatePage() { if (!isVisible()) @@ -1786,12 +2249,20 @@ bool TargetDirectoryPage::validatePage() return true; } +/*! + Initializes the page's fields based on values from fields on previous + pages. +*/ void TargetDirectoryPage::entering() { if (QPushButton *const b = qobject_cast<QPushButton *>(gui()->button(QWizard::NextButton))) b->setDefault(true); } +/*! + Called when end users leave the page and the PackageManagerGui:currentPageChanged() + signal is triggered. +*/ void TargetDirectoryPage::leaving() { packageManagerCore()->setValue(scTargetDir, targetDir()); @@ -1806,12 +2277,22 @@ void TargetDirectoryPage::dirRequested() m_lineEdit->setText(QDir::toNativeSeparators(newDirName)); } +/*! + Requests a warning message to be shown to end users upon invalid input. If the input is valid, + the \uicontrol Next button is enabled. + + Returns \c true if a valid path to the target directory is set; otherwise returns \c false. +*/ bool TargetDirectoryPage::isComplete() const { m_warningLabel->setText(targetDirWarning()); return m_warningLabel->text().isEmpty(); } +/*! + Returns a warning if the path to the target directory is not set or if it + is invalid. Installation can continue only after a valid target path is given. +*/ QString TargetDirectoryPage::targetDirWarning() const { if (targetDir().isEmpty()) @@ -1900,6 +2381,10 @@ QString TargetDirectoryPage::targetDirWarning() const return QString(); } +/*! + Returns \c true if a warning message specified by \a message with the + identifier \a identifier is presented to end users for acknowledgment. +*/ bool TargetDirectoryPage::askQuestion(const QString &identifier, const QString &message) { QMessageBox::StandardButton bt = @@ -1918,6 +2403,16 @@ bool TargetDirectoryPage::failWithError(const QString &identifier, const QString // -- StartMenuDirectoryPage +/*! + \class QInstaller::StartMenuDirectoryPage + \inmodule QtInstallerFramework + \brief The StartMenuDirectoryPage class specifies the program group for the + product in the Windows Start menu. +*/ + +/*! + Constructs a Start menu directory selection page with \a core as parent. +*/ StartMenuDirectoryPage::StartMenuDirectoryPage(PackageManagerCore *core) : PackageManagerPage(core) { @@ -1953,16 +2448,27 @@ StartMenuDirectoryPage::StartMenuDirectoryPage(PackageManagerCore *core) SLOT(currentItemChanged(QListWidgetItem*))); } +/*! + Returns the program group for the product in the Windows Start menu. +*/ QString StartMenuDirectoryPage::startMenuDir() const { return m_lineEdit->text().trimmed(); } +/*! + Sets \a startMenuDir as the program group for the product in the Windows + Start menu. +*/ void StartMenuDirectoryPage::setStartMenuDir(const QString &startMenuDir) { m_lineEdit->setText(startMenuDir.trimmed()); } +/*! + Called when end users leave the page and the PackageManagerGui:currentPageChanged() + signal is triggered. +*/ void StartMenuDirectoryPage::leaving() { packageManagerCore()->setValue(scStartMenuDir, startMenuPath + QDir::separator() @@ -1978,6 +2484,16 @@ void StartMenuDirectoryPage::currentItemChanged(QListWidgetItem *current) // -- ReadyForInstallationPage +/*! + \class QInstaller::ReadyForInstallationPage + \inmodule QtInstallerFramework + \brief The ReadyForInstallationPage class informs end users that the + installation can begin. +*/ + +/*! + Constructs a ready for installation page with \a core as parent. +*/ ReadyForInstallationPage::ReadyForInstallationPage(PackageManagerCore *core) : PackageManagerPage(core) , m_msgLabel(new QLabel) @@ -2014,9 +2530,10 @@ ReadyForInstallationPage::ReadyForInstallationPage(PackageManagerCore *core) setLayout(baseLayout); } - /*! - \reimp + Initializes the page's fields based on values from fields on previous + pages. The text to display depends on whether the page is being used in an + installer, updater, or uninstaller. */ void ReadyForInstallationPage::entering() { @@ -2189,6 +2706,10 @@ bool ReadyForInstallationPage::calculateComponents(QString *displayString) return true; } +/*! + Called when end users leave the page and the PackageManagerGui:currentPageChanged() + signal is triggered. +*/ void ReadyForInstallationPage::leaving() { setButtonText(QWizard::CommitButton, gui()->defaultButtonText(QWizard::CommitButton)); @@ -2200,6 +2721,26 @@ void ReadyForInstallationPage::leaving() \class QInstaller::PerformInstallationPage \inmodule QtInstallerFramework \brief The PerformInstallationPage class shows progress information about the installation state. + + This class is a container for the PerformInstallationForm class, which + constructs the actual UI for the page. +*/ + +/*! + \fn PerformInstallationPage::isInterruptible() const + + Returns \c true if the installation can be interrupted. +*/ + +/*! + \fn PerformInstallationPage::setAutomatedPageSwitchEnabled(bool request) + + Enables automatic switching of pages when \a request is \c true. +*/ + +/*! + Constructs a perform installation page with \a core as parent. The page + contains a PerformInstallationForm that defines the UI for the page. */ PerformInstallationPage::PerformInstallationPage(PackageManagerCore *core) : PackageManagerPage(core) @@ -2232,11 +2773,17 @@ PerformInstallationPage::PerformInstallationPage(PackageManagerCore *core) setCommitPage(true); } +/*! + Destructs a perform installation page. +*/ PerformInstallationPage::~PerformInstallationPage() { delete m_performInstallationForm; } +/*! + Returns \c true if automatically switching to the page is requested. +*/ bool PerformInstallationPage::isAutoSwitching() const { return !m_performInstallationForm->isShowingDetails(); @@ -2244,6 +2791,11 @@ bool PerformInstallationPage::isAutoSwitching() const // -- protected +/*! + Initializes the page's fields based on values from fields on previous + pages. The text to display depends on whether the page is being used in an + installer, updater, or uninstaller. +*/ void PerformInstallationPage::entering() { setComplete(false); @@ -2272,6 +2824,10 @@ void PerformInstallationPage::entering() m_performInstallationForm->toggleDetails(); } +/*! + Called when end users leave the page and the PackageManagerGui:currentPageChanged() + signal is triggered. +*/ void PerformInstallationPage::leaving() { setButtonText(QWizard::CommitButton, gui()->defaultButtonText(QWizard::CommitButton)); @@ -2279,6 +2835,9 @@ void PerformInstallationPage::leaving() // -- public slots +/*! + Sets \a title as the title of the perform installation page. +*/ void PerformInstallationPage::setTitleMessage(const QString &title) { setColoredTitle(title); @@ -2325,6 +2884,17 @@ void PerformInstallationPage::toggleDetailsWereChanged() // -- FinishedPage +/*! + \class QInstaller::FinishedPage + \inmodule QtInstallerFramework + \brief The FinishedPage class completes the installation wizard. + + You can add the option to open the installed application to the page. +*/ + +/*! + Constructs an installation finished page with \a core as parent. +*/ FinishedPage::FinishedPage(PackageManagerCore *core) : PackageManagerPage(core) , m_commitButton(0) @@ -2354,6 +2924,10 @@ FinishedPage::FinishedPage(PackageManagerCore *core) setCommitPage(true); } +/*! + Initializes the page's fields based on values from fields on previous + pages. +*/ void FinishedPage::entering() { if (m_commitButton) { @@ -2420,6 +2994,10 @@ void FinishedPage::entering() m_runItCheckBox->setChecked(false); } +/*! + Called when end users leave the page and the PackageManagerGui:currentPageChanged() + signal is triggered. +*/ void FinishedPage::leaving() { #ifdef Q_OS_OSX @@ -2434,6 +3012,10 @@ void FinishedPage::leaving() setButtonText(QWizard::CancelButton, gui()->defaultButtonText(QWizard::CancelButton)); } +/*! + Performs the necessary operations when end users select the \uicontrol Finish + button. +*/ void FinishedPage::handleFinishClicked() { const QString program = @@ -2448,6 +3030,9 @@ void FinishedPage::handleFinishClicked() QProcess::startDetached(program, args); } +/*! + Removes changed connects from the page. +*/ void FinishedPage::cleanupChangedConnects() { if (QAbstractButton *cancel = gui()->button(QWizard::CancelButton)) { @@ -2463,6 +3048,26 @@ void FinishedPage::cleanupChangedConnects() // -- RestartPage +/*! + \class QInstaller::RestartPage + \inmodule QtInstallerFramework + \brief The RestartPage class enables restarting the installer. + + The restart installation page enables end users to restart the wizard. + This is useful, for example, if the maintenance tool itself needs to be + updated before updating the application components. When updating is done, + end users can select \uicontrol Restart to start the maintenance tool. +*/ + +/*! + \fn RestartPage::restart() + + This signal is emitted when the installer is restarted. +*/ + +/*! + Constructs a restart installation page with \a core as parent. +*/ RestartPage::RestartPage(PackageManagerCore *core) : PackageManagerPage(core) { @@ -2472,11 +3077,18 @@ RestartPage::RestartPage(PackageManagerCore *core) setFinalPage(false); } +/*! + Returns the introduction page. +*/ int RestartPage::nextId() const { return PackageManagerCore::Introduction; } +/*! + Initializes the page's fields based on values from fields on previous + pages. +*/ void RestartPage::entering() { if (!packageManagerCore()->needsHardRestart()) { @@ -2488,6 +3100,10 @@ void RestartPage::entering() } } +/*! + Called when end users leave the page and the PackageManagerGui:currentPageChanged() + signal is triggered. +*/ void RestartPage::leaving() { } diff --git a/src/libs/installer/packagemanagergui.h b/src/libs/installer/packagemanagergui.h index 11848b806..7956075c5 100644 --- a/src/libs/installer/packagemanagergui.h +++ b/src/libs/installer/packagemanagergui.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/packagemanagerpagefactory.cpp b/src/libs/installer/packagemanagerpagefactory.cpp index 7c5a0558f..71b05b349 100644 --- a/src/libs/installer/packagemanagerpagefactory.cpp +++ b/src/libs/installer/packagemanagerpagefactory.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/packagemanagerpagefactory.h b/src/libs/installer/packagemanagerpagefactory.h index 38bae2d80..b7015ffe4 100644 --- a/src/libs/installer/packagemanagerpagefactory.h +++ b/src/libs/installer/packagemanagerpagefactory.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/packagemanagerproxyfactory.cpp b/src/libs/installer/packagemanagerproxyfactory.cpp index 317b3257f..15e18c889 100644 --- a/src/libs/installer/packagemanagerproxyfactory.cpp +++ b/src/libs/installer/packagemanagerproxyfactory.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/packagemanagerproxyfactory.h b/src/libs/installer/packagemanagerproxyfactory.h index 3d3439bd9..34b834807 100644 --- a/src/libs/installer/packagemanagerproxyfactory.h +++ b/src/libs/installer/packagemanagerproxyfactory.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/performinstallationform.cpp b/src/libs/installer/performinstallationform.cpp index 552c7ad0b..24d06d59f 100644 --- a/src/libs/installer/performinstallationform.cpp +++ b/src/libs/installer/performinstallationform.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -55,6 +55,31 @@ using namespace QInstaller; // -- PerformInstallationForm +/*! + \class QInstaller::PerformInstallationForm + \inmodule QtInstallerFramework + \brief The PerformInstallationForm class shows progress information about + the installation state. + + A progress bar indicates the progress of the installation, update, or + uninstallation. + + The page contains a button for showing or hiding detailed information + about the progress in an \e {details browser}. The text on the button + changes depending on whether the details browser is currently shown or + hidden. +*/ + +/*! + \fn PerformInstallationForm::showDetailsChanged() + + This signal is emitted when the end users select the details button to show + or hide progress details. +*/ + +/*! + Constructs the perform installation UI with \a parent as parent. +*/ PerformInstallationForm::PerformInstallationForm(QObject *parent) : QObject(parent) , m_progressBar(0) @@ -69,6 +94,9 @@ PerformInstallationForm::PerformInstallationForm(QObject *parent) #endif } +/*! + Sets up the perform installation UI specified by \a widget. +*/ void PerformInstallationForm::setupUi(QWidget *widget) { QVBoxLayout *baseLayout = new QVBoxLayout(widget); @@ -122,16 +150,26 @@ void PerformInstallationForm::setupUi(QWidget *widget) m_progressBar->setRange(0, 100); } +/*! + Shows the details button if \a visible is \c true. +*/ void PerformInstallationForm::setDetailsWidgetVisible(bool visible) { m_detailsButton->setVisible(visible); } +/*! + Displays \a details about progress of the installation in the details + browser. +*/ void PerformInstallationForm::appendProgressDetails(const QString &details) { m_detailsBrowser->append(details); } +/*! + Updates the progress of the installation on the progress bar. +*/ void PerformInstallationForm::updateProgress() { QInstaller::ProgressCoordinator *progressCoordninator = QInstaller::ProgressCoordinator::instance(); @@ -151,7 +189,11 @@ void PerformInstallationForm::updateProgress() m_progressLabel->setText(m_progressLabel->fontMetrics().elidedText(progressCoordninator->labelText(), Qt::ElideRight, m_progressLabel->width())); } - +/*! + Sets the text of the details button to \uicontrol {Hide Details} or + \uicontrol {Show Details} depending on whether the details are currently + shown or hidden. Emits the showDetailsChanged() signal. +*/ void PerformInstallationForm::toggleDetails() { const bool willShow = !isShowingDetails(); @@ -160,11 +202,18 @@ void PerformInstallationForm::toggleDetails() emit showDetailsChanged(); } +/*! + Clears the contents of the details browser. +*/ void PerformInstallationForm::clearDetailsBrowser() { m_detailsBrowser->clear(); } +/*! + Enables the details button with the text \uicontrol {Show Details} and hides + the details browser. +*/ void PerformInstallationForm::enableDetails() { m_detailsButton->setEnabled(true); @@ -172,33 +221,52 @@ void PerformInstallationForm::enableDetails() m_detailsBrowser->setVisible(false); } +/*! + Starts the update progress timer. +*/ void PerformInstallationForm::startUpdateProgress() { m_updateTimer->start(); updateProgress(); } +/*! + Stops the update progress timer. +*/ void PerformInstallationForm::stopUpdateProgress() { m_updateTimer->stop(); updateProgress(); } +/*! + Enables the details button if \a enable is \c true. +*/ void PerformInstallationForm::setDetailsButtonEnabled(bool enable) { m_detailsButton->setEnabled(enable); } +/*! + Scrolls to the bottom of the details browser. +*/ void PerformInstallationForm::scrollDetailsToTheEnd() { m_detailsBrowser->updateCursor(LazyPlainTextEdit::TextCursorPosition::ForceEnd); } +/*! + Returns \c true if the details browser is visible. +*/ bool PerformInstallationForm::isShowingDetails() const { return m_detailsBrowser->isVisible(); } +/*! + Changes the label text according to the changes in the download status + specified by \a status. +*/ void PerformInstallationForm::onDownloadStatusChanged(const QString &status) { m_downloadStatus->setText(m_downloadStatus->fontMetrics().elidedText(status, Qt::ElideRight, diff --git a/src/libs/installer/performinstallationform.h b/src/libs/installer/performinstallationform.h index 4c9f75e4f..2d97d0cbc 100644 --- a/src/libs/installer/performinstallationform.h +++ b/src/libs/installer/performinstallationform.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/permissionsettings.cpp b/src/libs/installer/permissionsettings.cpp new file mode 100644 index 000000000..fb931044e --- /dev/null +++ b/src/libs/installer/permissionsettings.cpp @@ -0,0 +1,48 @@ +/************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** 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 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ +#include "permissionsettings.h" + +#include <QFile> + +using namespace QInstaller; + +PermissionSettings::~PermissionSettings() +{ + if (!fileName().isEmpty()) { + sync(); + QFile file(fileName()); + file.setPermissions(file.permissions() | QFile::ReadGroup | QFile::ReadOther); + } +} + diff --git a/src/libs/installer/permissionsettings.h b/src/libs/installer/permissionsettings.h new file mode 100644 index 000000000..73e639a11 --- /dev/null +++ b/src/libs/installer/permissionsettings.h @@ -0,0 +1,61 @@ +/************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** 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 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ + +#ifndef PERMISSIONSETTINGS_H +#define PERMISSIONSETTINGS_H + +#include <QSettings> + +namespace QInstaller { + +class PermissionSettings : public QSettings +{ +public: + explicit PermissionSettings(const QString &organization, + const QString &application = QString(), QObject *parent = 0) + : QSettings(organization, application, parent) {} + PermissionSettings(Scope scope, const QString &organization, + const QString &application = QString(), QObject *parent = 0) + : QSettings(scope, organization, application, parent) {} + PermissionSettings(Format format, Scope scope, const QString &organization, + const QString &application = QString(), QObject *parent = 0) + : QSettings(format, scope, organization, application, parent) {} + PermissionSettings(const QString &fileName, Format format, QObject *parent = 0) + : QSettings(fileName, format, parent) {} + ~PermissionSettings(); +}; + +} + +#endif // PERMISSIONSETTINGS_H diff --git a/src/libs/installer/productkeycheck.cpp b/src/libs/installer/productkeycheck.cpp index 5d663d6bd..4a0adca41 100644 --- a/src/libs/installer/productkeycheck.cpp +++ b/src/libs/installer/productkeycheck.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/productkeycheck.h b/src/libs/installer/productkeycheck.h index 94bc4fa60..3e26ce293 100644 --- a/src/libs/installer/productkeycheck.h +++ b/src/libs/installer/productkeycheck.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/progresscoordinator.cpp b/src/libs/installer/progresscoordinator.cpp index 8fa205376..537285fcd 100644 --- a/src/libs/installer/progresscoordinator.cpp +++ b/src/libs/installer/progresscoordinator.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/progresscoordinator.h b/src/libs/installer/progresscoordinator.h index e50a11017..678dc4cbc 100644 --- a/src/libs/installer/progresscoordinator.h +++ b/src/libs/installer/progresscoordinator.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/protocol.cpp b/src/libs/installer/protocol.cpp new file mode 100644 index 000000000..879d40297 --- /dev/null +++ b/src/libs/installer/protocol.cpp @@ -0,0 +1,98 @@ +/************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** 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 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ + +#include "protocol.h" +#include <QIODevice> + +namespace QInstaller { + +typedef qint32 PackageSize; + +/*! + Write a packet containing \a command and \data to \a device. + + \note Both client and server need to have the same endianness. + */ +void sendPacket(QIODevice *device, const QByteArray &command, const QByteArray &data) +{ + // use aliasing for writing payload size into bytes + char payloadBytes[sizeof(PackageSize)]; + PackageSize *payloadSize = reinterpret_cast<PackageSize*>(&payloadBytes); + *payloadSize = command.size() + sizeof(char) + data.size(); + + QByteArray packet; + packet.reserve(sizeof(PackageSize) + *payloadSize); + packet.append(payloadBytes, sizeof(PackageSize)); + packet.append(command); + packet.append('\0'); + packet.append(data); + + qint64 written = device->write(packet); + Q_ASSERT(written == packet.size()); // we assume we can write it all at once + Q_UNUSED(written); +} + +/*! + Reads a packet from \a device, and stores its content into \a command and \a data. + + Returns \c false if the packet in the device buffer is yet incomplete, \c true otherwise. + + \note Both client and server need to have the same endianness. + */ +bool receivePacket(QIODevice *device, QByteArray *command, QByteArray *data) +{ + if (device->bytesAvailable() < static_cast<qint64>(sizeof(PackageSize))) + return false; + + // read payload size + char payloadBytes[sizeof(PackageSize)]; + PackageSize *payloadSize = reinterpret_cast<PackageSize*>(&payloadBytes); + device->read(payloadBytes, sizeof(PackageSize)); + + // not enough data yet? back off ... + if (device->bytesAvailable() < *payloadSize) { + for (int i = sizeof(PackageSize) - 1; i >= 0; --i) + device->ungetChar(payloadBytes[i]); + return false; + } + + const QByteArray payload = device->read(*payloadSize); + int separator = payload.indexOf('\0'); + + *command = payload.left(separator); + *data = payload.right(payload.size() - separator - 1); + return true; +} + +} // namespace QInstaller diff --git a/src/libs/installer/protocol.h b/src/libs/installer/protocol.h index a4e58774f..9e7afdcae 100644 --- a/src/libs/installer/protocol.h +++ b/src/libs/installer/protocol.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -35,6 +35,10 @@ #ifndef PROTOCOL_H #define PROTOCOL_H +#include "installer_global.h" + +QT_FORWARD_DECLARE_CLASS(QIODevice) + namespace QInstaller { namespace Protocol { @@ -50,14 +54,14 @@ enum struct StartAs { SuperUser }; -const unsigned short DefaultPort = 39999; -const char DefaultHostAddress[] = "127.0.0.1"; +const char DefaultSocket[] = "ifw_srv"; const char DefaultAuthorizationKey[] = "DefaultAuthorizationKey"; const char Create[] = "Create"; const char Destroy[] = "Destroy"; const char Shutdown[] = "Shutdown"; const char Authorize[] = "Authorize"; +const char Reply[] = "Reply"; // QProcessWrapper const char QProcess[] = "QProcess"; @@ -166,6 +170,10 @@ const char QAbstractFileEngineRenameOverwrite[] = "QAbstractFileEngine::renameOv const char QAbstractFileEngineFileTime[] = "QAbstractFileEngine::fileTime"; } // namespace Protocol + +void INSTALLER_EXPORT sendPacket(QIODevice *device, const QByteArray &command, const QByteArray &data); +bool INSTALLER_EXPORT receivePacket(QIODevice *device, QByteArray *command, QByteArray *data); + } // namespace QInstaller #endif // PROTOCOL_H diff --git a/src/libs/installer/proxycredentialsdialog.cpp b/src/libs/installer/proxycredentialsdialog.cpp index 689849e48..ce8c9a88b 100644 --- a/src/libs/installer/proxycredentialsdialog.cpp +++ b/src/libs/installer/proxycredentialsdialog.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/proxycredentialsdialog.h b/src/libs/installer/proxycredentialsdialog.h index 5d5d4583e..1a28fd1a2 100644 --- a/src/libs/installer/proxycredentialsdialog.h +++ b/src/libs/installer/proxycredentialsdialog.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/qinstallerglobal.h b/src/libs/installer/qinstallerglobal.h index 72b84fffc..5fb093eac 100644 --- a/src/libs/installer/qinstallerglobal.h +++ b/src/libs/installer/qinstallerglobal.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/qprocesswrapper.cpp b/src/libs/installer/qprocesswrapper.cpp index 5781ee14e..81c074752 100644 --- a/src/libs/installer/qprocesswrapper.cpp +++ b/src/libs/installer/qprocesswrapper.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/qprocesswrapper.h b/src/libs/installer/qprocesswrapper.h index d69b6899b..a3efecdf1 100644 --- a/src/libs/installer/qprocesswrapper.h +++ b/src/libs/installer/qprocesswrapper.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/qsettingswrapper.cpp b/src/libs/installer/qsettingswrapper.cpp index 1f19ad1e0..5b7cea61a 100644 --- a/src/libs/installer/qsettingswrapper.cpp +++ b/src/libs/installer/qsettingswrapper.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -33,8 +33,8 @@ **************************************************************************/ #include "qsettingswrapper.h" +#include "permissionsettings.h" -#include <QSettings> #include <QStringList> namespace QInstaller { @@ -88,7 +88,7 @@ public: QString m_organization; QSettings::Scope m_scope; QSettings::Format m_format; - QSettings settings; + PermissionSettings settings; }; @@ -318,8 +318,8 @@ QVariant QSettingsWrapper::value(const QString ¶m1, const QVariant ¶m2) bool QSettingsWrapper::createSocket() const { if ((d->m_format != QSettings::NativeFormat) && (d->m_format != QSettings::IniFormat)) { - Q_ASSERT_X(false, Q_FUNC_INFO, "Settings wrapper does not support any different format " - "then QSettingsWrapper::NativeFormat and QSettingsWrapper::IniFormat."); + Q_ASSERT_X(false, Q_FUNC_INFO, "Settings wrapper only supports QSettingsWrapper::NativeFormat" + " and QSettingsWrapper::IniFormat."); } return (const_cast<QSettingsWrapper *>(this))->connectToServer(QVariantList() << d->m_application << d->m_organization << d->m_scope << d->m_format << d->m_filename); diff --git a/src/libs/installer/qsettingswrapper.h b/src/libs/installer/qsettingswrapper.h index 1e3650053..cd4332da0 100644 --- a/src/libs/installer/qsettingswrapper.h +++ b/src/libs/installer/qsettingswrapper.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/qtpatch.cpp b/src/libs/installer/qtpatch.cpp index b324cad44..963865c7b 100644 --- a/src/libs/installer/qtpatch.cpp +++ b/src/libs/installer/qtpatch.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/qtpatch.h b/src/libs/installer/qtpatch.h index 71c7bbcca..90192ce87 100644 --- a/src/libs/installer/qtpatch.h +++ b/src/libs/installer/qtpatch.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp deleted file mode 100644 index 0342d8bec..000000000 --- a/src/libs/installer/qtpatchoperation.cpp +++ /dev/null @@ -1,530 +0,0 @@ -/************************************************************************** -** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Installer Framework. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** 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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** -** $QT_END_LICENSE$ -** -**************************************************************************/ - -#include "qtpatchoperation.h" -#include "qtpatch.h" -#ifdef Q_OS_OSX -#include "macreplaceinstallnamesoperation.h" -#endif - -#include "packagemanagercore.h" - -#include <QSet> -#include <QFile> -#include <QTextStream> -#include <QDir> -#include <QDirIterator> -#include <QtCore/QDebug> - -using namespace QInstaller; - -static QHash<QByteArray, QByteArray> generatePatchValueHash(const QByteArray &newQtPath, - const QHash<QString, QByteArray> &qmakeValueHash, const QString &type) -{ - QHash<QByteArray, QByteArray> replaceHash; //first == searchstring: second == replace string - char nativeSeperator = QDir::separator().toLatin1(); - QByteArray oldValue; - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_PREFIX")); - replaceHash.insert(QByteArray("qt_prfxpath=%1").replace("%1", oldValue), - QByteArray("qt_prfxpath=%1/").replace("%1/", newQtPath)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_ARCHDATA")); - replaceHash.insert(QByteArray("qt_adatpath=%1").replace("%1", oldValue), - QByteArray("qt_adatpath=%1/").replace("%1/", newQtPath)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_DOCS")); - replaceHash.insert(QByteArray("qt_docspath=%1").replace("%1", oldValue), - QByteArray("qt_docspath=%1/doc").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_HEADERS")); - replaceHash.insert(QByteArray("qt_hdrspath=%1").replace("%1", oldValue), - QByteArray("qt_hdrspath=%1/include").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_LIBS")); - replaceHash.insert(QByteArray("qt_libspath=%1").replace("%1", oldValue), - QByteArray("qt_libspath=%1/lib").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_LIBEXECS")); - if (type == QLatin1String("windows")) { - replaceHash.insert(QByteArray("qt_lbexpath=%1").replace("%1", oldValue), - QByteArray("qt_lbexpath=%1/bin").replace("%1/", - newQtPath + nativeSeperator)); - } else { - replaceHash.insert(QByteArray("qt_lbexpath=%1").replace("%1", oldValue), - QByteArray("qt_lbexpath=%1/libexec").replace("%1/", - newQtPath + nativeSeperator)); - } - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_BINS")); - replaceHash.insert(QByteArray("qt_binspath=%1").replace("%1", oldValue), - QByteArray("qt_binspath=%1/bin").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_PLUGINS")); - replaceHash.insert(QByteArray("qt_plugpath=%1").replace("%1", oldValue), - QByteArray("qt_plugpath=%1/plugins").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_IMPORTS")); - replaceHash.insert(QByteArray("qt_impspath=%1").replace("%1", oldValue), - QByteArray("qt_impspath=%1/imports").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_QML")); - replaceHash.insert(QByteArray("qt_qml2path=%1").replace("%1", oldValue), - QByteArray("qt_qml2path=%1/qml").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_DATA")); - replaceHash.insert( QByteArray("qt_datapath=%1").replace("%1", oldValue), - QByteArray("qt_datapath=%1/").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_TRANSLATIONS")); - replaceHash.insert( QByteArray("qt_trnspath=%1").replace("%1", oldValue), - QByteArray("qt_trnspath=%1/translations").replace("%1/", newQtPath + nativeSeperator)); - - // This must not be patched! - // On desktop there should be a correct default path (for example "/etc/xdg"), - // but on some other targets you need to use "-sysconfdir </your/default/config/path" - // while building Qt to get a correct QT_INSTALL_CONFIGURATION value - // oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_CONFIGURATION")); - // replaceMap.insert( QByteArray("qt_stngpath=%1").replace("%1", oldValue), - // QByteArray("qt_stngpath=%1").replace("%1", newQtPath)); - - //examples and demos can patched outside separately, - //but for cosmetic reasons - if the qt version gets no examples later. - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_EXAMPLES")); - replaceHash.insert( QByteArray("qt_xmplpath=%1").replace("%1", oldValue), - QByteArray("qt_xmplpath=%1/examples").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_DEMOS")); - replaceHash.insert( QByteArray("qt_demopath=%1").replace("%1", oldValue), - QByteArray("qt_demopath=%1/demos").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_TESTS")); - replaceHash.insert(QByteArray("qt_tstspath=%1").replace("%1", oldValue), - QByteArray("qt_tstspath=%1/tests").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_HOST_PREFIX")); - replaceHash.insert(QByteArray("qt_hpfxpath=%1").replace("%1", oldValue), - QByteArray("qt_hpfxpath=%1/").replace("%1/", newQtPath)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_HOST_BINS")); - replaceHash.insert( QByteArray("qt_hbinpath=%1").replace("%1", oldValue), - QByteArray("qt_hbinpath=%1/bin").replace("%1/", newQtPath + nativeSeperator)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_HOST_DATA")); - replaceHash.insert(QByteArray("qt_hdatpath=%1").replace("%1", oldValue), - QByteArray("qt_hdatpath=%1/").replace("%1/", newQtPath)); - - oldValue = qmakeValueHash.value(QLatin1String("QT_HOST_LIBS")); - replaceHash.insert(QByteArray("qt_hlibpath=%1").replace("%1", oldValue), - QByteArray("qt_hlibpath=%1/lib").replace("%1/", newQtPath + nativeSeperator)); - - return replaceHash; -} - -QtPatchOperation::QtPatchOperation() -{ - setName(QLatin1String("QtPatch")); -} - -void QtPatchOperation::backup() -{ -} - -bool QtPatchOperation::performOperation() -{ - // Arguments: - // 1. type - // 2. new/target qtpath - // 3. version if greather Qt4 - // optional QmakeOutputInstallerKey=<used_installer_value> - - // the possible 2 argument case is here to support old syntax - if (arguments().count() < 2 && arguments().count() > 4) { - setError(InvalidArguments); - setErrorString(tr("Invalid arguments in %0: %1 arguments given, %2 expected%3.") - .arg(name()).arg(arguments().count()).arg(tr("3 or 4"), QLatin1String(""))); - return false; - } - - QStringList args = arguments(); - QString qmakeOutputInstallerKey; - QStringList filteredQmakeOutputInstallerKey = args.filter(QLatin1String("QmakeOutputInstallerKey="), - Qt::CaseInsensitive); - PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>(); - if (!filteredQmakeOutputInstallerKey.isEmpty()) { - if (!core) { - setError(UserDefinedError); - setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); - return false; - } - QString qmakeOutputInstallerKeyArgument = filteredQmakeOutputInstallerKey.at(0); - qmakeOutputInstallerKey = qmakeOutputInstallerKeyArgument; - qmakeOutputInstallerKey.replace(QLatin1String("QmakeOutputInstallerKey="), QString(), Qt::CaseInsensitive); - args.removeAll(qmakeOutputInstallerKeyArgument); - } - - QString type = args.at(0); - bool isPlatformSupported = type.contains(QLatin1String("linux"), Qt::CaseInsensitive) - || type.contains(QLatin1String("windows"), Qt::CaseInsensitive) - || type.contains(QLatin1String("mac"), Qt::CaseInsensitive); - if (!isPlatformSupported) { - setError(InvalidArguments); - setErrorString(tr("First argument should be 'linux', 'mac' or 'windows'. No other type is supported " - "at this time.")); - return false; - } - - if (core && !filteredQmakeOutputInstallerKey.isEmpty() && core->value(qmakeOutputInstallerKey).isEmpty()) { - setError(UserDefinedError); - setErrorString(tr("Could not find the needed QmakeOutputInstallerKey(%1) value on the installer " - "object. The ConsumeOutput operation on the valid qmake needs to be called first.").arg( - qmakeOutputInstallerKey)); - return false; - } - - const QString newQtPathStr = QDir::toNativeSeparators(args.at(1)); - const QByteArray newQtPath = newQtPathStr.toUtf8(); - QString qmakePath = QString::fromUtf8(newQtPath) + QLatin1String("/bin/qmake"); -#ifdef Q_OS_WIN - qmakePath = qmakePath + QLatin1String(".exe"); -#endif - - QHash<QString, QByteArray> qmakeValueHash; - if (core && !core->value(qmakeOutputInstallerKey).isEmpty()) { - qmakeValueHash = QtPatch::readQmakeOutput(core->value(qmakeOutputInstallerKey).toLatin1()); - } else { - if (!QFile::exists(qmakePath)) { - setError(UserDefinedError); - setErrorString(tr("QMake from the current Qt version \n(%1)is not existing. Please file a bugreport " - "with this dialog at https://bugreports.qt-project.org.").arg(QDir::toNativeSeparators(qmakePath))); - return false; - } - QByteArray qmakeOutput; - qmakeValueHash = QtPatch::qmakeValues(qmakePath, &qmakeOutput); - if (qmakeValueHash.isEmpty()) { - setError(UserDefinedError); - setErrorString(tr("The output of \n%1 -query\nis not parseable. Please file a bugreport with this " - "dialog https://bugreports.qt-project.org.\noutput: \"%2\"").arg(QDir::toNativeSeparators(qmakePath), - QString::fromUtf8(qmakeOutput))); - return false; - } - } - - - const QByteArray oldQtPath = qmakeValueHash.value(QLatin1String("QT_INSTALL_PREFIX")); - bool oldQtPathFromQMakeIsEmpty = oldQtPath.isEmpty(); - - //maybe we don't need this, but I 255 should be a rational limit - if (255 < newQtPath.size()) { - setError(UserDefinedError); - setErrorString(tr("Qt patch error: new Qt dir(%1)\nneeds to be less than 255 characters.") - .arg(newQtPathStr)); - return false; - } - -#ifdef Q_OS_OSX - // looking for /lib/Qt wasn't enough for all libs and frameworks, - // at the Qt4 case we had for example: /lib/libQtCLucene* and /lib/phonon* - // so now we find every possible replace string inside dynlib dependencies - // and we reduce it to few as possible search strings - QStringList possibleSearchStringList; - QDirIterator dirIterator(newQtPathStr + QLatin1String("/lib/")); - while (dirIterator.hasNext()) { - const QString possibleSearchString = QString(dirIterator.next()).remove(newQtPathStr); - const QFileInfo fileInfo = dirIterator.fileInfo(); - if (fileInfo.isSymLink()) - continue; - if (fileInfo.isDir()) { - if (possibleSearchString.endsWith(QLatin1String(".framework"))) - possibleSearchStringList.append(possibleSearchString); - else - continue; - } - if (possibleSearchString.endsWith(QLatin1String(".dylib"))) - possibleSearchStringList.append(possibleSearchString); - } - - // now we have this in possibleSearchStringList at Qt 4.8.6 -// "/lib/libQtCLucene.4.8.6.dylib" -// "/lib/libQtCLucene_debug.4.8.6.dylib" -// "/lib/phonon.framework" -// "/lib/QtCore.framework" -// "/lib/QtDeclarative.framework" -// "/lib/QtDesigner.framework" -// "/lib/QtDesignerComponents.framework" -// "/lib/QtGui.framework" -// "/lib/QtHelp.framework" -// "/lib/QtMultimedia.framework" -// "/lib/QtNetwork.framework" -// "/lib/QtOpenGL.framework" -// "/lib/QtScript.framework" -// "/lib/QtScriptTools.framework" -// "/lib/QtSql.framework" -// "/lib/QtSvg.framework" -// "/lib/QtTest.framework" -// "/lib/QtWebKit.framework" -// "/lib/QtXml.framework" -// "/lib/QtXmlPatterns.framework" - - // so then we reduce the possible filter strings as much as possible - QStringList searchStringList; - - // as the minimal search string use the subdirector lib + one letter from the name - int minFilterLength = QString(QLatin1String("/lib/")).length() + 1; - - while (!possibleSearchStringList.isEmpty()) { - QString firstSearchString = possibleSearchStringList.first(); - int filterLength = minFilterLength; - int lastFilterCount = 0; - QString lastFilterString; - // now filter as long as we find something more then 1 - for (; filterLength < firstSearchString.length(); ++filterLength) { - QString filterString(firstSearchString.left(filterLength)); - QStringList filteredStringList(possibleSearchStringList.filter(filterString)); - // found a valid filter - if (lastFilterCount > filteredStringList.count()) { - possibleSearchStringList = QList<QString>::fromSet(possibleSearchStringList.toSet() - - possibleSearchStringList.filter(lastFilterString).toSet()); - searchStringList.append(lastFilterString); - break; - } else if (lastFilterCount == 1){ //in case there is only one we can use the complete name - possibleSearchStringList = QList<QString>::fromSet(possibleSearchStringList.toSet() - - possibleSearchStringList.filter(firstSearchString).toSet()); - searchStringList.append(firstSearchString); - break; - } else { - lastFilterCount = possibleSearchStringList.filter(filterString).count(); - lastFilterString = filterString; - } - } - } - - // in the tested Qt 4.8.6 case we have searchStringList ("/lib/libQtCLucene", "/lib/Qt", "/lib/phonon") - foreach (const QString &searchString, searchStringList) { - MacReplaceInstallNamesOperation operation; - operation.setArguments(QStringList() - //can not use the old path which is wrong in the webkit case - //<< QString::fromUtf8(oldQtPath) - << searchString - << newQtPathStr + searchString //replace string - << newQtPathStr //where - ); - if (!operation.performOperation()) { - setError(operation.error()); - setErrorString(operation.errorString()); - return false; - } - } -#endif - - QString fileName; - if (type == QLatin1String("windows")) - fileName = QString::fromLatin1(":/files-to-patch-windows"); - else if (type == QLatin1String("linux")) - fileName = QString::fromLatin1(":/files-to-patch-linux"); - else if (type == QLatin1String("mac")) - fileName = QString::fromLatin1(":/files-to-patch-macx"); - - QFile patchFileListFile(fileName); - QString version = args.value(2).toLower(); - if (!version.isEmpty()) - patchFileListFile.setFileName(fileName + QLatin1Char('-') + version); - - if (!patchFileListFile.open(QFile::ReadOnly)) { - setError(UserDefinedError); - setErrorString(tr("Qt patch error: Can not open %1.(%2)").arg(patchFileListFile.fileName(), - patchFileListFile.errorString())); - return false; - } - - QStringList filters; - QStringList filesToPatch, textFilesToPatch; - bool readingTextFilesToPatch = false; - - // read the input file - QTextStream in(&patchFileListFile); - - forever { - const QString line = in.readLine(); - - if (line.isNull()) - break; - - else if (line.isEmpty()) - continue; - - else if (line.startsWith(QLatin1String("%%"))) - readingTextFilesToPatch = true; - - //with empty old path we don't know what we want to replace - else if (readingTextFilesToPatch && !oldQtPathFromQMakeIsEmpty) { - // check if file mask filter - if (line.startsWith(QLatin1String("*."), Qt::CaseInsensitive)) { - filters << line; - } - textFilesToPatch.append(line); - } - else - filesToPatch.append(line); - } - - QString prefix = QFile::decodeName(newQtPath); - - if (! prefix.endsWith(QLatin1Char('/'))) - prefix += QLatin1Char('/'); - -//BEGIN - patch binary files - QHash<QByteArray, QByteArray> patchValueHash = generatePatchValueHash(newQtPath, qmakeValueHash, type); - - foreach (QString fileName, filesToPatch) { - fileName.prepend(prefix); - QFile file(fileName); - - //without a file we can't do anything - if (!file.exists()) { - continue; - } - - if (!QtPatch::openFileForPatching(&file)) { - setError(UserDefinedError); - setErrorString(tr("Qt patch error: Can not open %1.(%2)").arg(file.fileName()) - .arg(file.errorString())); - return false; - } - - QHashIterator<QByteArray, QByteArray> it(patchValueHash); - while (it.hasNext()) { - it.next(); - bool isPatched = QtPatch::patchBinaryFile(&file, it.key(), it.value()); - if (!isPatched) { - qDebug() << QString::fromLatin1("qpatch: warning: file '%1' could not patched").arg(fileName); - } - } - } //foreach (QString fileName, filesToPatch) -//END - patch binary files - -//BEGIN - patch text files - QByteArray newQtPathWithNormalSlashes = QDir::fromNativeSeparators(newQtPathStr).toUtf8(); - - QHash<QByteArray, QByteArray> searchReplacePairs; - searchReplacePairs.insert(oldQtPath, newQtPathWithNormalSlashes); - searchReplacePairs.insert(QByteArray(oldQtPath).replace("/", "\\"), newQtPathWithNormalSlashes); - searchReplacePairs.insert(QByteArray(oldQtPath).replace("\\", "/"), newQtPathWithNormalSlashes); - -#ifdef Q_OS_WIN - QByteArray newQtPathWithDoubleBackSlashes = QByteArray(newQtPathWithNormalSlashes).replace("/", "\\\\"); - searchReplacePairs.insert(QByteArray(oldQtPath).replace("/", "\\\\"), newQtPathWithDoubleBackSlashes); - searchReplacePairs.insert(QByteArray(oldQtPath).replace("\\", "\\\\"), newQtPathWithDoubleBackSlashes); - - //this is checking for a possible drive letter, which could be upper or lower - if (oldQtPath.mid(1,1) == ":") { - QHash<QByteArray, QByteArray> tempSearchReplacePairs; - QHashIterator<QByteArray, QByteArray> it(searchReplacePairs); - QByteArray driveLetter = oldQtPath.left(1); - while (it.hasNext()) { - it.next(); - QByteArray currentPossibleSearchByteArrayWithoutDriveLetter = QByteArray(it.key()).remove(0, 1); - tempSearchReplacePairs.insert(driveLetter.toLower() - + currentPossibleSearchByteArrayWithoutDriveLetter, it.value()); - tempSearchReplacePairs.insert(driveLetter.toUpper() - + currentPossibleSearchByteArrayWithoutDriveLetter, it.value()); - } - searchReplacePairs = tempSearchReplacePairs; - } -#endif - - // get file list defined by filters and patch them - if (filters.count() > 0) { - const QStringList filteredContent = getDirContent(prefix, filters); - foreach (const QString &fileName, filteredContent) { - if (QFile::exists(fileName)) { - QtPatch::patchTextFile(fileName, searchReplacePairs); - } - } - } - - // patch single items - foreach (QString fileName, textFilesToPatch) { - fileName.prepend(prefix); - - if (QFile::exists(fileName)) { - //TODO: use the return value for an error message at the end of the operation - QtPatch::patchTextFile(fileName, searchReplacePairs); - } - } -//END - patch text files - - if (oldQtPathFromQMakeIsEmpty) { - setError(UserDefinedError); - setErrorString(tr("The installer was not able to get the unpatched path from \n%1.(maybe it is " - "broken or removed)\nIt tried to patch the Qt binaries, but all other files in Qt are unpatched." - "\nThis could result in a broken Qt version.\nSometimes it helps to restart the installer with a " - "switched off antivirus software.").arg(QDir::toNativeSeparators(qmakePath))); - return false; - } - - return true; -} - -QStringList QtPatchOperation::getDirContent(const QString& aPath, QStringList aFilters) -{ - QStringList list; - QDirIterator dirIterator(aPath, aFilters, QDir::AllDirs|QDir::Files|QDir::NoSymLinks, - QDirIterator::Subdirectories); - while (dirIterator.hasNext()) { - dirIterator.next(); - if (!dirIterator.fileInfo().isDir()) { - list.append(dirIterator.fileInfo().absoluteFilePath()); - qDebug() << QString::fromLatin1("QtPatchOperation::getDirContent match: '%1'").arg(dirIterator.fileInfo().absoluteFilePath()); - } - } - - return list; -} - -bool QtPatchOperation::undoOperation() -{ - return true; -} - -bool QtPatchOperation::testOperation() -{ - return true; -} - -Operation *QtPatchOperation::clone() const -{ - return new QtPatchOperation(); -} - diff --git a/src/libs/installer/range.h b/src/libs/installer/range.h index 439bd69a7..483dd6b6f 100644 --- a/src/libs/installer/range.h +++ b/src/libs/installer/range.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/registerfiletypeoperation.cpp b/src/libs/installer/registerfiletypeoperation.cpp index 32f2c6c62..0f74330f1 100644 --- a/src/libs/installer/registerfiletypeoperation.cpp +++ b/src/libs/installer/registerfiletypeoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/registerfiletypeoperation.h b/src/libs/installer/registerfiletypeoperation.h index 430f4e1df..7c0220d29 100644 --- a/src/libs/installer/registerfiletypeoperation.h +++ b/src/libs/installer/registerfiletypeoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/remoteclient.cpp b/src/libs/installer/remoteclient.cpp index 1c518ed16..12cec0efa 100644 --- a/src/libs/installer/remoteclient.cpp +++ b/src/libs/installer/remoteclient.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -52,16 +52,10 @@ RemoteClient &RemoteClient::instance() return instance; } -quint16 RemoteClient::port() const +QString RemoteClient::socketName() const { Q_D(const RemoteClient); - return d->m_port; -} - -QString RemoteClient::address() const -{ - Q_D(const RemoteClient); - return d->m_address; + return d->m_socketName; } QString RemoteClient::authorizationKey() const @@ -71,14 +65,14 @@ QString RemoteClient::authorizationKey() const } /*! - Initializes the client with \a port, the port to write to, with \a key, the key the client + Initializes the client with \a socketName, with the \a key the client sends to authenticate with the server, \a mode and \a startAs. */ -void RemoteClient::init(quint16 port, const QString &key, Protocol::Mode mode, +void RemoteClient::init(const QString &socketName, const QString &key, Protocol::Mode mode, Protocol::StartAs startAs) { Q_D(RemoteClient); - d->init(port, key, mode, startAs); + d->init(socketName, key, mode, startAs); } void RemoteClient::shutdown() diff --git a/src/libs/installer/remoteclient.h b/src/libs/installer/remoteclient.h index f2c268626..c517f3107 100644 --- a/src/libs/installer/remoteclient.h +++ b/src/libs/installer/remoteclient.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -51,13 +51,12 @@ class INSTALLER_EXPORT RemoteClient public: static RemoteClient &instance(); - void init(quint16 port, const QString &key, Protocol::Mode mode, Protocol::StartAs startAs); + void init(const QString &socketName, const QString &key, Protocol::Mode mode, + Protocol::StartAs startAs); void shutdown(); - void init(quint16 port, const QString &address, Protocol::Mode mode); - quint16 port() const; - QString address() const; + QString socketName() const; QString authorizationKey() const; bool isActive() const; diff --git a/src/libs/installer/remoteclient_p.h b/src/libs/installer/remoteclient_p.h index 103b60d08..aed18d56e 100644 --- a/src/libs/installer/remoteclient_p.h +++ b/src/libs/installer/remoteclient_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -60,8 +60,6 @@ public: : RemoteObject(QLatin1String("RemoteClientPrivate")) , q_ptr(parent) , m_mutex(QMutex::Recursive) - , m_address(QLatin1String(Protocol::DefaultHostAddress)) - , m_port(Protocol::DefaultPort) , m_startServerAs(Protocol::StartAs::User) , m_serverStarted(false) , m_active(false) @@ -69,6 +67,7 @@ public: , m_mode(Protocol::Mode::Debug) , m_object(0) { + m_thread.setObjectName(QLatin1String("KeepAlive")); } ~RemoteClientPrivate() @@ -87,19 +86,19 @@ public: maybeStopServer(); } - void init(quint16 port, const QString &key, Protocol::Mode mode, Protocol::StartAs startAs) + void init(const QString &socketName, const QString &key, Protocol::Mode mode, + Protocol::StartAs startAs) { + m_socketName = socketName; + m_key = key; m_mode = mode; if (mode == Protocol::Mode::Production) { - m_key = key; - m_port = port; - m_mode = mode; m_startServerAs = startAs; m_serverCommand = QCoreApplication::applicationFilePath(); m_serverArguments = QStringList() << QLatin1String("--startserver") << QString::fromLatin1("%1,%2,%3") .arg(QLatin1String(Protocol::ModeProduction)) - .arg(port) + .arg(socketName) .arg(key); if (!m_object) { @@ -113,7 +112,7 @@ public: } } else if (mode == Protocol::Mode::Debug) { // To be able to debug the client-server connection start and stop the server manually, - // e.g. installer --startserver debug. The server is listening on localhost:39999 then. + // e.g. installer --startserver DEBUG. } } @@ -186,8 +185,7 @@ public: private: RemoteClient *q_ptr; QMutex m_mutex; - QString m_address; - quint16 m_port; + QString m_socketName; Protocol::StartAs m_startServerAs; bool m_serverStarted; bool m_active; diff --git a/src/libs/installer/remotefileengine.cpp b/src/libs/installer/remotefileengine.cpp index 15bafc28f..526b5a413 100644 --- a/src/libs/installer/remotefileengine.cpp +++ b/src/libs/installer/remotefileengine.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -37,8 +37,6 @@ #include "protocol.h" #include "remoteclient.h" -#include <QTcpSocket> - namespace QInstaller { diff --git a/src/libs/installer/remotefileengine.h b/src/libs/installer/remotefileengine.h index bf2e7e329..f94974763 100644 --- a/src/libs/installer/remotefileengine.h +++ b/src/libs/installer/remotefileengine.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/remoteobject.cpp b/src/libs/installer/remoteobject.cpp index e295694b6..581085ab3 100644 --- a/src/libs/installer/remoteobject.cpp +++ b/src/libs/installer/remoteobject.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -57,54 +57,41 @@ RemoteObject::~RemoteObject() { if (m_socket) { if (QThread::currentThread() == m_socket->thread()) { - m_stream << QString::fromLatin1(Protocol::Destroy) << m_type; - m_socket->waitForBytesWritten(-1); + writeData(QLatin1String(Protocol::Destroy), m_type, dummy, dummy); } else { Q_ASSERT_X(false, Q_FUNC_INFO, "Socket running in a different Thread than this object."); } - m_socket->deleteLater(); - m_socket = 0; + delete m_socket; } } bool RemoteObject::authorize() { - if (m_socket && (m_socket->state() == QAbstractSocket::ConnectedState)) + if (m_socket && (m_socket->state() == QLocalSocket::ConnectedState)) return true; if (m_socket) delete m_socket; - QScopedPointer<QTcpSocket> socket(new QTcpSocket); - socket->connectToHost(RemoteClient::instance().address(), RemoteClient::instance().port()); + m_socket = new QLocalSocket; + m_socket->connectToServer(RemoteClient::instance().socketName()); QElapsedTimer stopWatch; stopWatch.start(); - while ((socket->state() == QAbstractSocket::ConnectingState) + while ((m_socket->state() == QLocalSocket::ConnectingState) && (stopWatch.elapsed() < 30000)) { if ((stopWatch.elapsed() % 2500) == 0) QCoreApplication::processEvents(); } - if (socket->state() == QAbstractSocket::ConnectedState) { - QDataStream stream; - stream.setDevice(socket.data()); - stream << QString::fromLatin1(Protocol::Authorize) << RemoteClient::instance() - .authorizationKey(); - - socket->waitForBytesWritten(-1); - if (!socket->bytesAvailable()) - socket->waitForReadyRead(-1); - - quint32 size; stream >> size; - bool authorized = false; - stream >> authorized; - if (authorized) { - m_socket = socket.take(); - m_stream.setDevice(m_socket); + if (m_socket->state() == QLocalSocket::ConnectedState) { + bool authorized = callRemoteMethod<bool>(QString::fromLatin1(Protocol::Authorize), + RemoteClient::instance().authorizationKey()); + if (authorized) return true; - } } + delete m_socket; + m_socket = 0; return false; } @@ -113,16 +100,19 @@ bool RemoteObject::connectToServer(const QVariantList &arguments) if (!RemoteClient::instance().isActive()) return false; - if (m_socket && (m_socket->state() == QAbstractSocket::ConnectedState)) + if (m_socket && (m_socket->state() == QLocalSocket::ConnectedState)) return true; if (!authorize()) return false; - m_stream << QString::fromLatin1(Protocol::Create) << m_type; + QByteArray data; + QDataStream out(&data, QIODevice::WriteOnly); + out << m_type; foreach (const QVariant &arg, arguments) - m_stream << arg; - m_socket->waitForBytesWritten(-1); + out << arg; + + sendPacket(m_socket, Protocol::Create, data); return true; } @@ -131,7 +121,7 @@ bool RemoteObject::isConnectedToServer() const { if ((!m_socket) || (!RemoteClient::instance().isActive())) return false; - if (m_socket && (m_socket->state() == QAbstractSocket::ConnectedState)) + if (m_socket && (m_socket->state() == QLocalSocket::ConnectedState)) return true; return false; } diff --git a/src/libs/installer/remoteobject.h b/src/libs/installer/remoteobject.h index f47cd1367..f0f8da5fe 100644 --- a/src/libs/installer/remoteobject.h +++ b/src/libs/installer/remoteobject.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -37,10 +37,12 @@ #include "errors.h" #include "installer_global.h" +#include "protocol.h" +#include <QCoreApplication> #include <QDataStream> #include <QObject> -#include <QTcpSocket> +#include <QLocalSocket> namespace QInstaller { @@ -90,20 +92,29 @@ public: T callRemoteMethod(const QString &name, const T1 &arg, const T2 &arg2, const T3 &arg3) const { writeData(name, arg, arg2, arg3); - if (!m_socket->bytesAvailable()) - m_socket->waitForReadyRead(-1); - quint32 size; m_stream >> size; - while (m_socket->bytesAvailable() < size) { - if (!m_socket->waitForReadyRead(30000)) { + QByteArray command; + QByteArray data; + while (!receivePacket(m_socket, &command, &data)) { + if (!m_socket->waitForReadyRead(-1)) { throw Error(tr("Could not read all data after sending command: %1. " - "Bytes expected: %2, Bytes received: %3. Error: %4").arg(name).arg(size) + "Bytes expected: %2, Bytes received: %3. Error: %4").arg(name).arg(0) .arg(m_socket->bytesAvailable()).arg(m_socket->errorString())); } +#if defined Q_OS_WIN && QT_VERSION < QT_VERSION_CHECK(5,5,0) + // work around QTBUG-16688 + QCoreApplication::processEvents(); +#endif } + Q_ASSERT(command == Protocol::Reply); + + QDataStream stream(&data, QIODevice::ReadOnly); + T result; - m_stream >> result; + stream >> result; + Q_ASSERT(stream.status() == QDataStream::Ok); + Q_ASSERT(stream.atEnd()); return result; } @@ -143,16 +154,12 @@ private: if (isValueType(arg3)) out << arg3; - m_stream << name; - m_stream << quint32(data.size()); - m_stream << data; - m_socket->waitForBytesWritten(-1); + sendPacket(m_socket, name.toLatin1(), data); } private: QString m_type; - QTcpSocket *m_socket; - mutable QDataStream m_stream; + QLocalSocket *m_socket; }; } // namespace QInstaller diff --git a/src/libs/installer/remoteserver.cpp b/src/libs/installer/remoteserver.cpp index eeab37c6e..b5f077b7e 100644 --- a/src/libs/installer/remoteserver.cpp +++ b/src/libs/installer/remoteserver.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -68,14 +68,22 @@ RemoteServer::~RemoteServer() void RemoteServer::start() { Q_D(RemoteServer); - if (d->m_tcpServer) + if (d->m_localServer) return; - d->m_tcpServer = new TcpServer(d->m_port, d->m_key); - d->m_tcpServer->moveToThread(&d->m_thread); - connect(&d->m_thread, SIGNAL(finished()), d->m_tcpServer, SLOT(deleteLater())); - connect(d->m_tcpServer, SIGNAL(newIncomingConnection()), this, SLOT(restartWatchdog())); - connect(d->m_tcpServer, SIGNAL(shutdownRequested()), this, SLOT(deleteLater())); +#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) + // avoid writing to stderr: + // the parent process has redirected stderr to a pipe to work with sudo, + // but is not reading anymore -> writing to stderr will block after a while. + if (d->m_mode == Protocol::Mode::Production) + fclose(stderr); +#endif + + d->m_localServer = new LocalServer(d->m_socketName, d->m_key); + d->m_localServer->moveToThread(&d->m_thread); + connect(&d->m_thread, SIGNAL(finished()), d->m_localServer, SLOT(deleteLater())); + connect(d->m_localServer, SIGNAL(newIncomingConnection()), this, SLOT(restartWatchdog())); + connect(d->m_localServer, SIGNAL(shutdownRequested()), this, SLOT(deleteLater())); d->m_thread.start(); if (d->m_mode == Protocol::Mode::Production) { @@ -85,24 +93,24 @@ void RemoteServer::start() } /*! - Initializes the server with \a port, the port to listen on, with \a key, the key the client + Initializes the server with \a socketName, with \a key, the key the client needs to send to authenticate with the server, and \a mode. */ -void RemoteServer::init(quint16 port, const QString &key, Protocol::Mode mode) +void RemoteServer::init(const QString &socketName, const QString &key, Protocol::Mode mode) { Q_D(RemoteServer); - d->m_port = port; + d->m_socketName = socketName; d->m_key = key; d->m_mode = mode; } /*! - Returns the port the server is listening on. + Returns the socket name the server is listening on. */ -quint16 RemoteServer::port() const +QString RemoteServer::socketName() const { Q_D(const RemoteServer); - return d->m_port; + return d->m_socketName; } /*! diff --git a/src/libs/installer/remoteserver.h b/src/libs/installer/remoteserver.h index 40d484d65..77550522d 100644 --- a/src/libs/installer/remoteserver.h +++ b/src/libs/installer/remoteserver.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -55,9 +55,9 @@ public: ~RemoteServer(); void start(); - void init(quint16 port, const QString &authorizationKey, Protocol::Mode mode); + void init(const QString &socketName, const QString &authorizationKey, Protocol::Mode mode); - quint16 port() const; + QString socketName() const; QString authorizationKey() const; private slots: diff --git a/src/libs/installer/remoteserver_p.h b/src/libs/installer/remoteserver_p.h index e210feb1e..8750e00d9 100644 --- a/src/libs/installer/remoteserver_p.h +++ b/src/libs/installer/remoteserver_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -41,26 +41,27 @@ #include <QHostAddress> #include <QPointer> -#include <QTcpServer> +#include <QLocalServer> #include <QTimer> namespace QInstaller { -class TcpServer : public QTcpServer +class LocalServer : public QLocalServer { Q_OBJECT - Q_DISABLE_COPY(TcpServer) + Q_DISABLE_COPY(LocalServer) public: - TcpServer(quint16 port, const QString &key) - : QTcpServer(0) + LocalServer(const QString &socketName, const QString &key) + : QLocalServer(0) , m_key(key) , m_shutdown(false) { - listen(QHostAddress(QLatin1String(Protocol::DefaultHostAddress)), port); + setSocketOptions(QLocalServer::WorldAccessOption); + listen(socketName); } - ~TcpServer() { + ~LocalServer() { shutdown(); } @@ -80,11 +81,11 @@ private slots: } private: - void incomingConnection(qintptr socketDescriptor) Q_DECL_OVERRIDE { + void incomingConnection(quintptr socketDescriptor) Q_DECL_OVERRIDE { if (m_shutdown) return; - QThread *const thread = new RemoteServerConnection(socketDescriptor, m_key); + QThread *const thread = new RemoteServerConnection(socketDescriptor, m_key, this); connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); connect(thread, SIGNAL(shutdownRequested()), this, SLOT(shutdown())); thread->start(); @@ -104,9 +105,8 @@ class RemoteServerPrivate public: explicit RemoteServerPrivate(RemoteServer *server) : q_ptr(server) - , m_tcpServer(0) + , m_localServer(0) , m_key(QLatin1String(Protocol::DefaultAuthorizationKey)) - , m_port(Protocol::DefaultPort) , m_mode(Protocol::Mode::Debug) , m_watchdog(new QTimer) { @@ -116,10 +116,10 @@ public: private: RemoteServer *q_ptr; - TcpServer *m_tcpServer; + LocalServer *m_localServer; QString m_key; - quint16 m_port; + QString m_socketName; QThread m_thread; Protocol::Mode m_mode; QScopedPointer<QTimer> m_watchdog; diff --git a/src/libs/installer/remoteserverconnection.cpp b/src/libs/installer/remoteserverconnection.cpp index 591ca621e..17a90995b 100644 --- a/src/libs/installer/remoteserverconnection.cpp +++ b/src/libs/installer/remoteserverconnection.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -38,44 +38,67 @@ #include "protocol.h" #include "remoteserverconnection_p.h" #include "utils.h" +#include "permissionsettings.h" -#include <QSettings> -#include <QTcpSocket> +#include <QCoreApplication> +#include <QLocalSocket> namespace QInstaller { -RemoteServerConnection::RemoteServerConnection(qintptr socketDescriptor, const QString &key) - : m_socketDescriptor(socketDescriptor) +RemoteServerConnection::RemoteServerConnection(qintptr socketDescriptor, const QString &key, + QObject *parent) + : QThread(parent) + , m_socketDescriptor(socketDescriptor) , m_process(0) - , m_settings(0) , m_engine(0) , m_authorizationKey(key) , m_signalReceiver(0) { + setObjectName(QString::fromLatin1("RemoteServerConnection(%1)").arg(socketDescriptor)); } +// Helper RAII to ensure stream data was correctly (and completely) read +struct StreamChecker { + StreamChecker(QDataStream *stream) : stream(stream) {} + ~StreamChecker() { + Q_ASSERT(stream->status() == QDataStream::Ok); + Q_ASSERT(stream->atEnd()); + } +private: + QDataStream *stream; +}; + void RemoteServerConnection::run() { - QTcpSocket socket; + QLocalSocket socket; socket.setSocketDescriptor(m_socketDescriptor); - - QDataStream stream; - stream.setDevice(&socket); + QScopedPointer<PermissionSettings> settings; bool authorized = false; - while (socket.state() == QAbstractSocket::ConnectedState) { - // Use a polling approach here to kill the thread as soon as the connections - // closes. This seems to be related to the fact that the keep alive thread connects - // every second and immediately throws away the socket and therefore the connection. - if (!socket.bytesAvailable() && !socket.waitForReadyRead(250)) + while (socket.state() == QLocalSocket::ConnectedState) { + QByteArray cmd; + QByteArray data; + + if (!receivePacket(&socket, &cmd, &data)) { + socket.waitForReadyRead(250); +#if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(5,5,0) + // work around QTBUG-16688 + QCoreApplication::processEvents(); +#endif continue; + } - QString command; - stream >> command; + const QString command = QString::fromLatin1(cmd); + QBuffer buf; + buf.setBuffer(&data); + buf.open(QIODevice::ReadOnly); + QDataStream stream; + stream.setDevice(&buf); + StreamChecker streamChecker(&stream); if (authorized && command == QLatin1String(Protocol::Shutdown)) { authorized = false; - sendData(stream, true); + sendData(&socket, true); socket.flush(); socket.close(); emit shutdownRequested(); @@ -83,10 +106,12 @@ void RemoteServerConnection::run() } else if (command == QLatin1String(Protocol::Authorize)) { QString key; stream >> key; - sendData(stream, (authorized = (key == m_authorizationKey))); + sendData(&socket, (authorized = (key == m_authorizationKey))); socket.flush(); - if (!authorized) + if (!authorized) { socket.close(); + return; + } } else if (authorized) { if (command.isEmpty()) continue; @@ -102,14 +127,12 @@ void RemoteServerConnection::run() stream >> application; stream >> organization; stream >> scope; stream >> format; stream >> fileName; - if (m_settings) - m_settings->deleteLater(); if (fileName.toString().isEmpty()) { - m_settings = new QSettings(QSettings::Format(format.toInt()), + settings.reset(new PermissionSettings(QSettings::Format(format.toInt()), QSettings::Scope(scope.toInt()), organization.toString(), application - .toString()); + .toString())); } else { - m_settings = new QSettings(fileName.toString(), QSettings::Format(format.toInt())); + settings.reset(new PermissionSettings(fileName.toString(), QSettings::Format(format.toInt()))); } } else if (type == QLatin1String(Protocol::QProcess)) { if (m_process) @@ -128,8 +151,7 @@ void RemoteServerConnection::run() QString type; stream >> type; if (type == QLatin1String(Protocol::QSettings)) { - m_settings->deleteLater(); - m_settings = 0; + settings.reset(); } else if (command == QLatin1String(Protocol::QProcess)) { m_signalReceiver->m_receivedSignals.clear(); m_process->deleteLater(); @@ -138,24 +160,24 @@ void RemoteServerConnection::run() delete m_engine; m_engine = 0; } - continue; + return; } if (command == QLatin1String(Protocol::GetQProcessSignals)) { if (m_signalReceiver) { QMutexLocker _(&m_signalReceiver->m_lock); - sendData(stream, m_signalReceiver->m_receivedSignals); + sendData(&socket, m_signalReceiver->m_receivedSignals); m_signalReceiver->m_receivedSignals.clear(); } continue; } if (command.startsWith(QLatin1String(Protocol::QProcess))) { - handleQProcess(command, stream); + handleQProcess(&socket, command, stream); } else if (command.startsWith(QLatin1String(Protocol::QSettings))) { - handleQSettings(command, stream); + handleQSettings(&socket, command, stream, settings.data()); } else if (command.startsWith(QLatin1String(Protocol::QAbstractFileEngine))) { - handleQFSFileEngine(command, stream); + handleQFSFileEngine(&socket, command, stream); } else { qDebug() << "Unknown command:" << command; } @@ -169,47 +191,31 @@ void RemoteServerConnection::run() } template <typename T> -void RemoteServerConnection::sendData(QDataStream &stream, const T &data) +void RemoteServerConnection::sendData(QIODevice *device, const T &data) { QByteArray result; QDataStream returnStream(&result, QIODevice::WriteOnly); returnStream << data; - stream << static_cast<quint32> (result.size()); - if (!result.isEmpty()) - stream.writeRawData(result.data(), result.size()); + sendPacket(device, Protocol::Reply, result); } -void RemoteServerConnection::handleQProcess(const QString &command, QDataStream &stream) +void RemoteServerConnection::handleQProcess(QIODevice *socket, const QString &command, QDataStream &data) { - quint32 size; - stream >> size; - while (stream.device()->bytesAvailable() < size) { - if (!stream.device()->waitForReadyRead(30000)) { - throw Error(tr("Could not read all data after sending command: %1. " - "Bytes expected: %2, Bytes received: %3. Error: %4").arg(command).arg(size) - .arg(stream.device()->bytesAvailable()).arg(stream.device()->errorString())); - } - } - - QByteArray ba; - stream >> ba; - QDataStream data(ba); - if (command == QLatin1String(Protocol::QProcessCloseWriteChannel)) { m_process->closeWriteChannel(); } else if (command == QLatin1String(Protocol::QProcessExitCode)) { - sendData(stream, m_process->exitCode()); + sendData(socket, m_process->exitCode()); } else if (command == QLatin1String(Protocol::QProcessExitStatus)) { - sendData(stream, static_cast<qint32> (m_process->exitStatus())); + sendData(socket, static_cast<qint32> (m_process->exitStatus())); } else if (command == QLatin1String(Protocol::QProcessKill)) { m_process->kill(); } else if (command == QLatin1String(Protocol::QProcessReadAll)) { - sendData(stream, m_process->readAll()); + sendData(socket, m_process->readAll()); } else if (command == QLatin1String(Protocol::QProcessReadAllStandardOutput)) { - sendData(stream, m_process->readAllStandardOutput()); + sendData(socket, m_process->readAllStandardOutput()); } else if (command == QLatin1String(Protocol::QProcessReadAllStandardError)) { - sendData(stream, m_process->readAllStandardError()); + sendData(socket, m_process->readAllStandardError()); } else if (command == QLatin1String(Protocol::QProcessStartDetached)) { QString program; QStringList arguments; @@ -220,7 +226,7 @@ void RemoteServerConnection::handleQProcess(const QString &command, QDataStream qint64 pid = -1; bool success = QInstaller::startDetached(program, arguments, workingDirectory, &pid); - sendData(stream, qMakePair< bool, qint64>(success, pid)); + sendData(socket, qMakePair< bool, qint64>(success, pid)); } else if (command == QLatin1String(Protocol::QProcessSetWorkingDirectory)) { QString dir; data >> dir; @@ -230,7 +236,7 @@ void RemoteServerConnection::handleQProcess(const QString &command, QDataStream data >> env; m_process->setEnvironment(env); } else if (command == QLatin1String(Protocol::QProcessEnvironment)) { - sendData(stream, m_process->environment()); + sendData(socket, m_process->environment()); } else if (command == QLatin1String(Protocol::QProcessStart3Arg)) { QString program; QStringList arguments; @@ -246,23 +252,23 @@ void RemoteServerConnection::handleQProcess(const QString &command, QDataStream data >> mode; m_process->start(program, static_cast<QIODevice::OpenMode> (mode)); } else if (command == QLatin1String(Protocol::QProcessState)) { - sendData(stream, static_cast<qint32> (m_process->state())); + sendData(socket, static_cast<qint32> (m_process->state())); } else if (command == QLatin1String(Protocol::QProcessTerminate)) { m_process->terminate(); } else if (command == QLatin1String(Protocol::QProcessWaitForFinished)) { qint32 msecs; data >> msecs; - sendData(stream, m_process->waitForFinished(msecs)); + sendData(socket, m_process->waitForFinished(msecs)); } else if (command == QLatin1String(Protocol::QProcessWaitForStarted)) { qint32 msecs; data >> msecs; - sendData(stream, m_process->waitForStarted(msecs)); + sendData(socket, m_process->waitForStarted(msecs)); } else if (command == QLatin1String(Protocol::QProcessWorkingDirectory)) { - sendData(stream, m_process->workingDirectory()); + sendData(socket, m_process->workingDirectory()); } else if (command == QLatin1String(Protocol::QProcessErrorString)) { - sendData(stream, m_process->errorString()); + sendData(socket, m_process->errorString()); } else if (command == QLatin1String(Protocol::QProcessReadChannel)) { - sendData(stream, static_cast<qint32> (m_process->readChannel())); + sendData(socket, static_cast<qint32> (m_process->readChannel())); } else if (command == QLatin1String(Protocol::QProcessSetReadChannel)) { qint32 processChannel; data >> processChannel; @@ -270,9 +276,9 @@ void RemoteServerConnection::handleQProcess(const QString &command, QDataStream } else if (command == QLatin1String(Protocol::QProcessWrite)) { QByteArray byteArray; data >> byteArray; - sendData(stream, m_process->write(byteArray)); + sendData(socket, m_process->write(byteArray)); } else if (command == QLatin1String(Protocol::QProcessProcessChannelMode)) { - sendData(stream, static_cast<qint32> (m_process->processChannelMode())); + sendData(socket, static_cast<qint32> (m_process->processChannelMode())); } else if (command == QLatin1String(Protocol::QProcessSetProcessChannelMode)) { qint32 processChannel; data >> processChannel; @@ -290,203 +296,180 @@ void RemoteServerConnection::handleQProcess(const QString &command, QDataStream } } -void RemoteServerConnection::handleQSettings(const QString &command, QDataStream &stream) +void RemoteServerConnection::handleQSettings(QIODevice *socket, const QString &command, + QDataStream &data, PermissionSettings *settings) { - quint32 size; - stream >> size; - while (stream.device()->bytesAvailable() < size) { - if (!stream.device()->waitForReadyRead(30000)) { - throw Error(tr("Could not read all data after sending command: %1. " - "Bytes expected: %2, Bytes received: %3. Error: %4").arg(command).arg(size) - .arg(stream.device()->bytesAvailable()).arg(stream.device()->errorString())); - } - } - - QByteArray ba; - stream >> ba; - QDataStream data(ba); + if (!settings) + return; if (command == QLatin1String(Protocol::QSettingsAllKeys)) { - sendData(stream, m_settings->allKeys()); + sendData(socket, settings->allKeys()); } else if (command == QLatin1String(Protocol::QSettingsBeginGroup)) { QString prefix; data >> prefix; - m_settings->beginGroup(prefix); + settings->beginGroup(prefix); } else if (command == QLatin1String(Protocol::QSettingsBeginWriteArray)) { QString prefix; data >> prefix; qint32 size; data >> size; - m_settings->beginWriteArray(prefix, size); + settings->beginWriteArray(prefix, size); } else if (command == QLatin1String(Protocol::QSettingsBeginReadArray)) { QString prefix; data >> prefix; - sendData(stream, m_settings->beginReadArray(prefix)); + sendData(socket, settings->beginReadArray(prefix)); } else if (command == QLatin1String(Protocol::QSettingsChildGroups)) { - sendData(stream, m_settings->childGroups()); + sendData(socket, settings->childGroups()); } else if (command == QLatin1String(Protocol::QSettingsChildKeys)) { - sendData(stream, m_settings->childKeys()); + sendData(socket, settings->childKeys()); } else if (command == QLatin1String(Protocol::QSettingsClear)) { - m_settings->clear(); + settings->clear(); } else if (command == QLatin1String(Protocol::QSettingsContains)) { QString key; data >> key; - sendData(stream, m_settings->contains(key)); + sendData(socket, settings->contains(key)); } else if (command == QLatin1String(Protocol::QSettingsEndArray)) { - m_settings->endArray(); + settings->endArray(); } else if (command == QLatin1String(Protocol::QSettingsEndGroup)) { - m_settings->endGroup(); + settings->endGroup(); } else if (command == QLatin1String(Protocol::QSettingsFallbacksEnabled)) { - sendData(stream, m_settings->fallbacksEnabled()); + sendData(socket, settings->fallbacksEnabled()); } else if (command == QLatin1String(Protocol::QSettingsFileName)) { - sendData(stream, m_settings->fileName()); + sendData(socket, settings->fileName()); } else if (command == QLatin1String(Protocol::QSettingsGroup)) { - sendData(stream, m_settings->group()); + sendData(socket, settings->group()); } else if (command == QLatin1String(Protocol::QSettingsIsWritable)) { - sendData(stream, m_settings->isWritable()); + sendData(socket, settings->isWritable()); } else if (command == QLatin1String(Protocol::QSettingsRemove)) { QString key; data >> key; - m_settings->remove(key); + settings->remove(key); } else if (command == QLatin1String(Protocol::QSettingsSetArrayIndex)) { qint32 i; data >> i; - m_settings->setArrayIndex(i); + settings->setArrayIndex(i); } else if (command == QLatin1String(Protocol::QSettingsSetFallbacksEnabled)) { bool b; data >> b; - m_settings->setFallbacksEnabled(b); + settings->setFallbacksEnabled(b); } else if (command == QLatin1String(Protocol::QSettingsStatus)) { - sendData(stream, m_settings->status()); + sendData(socket, settings->status()); } else if (command == QLatin1String(Protocol::QSettingsSync)) { - m_settings->sync(); + settings->sync(); } else if (command == QLatin1String(Protocol::QSettingsSetValue)) { QString key; QVariant value; data >> key; data >> value; - m_settings->setValue(key, value); + settings->setValue(key, value); } else if (command == QLatin1String(Protocol::QSettingsValue)) { QString key; QVariant defaultValue; data >> key; data >> defaultValue; - sendData(stream, m_settings->value(key, defaultValue)); + sendData(socket, settings->value(key, defaultValue)); } else if (command == QLatin1String(Protocol::QSettingsOrganizationName)) { - sendData(stream, m_settings->organizationName()); + sendData(socket, settings->organizationName()); } else if (command == QLatin1String(Protocol::QSettingsApplicationName)) { - sendData(stream, m_settings->applicationName()); + sendData(socket, settings->applicationName()); } else if (!command.isEmpty()) { qDebug() << "Unknown QSettings command:" << command; } } -void RemoteServerConnection::handleQFSFileEngine(const QString &command, QDataStream &stream) +void RemoteServerConnection::handleQFSFileEngine(QIODevice *socket, const QString &command, + QDataStream &data) { - quint32 size; - stream >> size; - while (stream.device()->bytesAvailable() < size) { - if (!stream.device()->waitForReadyRead(30000)) { - throw Error(tr("Could not read all data after sending command: %1. " - "Bytes expected: %2, Bytes received: %3. Error: %4").arg(command).arg(size) - .arg(stream.device()->bytesAvailable()).arg(stream.device()->errorString())); - } - } - - QByteArray ba; - stream >> ba; - QDataStream data(ba); - if (command == QLatin1String(Protocol::QAbstractFileEngineAtEnd)) { - sendData(stream, m_engine->atEnd()); + sendData(socket, m_engine->atEnd()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineCaseSensitive)) { - sendData(stream, m_engine->caseSensitive()); + sendData(socket, m_engine->caseSensitive()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineClose)) { - sendData(stream, m_engine->close()); + sendData(socket, m_engine->close()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineCopy)) { QString newName; data >>newName; - sendData(stream, m_engine->copy(newName)); + sendData(socket, m_engine->copy(newName)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineEntryList)) { qint32 filters; QStringList filterNames; data >>filters; data >>filterNames; - sendData(stream, m_engine->entryList(static_cast<QDir::Filters> (filters), filterNames)); + sendData(socket, m_engine->entryList(static_cast<QDir::Filters> (filters), filterNames)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineError)) { - sendData(stream, static_cast<qint32> (m_engine->error())); + sendData(socket, static_cast<qint32> (m_engine->error())); } else if (command == QLatin1String(Protocol::QAbstractFileEngineErrorString)) { - sendData(stream, m_engine->errorString()); + sendData(socket, m_engine->errorString()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineFileFlags)) { qint32 flags; data >>flags; flags = m_engine->fileFlags(static_cast<QAbstractFileEngine::FileFlags>(flags)); - sendData(stream, static_cast<qint32>(flags)); + sendData(socket, static_cast<qint32>(flags)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineFileName)) { qint32 file; data >>file; - sendData(stream, m_engine->fileName(static_cast<QAbstractFileEngine::FileName> (file))); + sendData(socket, m_engine->fileName(static_cast<QAbstractFileEngine::FileName> (file))); } else if (command == QLatin1String(Protocol::QAbstractFileEngineFlush)) { - sendData(stream, m_engine->flush()); + sendData(socket, m_engine->flush()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineHandle)) { - sendData(stream, m_engine->handle()); + sendData(socket, m_engine->handle()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineIsRelativePath)) { - sendData(stream, m_engine->isRelativePath()); + sendData(socket, m_engine->isRelativePath()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineIsSequential)) { - sendData(stream, m_engine->isSequential()); + sendData(socket, m_engine->isSequential()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineLink)) { QString newName; data >>newName; - sendData(stream, m_engine->link(newName)); + sendData(socket, m_engine->link(newName)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineMkdir)) { QString dirName; bool createParentDirectories; data >>dirName; data >>createParentDirectories; - sendData(stream, m_engine->mkdir(dirName, createParentDirectories)); + sendData(socket, m_engine->mkdir(dirName, createParentDirectories)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineOpen)) { qint32 openMode; data >>openMode; - sendData(stream, m_engine->open(static_cast<QIODevice::OpenMode> (openMode))); + sendData(socket, m_engine->open(static_cast<QIODevice::OpenMode> (openMode))); } else if (command == QLatin1String(Protocol::QAbstractFileEngineOwner)) { qint32 owner; data >>owner; - sendData(stream, m_engine->owner(static_cast<QAbstractFileEngine::FileOwner> (owner))); + sendData(socket, m_engine->owner(static_cast<QAbstractFileEngine::FileOwner> (owner))); } else if (command == QLatin1String(Protocol::QAbstractFileEngineOwnerId)) { qint32 owner; data >>owner; - sendData(stream, m_engine->ownerId(static_cast<QAbstractFileEngine::FileOwner> (owner))); + sendData(socket, m_engine->ownerId(static_cast<QAbstractFileEngine::FileOwner> (owner))); } else if (command == QLatin1String(Protocol::QAbstractFileEnginePos)) { - sendData(stream, m_engine->pos()); + sendData(socket, m_engine->pos()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineRead)) { qint64 maxlen; data >> maxlen; QByteArray byteArray(maxlen, '\0'); const qint64 r = m_engine->read(byteArray.data(), maxlen); - sendData(stream, qMakePair<qint64, QByteArray>(r, byteArray)); + sendData(socket, qMakePair<qint64, QByteArray>(r, byteArray)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineReadLine)) { qint64 maxlen; data >> maxlen; QByteArray byteArray(maxlen, '\0'); const qint64 r = m_engine->readLine(byteArray.data(), maxlen); - sendData(stream, qMakePair<qint64, QByteArray>(r, byteArray)); + sendData(socket, qMakePair<qint64, QByteArray>(r, byteArray)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineRemove)) { - sendData(stream, m_engine->remove()); + sendData(socket, m_engine->remove()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineRename)) { QString newName; data >>newName; - sendData(stream, m_engine->rename(newName)); + sendData(socket, m_engine->rename(newName)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineRmdir)) { QString dirName; bool recurseParentDirectories; data >>dirName; data >>recurseParentDirectories; - sendData(stream, m_engine->rmdir(dirName, recurseParentDirectories)); + sendData(socket, m_engine->rmdir(dirName, recurseParentDirectories)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineSeek)) { quint64 offset; data >>offset; - sendData(stream, m_engine->seek(offset)); + sendData(socket, m_engine->seek(offset)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineSetFileName)) { QString fileName; data >>fileName; @@ -494,30 +477,30 @@ void RemoteServerConnection::handleQFSFileEngine(const QString &command, QDataSt } else if (command == QLatin1String(Protocol::QAbstractFileEngineSetPermissions)) { uint perms; data >>perms; - sendData(stream, m_engine->setPermissions(perms)); + sendData(socket, m_engine->setPermissions(perms)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineSetSize)) { qint64 size; data >>size; - sendData(stream, m_engine->setSize(size)); + sendData(socket, m_engine->setSize(size)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineSize)) { - sendData(stream, m_engine->size()); + sendData(socket, m_engine->size()); } else if ((command == QLatin1String(Protocol::QAbstractFileEngineSupportsExtension)) || (command == QLatin1String(Protocol::QAbstractFileEngineExtension))) { // Implemented client side. } else if (command == QLatin1String(Protocol::QAbstractFileEngineWrite)) { QByteArray content; data >> content; - sendData(stream, m_engine->write(content.data(), content.size())); + sendData(socket, m_engine->write(content.data(), content.size())); } else if (command == QLatin1String(Protocol::QAbstractFileEngineSyncToDisk)) { - sendData(stream, m_engine->syncToDisk()); + sendData(socket, m_engine->syncToDisk()); } else if (command == QLatin1String(Protocol::QAbstractFileEngineRenameOverwrite)) { QString newFilename; data >> newFilename; - sendData(stream, m_engine->renameOverwrite(newFilename)); + sendData(socket, m_engine->renameOverwrite(newFilename)); } else if (command == QLatin1String(Protocol::QAbstractFileEngineFileTime)) { qint32 filetime; data >> filetime; - sendData(stream, m_engine->fileTime(static_cast<QAbstractFileEngine::FileTime> (filetime))); + sendData(socket, m_engine->fileTime(static_cast<QAbstractFileEngine::FileTime> (filetime))); } else if (!command.isEmpty()) { qDebug() << "Unknown QAbstractFileEngine command:" << command; } diff --git a/src/libs/installer/remoteserverconnection.h b/src/libs/installer/remoteserverconnection.h index 13df09576..1d49def91 100644 --- a/src/libs/installer/remoteserverconnection.h +++ b/src/libs/installer/remoteserverconnection.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -42,11 +42,13 @@ QT_BEGIN_NAMESPACE class QProcess; -class QSettings; +class QIODevice; QT_END_NAMESPACE namespace QInstaller { +class PermissionSettings; + class QProcessSignalReceiver; class RemoteServerConnection : public QThread @@ -55,7 +57,8 @@ class RemoteServerConnection : public QThread Q_DISABLE_COPY(RemoteServerConnection) public: - RemoteServerConnection(qintptr socketDescriptor, const QString &authorizationKey); + RemoteServerConnection(qintptr socketDescriptor, const QString &authorizationKey, + QObject *parent); void run() Q_DECL_OVERRIDE; @@ -64,16 +67,16 @@ signals: private: template <typename T> - void sendData(QDataStream &stream, const T &arg); - void handleQProcess(const QString &command, QDataStream &receivedStream); - void handleQSettings(const QString &command, QDataStream &receivedStream); - void handleQFSFileEngine(const QString &command, QDataStream &receivedStream); + void sendData(QIODevice *device, const T &arg); + void handleQProcess(QIODevice *device, const QString &command, QDataStream &data); + void handleQSettings(QIODevice *device, const QString &command, QDataStream &data, + PermissionSettings *settings); + void handleQFSFileEngine(QIODevice *device, const QString &command, QDataStream &data); private: qintptr m_socketDescriptor; QProcess *m_process; - QSettings *m_settings; QFSFileEngine *m_engine; QString m_authorizationKey; QProcessSignalReceiver *m_signalReceiver; diff --git a/src/libs/installer/remoteserverconnection_p.h b/src/libs/installer/remoteserverconnection_p.h index b79757cd4..5c1c0b791 100644 --- a/src/libs/installer/remoteserverconnection_p.h +++ b/src/libs/installer/remoteserverconnection_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/replaceoperation.cpp b/src/libs/installer/replaceoperation.cpp index 753a63a02..c2aec65a8 100644 --- a/src/libs/installer/replaceoperation.cpp +++ b/src/libs/installer/replaceoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/replaceoperation.h b/src/libs/installer/replaceoperation.h index 00a23e8f5..fe37b096f 100644 --- a/src/libs/installer/replaceoperation.h +++ b/src/libs/installer/replaceoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp index 55e5bd20c..b3d501b96 100644 --- a/src/libs/installer/repository.cpp +++ b/src/libs/installer/repository.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/repository.h b/src/libs/installer/repository.h index 6d904d08c..5b2185d06 100644 --- a/src/libs/installer/repository.h +++ b/src/libs/installer/repository.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/runextensions.h b/src/libs/installer/runextensions.h index 41675f749..11c9b6a4c 100644 --- a/src/libs/installer/runextensions.h +++ b/src/libs/installer/runextensions.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp index fb67a1788..19e5e313b 100644 --- a/src/libs/installer/scriptengine.cpp +++ b/src/libs/installer/scriptengine.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -52,26 +52,82 @@ namespace QInstaller { */ /*! + \fn ScriptEngine::globalObject() const + Returns a global object. +*/ + +/*! \qmltype console \inqmlmodule scripting \brief Provides methods for logging and debugging. + + You can use the \c console object to print log information about installer + functions to the console. The following example uses the \c console object + \l{console::log()}{log} method and \l installer object + \l{installer::isUpdater()}, \l{installer::isUninstaller()}, and + \l{installer::isPackageManager()} methods to display a message that + indicates whether the maintenance tool is currently being used to update, + remove, or add components. + + \code + onPackageManagerCoreTypeChanged = function() + { + console.log("Is Updater: " + installer.isUpdater()); + console.log("Is Uninstaller: " + installer.isUninstaller()); + console.log("Is Package Manager: " + installer.isPackageManager()); + } + \endcode */ /*! \qmlmethod void console::log(string value) + + Prints the string specified by \a value to the console. */ /*! \qmltype QFileDialog \inqmlmodule scripting + \brief Provides a dialog that allows users to select files or directories. + + Use the QFileDialog::getExistingDirectory() method to create a modal dialog + that displays an existing directory selected by the user. Use the + QFileDialog::getOpenFileName() method to create a dialog that displays + matching files in the directory selected by the user. */ /*! \qmlmethod string QFileDialog::getExistingDirectory(string caption, string dir) + + Returns an existing directory selected by the user. + + The dialog's working directory is set to \a dir, and the caption is set to + \a caption. Either of these may be an empty string, in which case the + current directory and a default caption will be used, respectively. */ /*! \qmlmethod string QFileDialog::getOpenFileName(string caption, string dir, string filter) + + Returns an existing file selected by the user. If the user selects + \uicontrol Cancel, returns a null string. + + The file dialog's caption is set to \a caption. If \c caption is not + specified, a default caption is used. + + The file dialog's working directory is set to \a dir. If \c dir includes a + file name, the file will be selected. Only files that match the specified + \a filter are shown. Either of these may be an empty string. + + To specify multiple filters, separate them with two semicolons (;;). For + example: + + \code + "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" + \endcode + + On Windows, and OS X, this static function will use the native file dialog + and not a QFileDialog. */ /*! @@ -118,10 +174,23 @@ namespace QInstaller { /*! \qmltype QDesktopServices \inqmlmodule scripting -*/ -/*! - \qmlproperty enumeration QDesktopServices::QStandardPaths + \brief Provides methods for accessing common desktop services. + + Many desktop environments provide services that can be used by applications + to perform common tasks, such as opening a file, in a way that is both + consistent and takes into account the user's application preferences. + + This object contains methods that provide simple interfaces to these + services that indicate whether they succeeded or failed. + + The openUrl() method is used to open files located at arbitrary URLs in + external applications. For URLs that correspond to resources on the local + filing system (where the URL scheme is "file"), a suitable application is + used to open the file. + + The displayName() and storageLocation() methods take one of the following + enums as an argument: \list \li DesktopServices.DesktopLocation @@ -142,18 +211,34 @@ namespace QInstaller { \li DesktopServices.GenericCacheLocation \li DesktopServices.GenericConfigLocation \endlist + + The enum values correspond to the values of the + \l{QStandardPaths::StandardLocation} enum with the same names. +*/ + +/*! + \qmlproperty enumeration QDesktopServices::QStandardPaths + \internal */ /*! \qmlmethod boolean QDesktopServices::openUrl(string url) + + Uses the URL scheme \c file to open the specified \a url with a suitable + application. */ /*! \qmlmethod string QDesktopServices::displayName(int location) + + Returns a localized display name for the specified \a location or an empty + QString if no relevant location can be found. */ /*! \qmlmethod string QDesktopServices::storageLocation(int location) + + Returns the specified \a location. */ /*! @@ -161,6 +246,13 @@ namespace QInstaller { \inqmlmodule scripting \brief Provides access to the installer status and pages from Qt Script. + + For more information about using the \c QInstaller object in control + scripts, see \l{Controller Scripting}. + + For examples of using the pages to support end user workflows, see + \l{End User Workflows}. + */ /*! @@ -168,17 +260,25 @@ namespace QInstaller { The installer has various pre-defined pages that can be used to for example insert pages in a certain place: - \list - \li QInstaller.Introduction - \li QInstaller.TargetDirectory - \li QInstaller.ComponentSelection - \li QInstaller.LicenseCheck - \li QInstaller.StartMenuSelection - \li QInstaller.ReadyForInstallation - \li QInstaller.PerformInstallation - \li QInstaller.InstallationFinished - \li QInstaller.End - \endlist + + \value QInstaller.Introduction + \l{Introduction Page} + \value QInstaller.TargetDirectory + \l{Target Directory Page} + \value QInstaller.ComponentSelection + \l{Component Selection Page} + \value QInstaller.LicenseCheck + \l{License Agreement Page} + \value QInstaller.StartMenuSelection + \l{Start Menu Directory Page} + \value QInstaller.ReadyForInstallation + \l{Ready for Installation Page} + \value QInstaller.PerformInstallation + \l{Perform Installation Page} + \value QInstaller.InstallationFinished + \l{Finished Page} + + \omitvalue QInstaller.End */ @@ -188,19 +288,24 @@ namespace QInstaller { Status of the installer. Possible values are: - \list - \li QInstaller.Success (deprecated: QInstaller.InstallerSucceeded) - \li QInstaller.Failure (deprecated: QInstaller.InstallerFailed) - \li QInstaller.Running (deprecated: QInstaller.InstallerFailed) - \li QInstaller.Canceled (deprecated: QInstaller.CanceledByUser) - \li QInstaller.Unfinished (deprecated: QInstaller.InstallerUnfinished) - \li QInstaller.ForceUpdate - \endlist + + \value QInstaller.Success + Installation was successful. + \value QInstaller.Failure + Installation failed. + \value QInstaller.Running + Installation is in progress. + \value QInstaller.Canceled + Installation was canceled. + \value QInstaller.Unfinished + Installation was not completed. + \value QInstaller.ForceUpdate */ /*! \qmltype gui \inqmlmodule scripting + \brief Enables interaction with the installer UI. */ /*! @@ -223,6 +328,13 @@ namespace QInstaller { \qmlsignal gui::settingsButtonClicked(); */ +QJSValue InstallerProxy::componentByName(const QString &componentName) +{ + if (m_core) + return m_engine->newQObject(m_core->componentByName(componentName)); + return QJSValue(); +} + GuiProxy::GuiProxy(ScriptEngine *engine, QObject *parent) : QObject(parent), m_engine(engine), @@ -253,6 +365,9 @@ void GuiProxy::setPackageManagerGui(PackageManagerGui *gui) /*! \qmlmethod object gui::pageById(int id) + + Returns the installer page specified by \a id. The values of \c id for the + available installer pages are provided by QInstaller::WizardPage. */ QJSValue GuiProxy::pageById(int id) const { @@ -263,6 +378,9 @@ QJSValue GuiProxy::pageById(int id) const /*! \qmlmethod object gui::pageByObjectName(string name) + + Returns the installer page specified by \a name. The value of \c name is the + object name set in the UI file that defines the installer page. */ QJSValue GuiProxy::pageByObjectName(const QString &name) const { @@ -273,6 +391,8 @@ QJSValue GuiProxy::pageByObjectName(const QString &name) const /*! \qmlmethod object gui::currentPageWidget() + + Returns the current wizard page. */ QJSValue GuiProxy::currentPageWidget() const { @@ -303,6 +423,9 @@ QString GuiProxy::defaultButtonText(int wizardButton) const /*! \qmlmethod void gui::clickButton(int wizardButton, int delayInMs) + + Automatically clicks the button specified by \a wizardButton after a delay + in milliseconds specified by \a delayInMs. */ void GuiProxy::clickButton(int wizardButton, int delayInMs) { @@ -421,7 +544,7 @@ ScriptEngine::ScriptEngine(PackageManagerCore *core) : QJSValue global = m_engine.globalObject(); global.setProperty(QLatin1String("console"), m_engine.newQObject(new ConsoleProxy)); global.setProperty(QLatin1String("QFileDialog"), m_engine.newQObject(new QFileDialogProxy)); - const QJSValue proxy = m_engine.newQObject(new InstallerProxy(&m_engine, core)); + const QJSValue proxy = m_engine.newQObject(new InstallerProxy(this, core)); global.setProperty(QLatin1String("InstallerProxy"), proxy); global.setProperty(QLatin1String("print"), m_engine.newQObject(new ConsoleProxy) .property(QLatin1String("log"))); @@ -469,13 +592,19 @@ ScriptEngine::ScriptEngine(PackageManagerCore *core) : available as properties of the created QJSValue. In addition some helper methods and properties are added: - findChild(), findChildren() recursively search for child objects with the given object name. - - Direct child objects are made accessible as properties under their respective object names. + \list + \li findChild(), findChildren() recursively search for child objects with the given + object name. + \li Direct child objects are made accessible as properties under their respective object + names. + \endlist */ QJSValue ScriptEngine::newQObject(QObject *object) { QJSValue jsValue = m_engine.newQObject(object); + if (!jsValue.isQObject()) + return jsValue; + QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership); // add findChild(), findChildren() methods known from QtScript @@ -497,6 +626,10 @@ QJSValue ScriptEngine::newQObject(QObject *object) return jsValue; } +/*! + Evaluates \a program, using \a lineNumber as the base line number, and returns the results of + the evaluation. \a fileName is used for error reporting. +*/ QJSValue ScriptEngine::evaluate(const QString &program, const QString &fileName, int lineNumber) { return m_engine.evaluate(program, fileName, lineNumber); @@ -526,9 +659,11 @@ void ScriptEngine::removeFromGlobalObject(QObject *object) Loads a script into the given \a context at \a fileName inside the ScriptEngine. The installer and all its components as well as other useful stuff are being exported into the - script. Read \link componentscripting Component Scripting \endlink for details. + script. For more information, see \l {Component Scripting}. Throws Error when either the script at \a fileName could not be opened, or the QScriptEngine - couldn't evaluate the script. + could not evaluate the script. + + TODO: document \a scriptInjection. */ QJSValue ScriptEngine::loadInContext(const QString &context, const QString &fileName, const QString &scriptInjection) @@ -561,12 +696,13 @@ QJSValue ScriptEngine::loadInContext(const QString &context, const QString &file } /*! - Tries to call the method with \a name within the script and returns the result. If the method - doesn't exist or is not callable, an undefined result is returned. If the call to the method + Tries to call the method specified by \a methodName with the arguments specified by + \a arguments within the script and returns the result. If the method does not exist or + is not callable, an undefined result is returned. If the call to the method succeeds and the return value is still undefined, a null value will be returned instead. If the method call has an exception, its string representation is thrown as an Error exception. - \note The method is not called, if the current script context is the same method, to avoid + \note The method is not called if \a scriptContext is the same method, to avoid infinite recursion. */ QJSValue ScriptEngine::callScriptMethod(const QJSValue &scriptContext, const QString &methodName, diff --git a/src/libs/installer/scriptengine.h b/src/libs/installer/scriptengine.h index 5b8a3a3ec..9fe0d2e75 100644 --- a/src/libs/installer/scriptengine.h +++ b/src/libs/installer/scriptengine.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/scriptengine_p.h b/src/libs/installer/scriptengine_p.h index 696073703..54b6a4fc2 100644 --- a/src/libs/installer/scriptengine_p.h +++ b/src/libs/installer/scriptengine_p.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -42,7 +42,6 @@ #include <QDebug> #include <QDesktopServices> #include <QFileDialog> -#include <QJSEngine> #include <QStandardPaths> namespace QInstaller { @@ -65,18 +64,14 @@ class InstallerProxy : public QObject Q_DISABLE_COPY(InstallerProxy) public: - InstallerProxy(QJSEngine *engine, PackageManagerCore *core) + InstallerProxy(ScriptEngine *engine, PackageManagerCore *core) : m_engine(engine), m_core(core) {} -public slots : - QJSValue componentByName(const QString &componentName) { - if (m_core) - return m_engine->newQObject(m_core->componentByName(componentName)); - return QJSValue(); - } +public slots: + QJSValue componentByName(const QString &componentName); private: - QJSEngine *m_engine; + ScriptEngine *m_engine; PackageManagerCore *m_core; }; diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp index dd14d5e64..8b1f6b0e8 100644 --- a/src/libs/installer/selfrestartoperation.cpp +++ b/src/libs/installer/selfrestartoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/selfrestartoperation.h b/src/libs/installer/selfrestartoperation.h index e67811af6..4b83ff061 100644 --- a/src/libs/installer/selfrestartoperation.h +++ b/src/libs/installer/selfrestartoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/serverauthenticationdialog.cpp b/src/libs/installer/serverauthenticationdialog.cpp index c49839499..aaf38b019 100644 --- a/src/libs/installer/serverauthenticationdialog.cpp +++ b/src/libs/installer/serverauthenticationdialog.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/serverauthenticationdialog.h b/src/libs/installer/serverauthenticationdialog.h index f227639e9..d2a6d4b40 100644 --- a/src/libs/installer/serverauthenticationdialog.h +++ b/src/libs/installer/serverauthenticationdialog.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index b591eed90..bb6f9f1fb 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -304,13 +304,19 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, } if (!s.d->m_data.contains(scRemoveTargetDir)) s.d->m_data.insert(scRemoveTargetDir, scTrue); - if (s.d->m_data.value(scMaintenanceToolName).toString().isEmpty()) - s.d->m_data.insert(scMaintenanceToolName, QLatin1String("maintenancetool")); + if (s.d->m_data.value(scMaintenanceToolName).toString().isEmpty()) { + s.d->m_data.insert(scMaintenanceToolName, + // TODO: Remove deprecated 'UninstallerName'. + s.d->m_data.value(QLatin1String("UninstallerName"), QLatin1String("maintenancetool")) + .toString()); + } if (s.d->m_data.value(scTargetConfigurationFile).toString().isEmpty()) s.d->m_data.insert(scTargetConfigurationFile, QLatin1String("components.xml")); if (s.d->m_data.value(scMaintenanceToolIniFile).toString().isEmpty()) { - s.d->m_data.insert(scMaintenanceToolIniFile, QString(s.maintenanceToolName() - + QLatin1String(".ini"))); + s.d->m_data.insert(scMaintenanceToolIniFile, + // TODO: Remove deprecated 'UninstallerIniFile'. + s.d->m_data.value(QLatin1String("UninstallerIniFile"), QString(s.maintenanceToolName() + + QLatin1String(".ini"))).toString()); } if (!s.d->m_data.contains(scDependsOnLocalInstallerBinary)) s.d->m_data.insert(scDependsOnLocalInstallerBinary, false); @@ -474,7 +480,7 @@ bool Settings::createLocalRepository() const bool Settings::allowSpaceInPath() const { - return d->m_data.value(scAllowSpaceInPath, false).toBool(); + return d->m_data.value(scAllowSpaceInPath, true).toBool(); } bool Settings::allowNonAsciiCharacters() const diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h index ed60219b1..7a2bb1f59 100644 --- a/src/libs/installer/settings.h +++ b/src/libs/installer/settings.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/settingsoperation.cpp b/src/libs/installer/settingsoperation.cpp index 506e5469f..9a9d7c471 100644 --- a/src/libs/installer/settingsoperation.cpp +++ b/src/libs/installer/settingsoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -34,8 +34,8 @@ #include "settingsoperation.h" #include "packagemanagercore.h" #include "kdupdaterupdateoperations.h" +#include "qsettingswrapper.h" -#include <QSettings> #include <QDir> #include <QDebug> @@ -118,7 +118,7 @@ bool SettingsOperation::performOperation() } setValue(QLatin1String("createddir"), mkDirOperation.value(QLatin1String("createddir"))); - QSettings settings(path, QSettings::IniFormat); + QSettingsWrapper settings(path, QSettingsWrapper::IniFormat); if (method == QLatin1String("set")) settings.setValue(key, aValue); else if (method == QLatin1String("remove")) @@ -160,7 +160,7 @@ bool SettingsOperation::undoOperation() bool cleanUp = false; { // kill the scope to kill settings object, else remove file will not work - QSettings settings(path, QSettings::IniFormat); + QSettingsWrapper settings(path, QSettingsWrapper::IniFormat); if (method == QLatin1String("set")) { settings.remove(key); } else if (method == QLatin1String("add_array_value")) { diff --git a/src/libs/installer/settingsoperation.h b/src/libs/installer/settingsoperation.h index c80ac6845..c9b3dca98 100644 --- a/src/libs/installer/settingsoperation.h +++ b/src/libs/installer/settingsoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/simplemovefileoperation.cpp b/src/libs/installer/simplemovefileoperation.cpp index b3f4b6282..5edb392e1 100644 --- a/src/libs/installer/simplemovefileoperation.cpp +++ b/src/libs/installer/simplemovefileoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/simplemovefileoperation.h b/src/libs/installer/simplemovefileoperation.h index 18436397c..56f342094 100644 --- a/src/libs/installer/simplemovefileoperation.h +++ b/src/libs/installer/simplemovefileoperation.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/sysinfo_win.cpp b/src/libs/installer/sysinfo_win.cpp index 5695e3654..969ab69d3 100644 --- a/src/libs/installer/sysinfo_win.cpp +++ b/src/libs/installer/sysinfo_win.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/systeminfo.cpp b/src/libs/installer/systeminfo.cpp index 0cf9cd935..b278252d9 100644 --- a/src/libs/installer/systeminfo.cpp +++ b/src/libs/installer/systeminfo.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/systeminfo.h b/src/libs/installer/systeminfo.h index b352d3f72..89e7f3351 100644 --- a/src/libs/installer/systeminfo.h +++ b/src/libs/installer/systeminfo.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/testrepository.cpp b/src/libs/installer/testrepository.cpp index e611129c0..8a3f306e5 100644 --- a/src/libs/installer/testrepository.cpp +++ b/src/libs/installer/testrepository.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/testrepository.h b/src/libs/installer/testrepository.h index 363d478d2..bcc817b3c 100644 --- a/src/libs/installer/testrepository.h +++ b/src/libs/installer/testrepository.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/uninstallercalculator.cpp b/src/libs/installer/uninstallercalculator.cpp index 726ee735b..6c113d4e5 100644 --- a/src/libs/installer/uninstallercalculator.cpp +++ b/src/libs/installer/uninstallercalculator.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/uninstallercalculator.h b/src/libs/installer/uninstallercalculator.h index 48e666c88..40d4f0d8a 100644 --- a/src/libs/installer/uninstallercalculator.h +++ b/src/libs/installer/uninstallercalculator.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/unziptask.cpp b/src/libs/installer/unziptask.cpp index 3671a9f1e..68538ddf5 100644 --- a/src/libs/installer/unziptask.cpp +++ b/src/libs/installer/unziptask.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/unziptask.h b/src/libs/installer/unziptask.h index b479e7997..0f6fcee0b 100644 --- a/src/libs/installer/unziptask.h +++ b/src/libs/installer/unziptask.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/utils.cpp b/src/libs/installer/utils.cpp index 2b1eab55c..eccd1602d 100644 --- a/src/libs/installer/utils.cpp +++ b/src/libs/installer/utils.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/installer/utils.h b/src/libs/installer/utils.h index 69af257bf..f0a70e11c 100644 --- a/src/libs/installer/utils.h +++ b/src/libs/installer/utils.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/environment.cpp b/src/libs/kdtools/environment.cpp index 76babf377..644e6cbbf 100644 --- a/src/libs/kdtools/environment.cpp +++ b/src/libs/kdtools/environment.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/environment.h b/src/libs/kdtools/environment.h index 013645b87..d590d6dcd 100644 --- a/src/libs/kdtools/environment.h +++ b/src/libs/kdtools/environment.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdgenericfactory.cpp b/src/libs/kdtools/kdgenericfactory.cpp index 683b18876..65cc14913 100644 --- a/src/libs/kdtools/kdgenericfactory.cpp +++ b/src/libs/kdtools/kdgenericfactory.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -129,7 +129,7 @@ /*! \fn KDGenericFactory::~KDGenericFactory() - Destructor. + Destroys the generic factory. */ /*! @@ -139,9 +139,26 @@ */ /*! + \typedef KDGenericFactory::FactoryFunctionWithArg + + This typedef defines a factory function producing an object of type T_Product + with the arguments specified by \a arg. +*/ + +/*! \fn KDGenericFactory::registerProduct( const T_Identifier& name ) - Registers a product of type T, identified by \a name in the factory. + Registers a product of the type T, identified by \a name in the factory. + Any type with the same name gets unregistered. + + If a product was registered via this method, it will be created using its + default constructor. +*/ + +/*! + \fn KDGenericFactory::registerProductWithArg(const T_Identifier &name) + + Registers a product of the type T, identified by \a name, with arguments. Any type with the same name gets unregistered. If a product was registered via this method, it will be created using its @@ -151,6 +168,14 @@ /*! \fn KDGenericFactory::create( const T_Identifier& name ) const - Creates and returns a product of the type identified by \a name. + Creates and returns a product of the type T identified by \a name. + Ownership of the product is transferred to the caller. +*/ + +/*! + \fn KDGenericFactory::createWithArg(const T_Identifier &name, const T_Argument &arg) const + + Creates and returns a product of the type T identified by \a name with the + arguments specified by \a arg. Ownership of the product is transferred to the caller. */ diff --git a/src/libs/kdtools/kdgenericfactory.h b/src/libs/kdtools/kdgenericfactory.h index c4826dfb9..cca53e986 100644 --- a/src/libs/kdtools/kdgenericfactory.h +++ b/src/libs/kdtools/kdgenericfactory.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdjob.cpp b/src/libs/kdtools/kdjob.cpp index 0a0636fa8..43ca36875 100644 --- a/src/libs/kdtools/kdjob.cpp +++ b/src/libs/kdtools/kdjob.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdjob.h b/src/libs/kdtools/kdjob.h index dfa85df5f..14231e7ed 100644 --- a/src/libs/kdtools/kdjob.h +++ b/src/libs/kdtools/kdjob.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile.cpp b/src/libs/kdtools/kdlockfile.cpp index 42d6d5711..c929298e3 100644 --- a/src/libs/kdtools/kdlockfile.cpp +++ b/src/libs/kdtools/kdlockfile.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile.h b/src/libs/kdtools/kdlockfile.h index 348d2f72e..615793fb4 100644 --- a/src/libs/kdtools/kdlockfile.h +++ b/src/libs/kdtools/kdlockfile.h @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile_p.h b/src/libs/kdtools/kdlockfile_p.h index 152393b85..8c482a3a0 100644 --- a/src/libs/kdtools/kdlockfile_p.h +++ b/src/libs/kdtools/kdlockfile_p.h @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile_unix.cpp b/src/libs/kdtools/kdlockfile_unix.cpp index eac314bbe..938961ac2 100644 --- a/src/libs/kdtools/kdlockfile_unix.cpp +++ b/src/libs/kdtools/kdlockfile_unix.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile_win.cpp b/src/libs/kdtools/kdlockfile_win.cpp index 3fde9de3a..963ba682f 100644 --- a/src/libs/kdtools/kdlockfile_win.cpp +++ b/src/libs/kdtools/kdlockfile_win.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdrunoncechecker.cpp b/src/libs/kdtools/kdrunoncechecker.cpp index 8e4c42711..dbc9cb30d 100644 --- a/src/libs/kdtools/kdrunoncechecker.cpp +++ b/src/libs/kdtools/kdrunoncechecker.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdrunoncechecker.h b/src/libs/kdtools/kdrunoncechecker.h index 92051ee9f..9ee71b8e0 100644 --- a/src/libs/kdtools/kdrunoncechecker.h +++ b/src/libs/kdtools/kdrunoncechecker.h @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdselfrestarter.cpp b/src/libs/kdtools/kdselfrestarter.cpp index b3803db28..358076506 100644 --- a/src/libs/kdtools/kdselfrestarter.cpp +++ b/src/libs/kdtools/kdselfrestarter.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdselfrestarter.h b/src/libs/kdtools/kdselfrestarter.h index 10956360b..3808ac207 100644 --- a/src/libs/kdtools/kdselfrestarter.h +++ b/src/libs/kdtools/kdselfrestarter.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo.cpp b/src/libs/kdtools/kdsysinfo.cpp index 47002a4cc..c56e4c98f 100644 --- a/src/libs/kdtools/kdsysinfo.cpp +++ b/src/libs/kdtools/kdsysinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo.h b/src/libs/kdtools/kdsysinfo.h index aa163bfc5..4b8f24fa1 100644 --- a/src/libs/kdtools/kdsysinfo.h +++ b/src/libs/kdtools/kdsysinfo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo_mac.cpp b/src/libs/kdtools/kdsysinfo_mac.cpp index 1394aa912..8c25bde42 100644 --- a/src/libs/kdtools/kdsysinfo_mac.cpp +++ b/src/libs/kdtools/kdsysinfo_mac.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo_win.cpp b/src/libs/kdtools/kdsysinfo_win.cpp index 531e9b03c..545cc6aad 100644 --- a/src/libs/kdtools/kdsysinfo_win.cpp +++ b/src/libs/kdtools/kdsysinfo_win.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo_x11.cpp b/src/libs/kdtools/kdsysinfo_x11.cpp index 140754707..1e0a109b7 100644 --- a/src/libs/kdtools/kdsysinfo_x11.cpp +++ b/src/libs/kdtools/kdsysinfo_x11.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdtoolsglobal.h b/src/libs/kdtools/kdtoolsglobal.h index d2b4730a2..5daedb9c5 100644 --- a/src/libs/kdtools/kdtoolsglobal.h +++ b/src/libs/kdtools/kdtoolsglobal.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdater.h b/src/libs/kdtools/kdupdater.h index b1e6cd582..bd873227a 100644 --- a/src/libs/kdtools/kdupdater.h +++ b/src/libs/kdtools/kdupdater.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterapplication.cpp b/src/libs/kdtools/kdupdaterapplication.cpp index bd766b436..95c3613da 100644 --- a/src/libs/kdtools/kdupdaterapplication.cpp +++ b/src/libs/kdtools/kdupdaterapplication.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -45,20 +45,47 @@ using namespace KDUpdater; /*! \inmodule kdupdater \namespace KDUpdater - \brief The KDUpdater classes where initially developed by KDAB to help provide automatic - updates for your applications. Now they are solely part of the Qt Installer Framework. + \brief The KDUpdater classes provide functions to automatically detect + updates to applications, to retrieve them from external repositories, and to + install them. + + KDUpdater classes are a fork of KDAB's general + \l{http://docs.kdab.com/kdtools/2.2.2/group__kdupdater.html}{KDUpdater module}. +*/ + +/*! + \class KDUpdater::ConfigurationInterface + \inmodule kdupdater + \brief The ConfigurationInterface class provides an interface for configuring + an application. +*/ + +/*! + \fn KDUpdater::ConfigurationInterface::~ConfigurationInterface() + Destroys the configuration interface. +*/ + +/*! + \fn KDUpdater::ConfigurationInterface::value(const QString &key) const + Returns the value of the key \a key. +*/ + +/*! + \fn KDUpdater::ConfigurationInterface::setValue(const QString &key, const QVariant &value) + Sets the value \a value for the key \a key. */ /*! \class KDUpdater::Application \inmodule kdupdater - \brief The \c Application class represents an application that can be updated. + \brief The Application class represents an application that can be updated. A KDUpdater application is an application that interacts with one or more update servers and downloads or installs updates. This class helps in describing an application in terms of: \list \li Application Directory - \li Packages XML file name and its corresponding KDUpdater::PackagesInfo object + \li Installation information XML file name and its corresponding + KDUpdater::PackagesInfo object \li Update sources XML file name and its corresponding KDUpdater::UpdateSourcesInfo object \endlist @@ -106,8 +133,7 @@ struct Application::ApplicationData Application *Application::ApplicationData::instance = 0; /*! - Constructs the \c Application class and configures it to assume the application directory to be - the directory in which the application exists. + Constructs an application with the parent \a p and configuration class \a config. */ Application::Application(ConfigurationInterface* config, QObject* p) : QObject(p) { @@ -121,7 +147,7 @@ Application::Application(ConfigurationInterface* config, QObject* p) : QObject(p } /*! - Destructor + Destroys the application. */ Application::~Application() { @@ -131,7 +157,7 @@ Application::~Application() } /*! - Returns a previously created \c Application instance. + Returns a previously created application instance. */ Application *Application::instance() { @@ -139,8 +165,8 @@ Application *Application::instance() } /*! - Sets the application directory path directory to \a dir. The package XML and update sources - XML files found in the new application directory will be used. + Sets the application directory path directory to \a dir. The installation information and + update sources XML files found in the new application directory will be used. */ void Application::setApplicationDirectory(const QString &dir) { @@ -186,7 +212,8 @@ QString Application::applicationVersion() const } /*! - Adds update source info to this class. + Adds the \a name, \a title, \a description, \a url, and \a priority of the + update source to this class. \sa KDUpdater::UpdateSourceInfo \sa KDUpdater::UpdateSourcesInfo @@ -205,8 +232,8 @@ void Application::addUpdateSource(const QString &name, const QString &title, /*! - Sets the file name of the package XML file for this application to \a fileName. By default, - this is assumed to be Packages.xml in the application directory. + Sets the file name of the installation information XML file for this application to \a fileName. + By default, this is assumed to be Packages.xml in the application directory. \sa KDUpdater::PackagesInfo::setFileName() */ @@ -216,7 +243,7 @@ void Application::setPackagesXMLFileName(const QString &fileName) } /*! - Returns the package XML file name. + Returns the installation information XML file name. */ QString Application::packagesXMLFileName() const { @@ -232,8 +259,9 @@ PackagesInfo* Application::packagesInfo() const } /*! - Sets the file name of the update sources XML file for this application. By default, this is - assumed to be UpdateSources.xml in the application directory. + Sets \a fileName as the file name of the update sources XML file for this + application. By default, this is assumed to be UpdateSources.xml in the + application directory. \sa KDUpdater::UpdateSourcesInfo::setFileName() */ @@ -258,16 +286,25 @@ UpdateSourcesInfo* Application::updateSourcesInfo() const return d->updateSourcesInfo; } +/*! + Prints the error code \a errorCode and error message specified by \a error. +*/ void Application::printError(int errorCode, const QString &error) { qDebug() << errorCode << error; } +/*! + Returns a list of files that are scheduled for delayed deletion. +*/ QStringList Application::filesForDelayedDeletion() const { return d->filesForDelayedDeletion; } +/*! + Schedules \a files for delayed deletion. +*/ void Application::addFilesForDelayedDeletion(const QStringList &files) { d->filesForDelayedDeletion << files; diff --git a/src/libs/kdtools/kdupdaterapplication.h b/src/libs/kdtools/kdupdaterapplication.h index c148a2be8..fec066880 100644 --- a/src/libs/kdtools/kdupdaterapplication.h +++ b/src/libs/kdtools/kdupdaterapplication.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterfiledownloader.cpp b/src/libs/kdtools/kdupdaterfiledownloader.cpp index 9f656cb77..735358afe 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader.cpp +++ b/src/libs/kdtools/kdupdaterfiledownloader.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -70,17 +70,112 @@ static double calcProgress(qint64 done, qint64 total) File downloaders are used by the KDUpdater::Update class to download update files. Each subclass of FileDownloader can download files from a specific category of sources (such as - local, ftp, http). + \c local, \c ftp, \c http). - This is an internal class, not a part of the public API. Currently we have three - subclasses of FileDownloader + This is an internal class, not a part of the public API. Currently we have the + following subclasses of FileDownloader: \list - \li Use the FtpDownloader to download files from an FTP site. - \li Use the HttpDownloader to download files from an HTTP site. - \li Use the LocalFileDownloader to download files from the local file system. + \li HttpDownloader to download files over FTP, HTTP, or HTTPS if Qt is built with SSL. + \li LocalFileDownloader to copy files from the local file system. + \li ResourceFileDownloader to download resource files. \endlist */ +/*! + \property FileDownloader::autoRemoveDownloadedFile + \brief Whether the downloaded file should be automatically removed after it + is downloaded and the class goes out of scope. +*/ + +/*! + \property FileDownloader::url + \brief The URL to download files from. +*/ + +/*! + \property FileDownloader::scheme + \brief The scheme to use for downloading files. + */ + +/*! + \fn FileDownloader::authenticatorChanged(const QAuthenticator &authenticator) + This signal is emitted when the authenticator changes to \a authenticator. +*/ + +/*! + \fn FileDownloader::canDownload() const = 0 + Returns \c true if the file exists and is readable. +*/ + +/*! + \fn FileDownloader::clone(QObject *parent=0) const = 0 + Clones the local file downloader and assigns it the parent \a parent. +*/ + +/*! + \fn FileDownloader::downloadCanceled() + This signal is emitted if downloading a file is canceled. +*/ + +/*! + \fn FileDownloader::downloadedFileName() const = 0 + Returns the file name of the downloaded file. +*/ + +/*! + \fn FileDownloader::downloadProgress(double progress) + This signal is emitted with the current download \a progress. +*/ + +/*! + \fn FileDownloader::downloadProgress(qint64 bytesReceived, qint64 bytesToReceive) + This signal is emitted with the download progress as the number of received bytes, + \a bytesReceived, and the total size of the file to download, \a bytesToReceive. +*/ + +/*! + \fn FileDownloader::downloadSpeed(qint64 bytesPerSecond) + This signal is emitted with the download speed in bytes per second as \a bytesPerSecond. +*/ + +/*! + \fn FileDownloader::downloadStarted() + This signal is emitted when downloading a file starts. +*/ + +/*! + \fn FileDownloader::downloadStatus(const QString &status) + This signal is emitted with textual representation of the current download \a status in the + following format: "100 MiB of 150 MiB - (DAYS) (HOURS) (MINUTES) (SECONDS) remaining". +*/ + +/*! + \fn FileDownloader::estimatedDownloadTime(int seconds) + This signal is emitted with the estimated download time in \a seconds. +*/ + +/*! + \fn FileDownloader::isDownloaded() const = 0 + Returns \c true if the file is downloaded. +*/ + +/*! + \fn FileDownloader::onError() = 0 + Closes the destination file if an error occurs during copying and stops + the download speed timer. +*/ + +/*! + \fn FileDownloader::onSuccess() = 0 + Closes the destination file after it has been successfully copied and stops + the download speed timer. +*/ + +/*! + \fn FileDownloader::setDownloadedFileName(const QString &name) = 0 + Sets the file name of the downloaded file to \a name. +*/ + struct KDUpdater::FileDownloader::Private { Private() @@ -130,6 +225,9 @@ struct KDUpdater::FileDownloader::Private bool m_ignoreSslErrors; }; +/*! + Creates a file downloader with the scheme \a scheme and parent \a parent. +*/ KDUpdater::FileDownloader::FileDownloader(const QString &scheme, QObject *parent) : QObject(parent) , d(new Private) @@ -138,6 +236,9 @@ KDUpdater::FileDownloader::FileDownloader(const QString &scheme, QObject *parent d->followRedirect = false; } +/*! + Destroys the file downloader. +*/ KDUpdater::FileDownloader::~FileDownloader() { delete d; @@ -153,26 +254,42 @@ QUrl KDUpdater::FileDownloader::url() const return d->url; } +/*! + Returns the SHA-1 checksum of the downloaded file. +*/ QByteArray KDUpdater::FileDownloader::sha1Sum() const { return d->m_hash.result(); } +/*! + Returns the assumed SHA-1 checksum of the file to download. +*/ QByteArray KDUpdater::FileDownloader::assumedSha1Sum() const { return d->m_assumedSha1Sum; } +/*! + Sets the assumed SHA-1 checksum of the file to download to \a sum. +*/ void KDUpdater::FileDownloader::setAssumedSha1Sum(const QByteArray &sum) { d->m_assumedSha1Sum = sum; } +/*! + Returns an error message. +*/ QString FileDownloader::errorString() const { return d->errorString; } +/*! + Sets the human readable description of the last error that occurred to \a error. Emits the + downloadStatus() and downloadAborted() signals. +*/ void FileDownloader::setDownloadAborted(const QString &error) { d->errorString = error; @@ -180,6 +297,15 @@ void FileDownloader::setDownloadAborted(const QString &error) emit downloadAborted(error); } +/*! + Sets the download status to \c completed and displays a status message. + + If an assumed SHA-1 checksum is set and the actual calculated checksum does not match it, sets + the status to \c error. If no SHA-1 is assumed, no check is performed, and status is set to + \c success. + + Emits the downloadCompleted() and downloadStatus() signals on success. +*/ void KDUpdater::FileDownloader::setDownloadCompleted() { if (d->m_assumedSha1Sum.isEmpty() || (d->m_assumedSha1Sum == sha1Sum())) { @@ -192,6 +318,9 @@ void KDUpdater::FileDownloader::setDownloadCompleted() } } +/*! + Emits the downloadCanceled() and downloadStatus() signals. +*/ void KDUpdater::FileDownloader::setDownloadCanceled() { emit downloadCanceled(); @@ -213,11 +342,17 @@ void KDUpdater::FileDownloader::setAutoRemoveDownloadedFile(bool val) d->autoRemove = val; } +/*! + Determines that redirects should be followed if \a val is \c true. +*/ void KDUpdater::FileDownloader::setFollowRedirects(bool val) { d->followRedirect = val; } +/*! + Returns whether redirects should be followed. +*/ bool KDUpdater::FileDownloader::followRedirects() const { return d->followRedirect; @@ -228,43 +363,68 @@ bool KDUpdater::FileDownloader::isAutoRemoveDownloadedFile() const return d->autoRemove; } +/*! + Downloads files. +*/ void KDUpdater::FileDownloader::download() { QMetaObject::invokeMethod(this, "doDownload", Qt::QueuedConnection); } +/*! + Cancels file download. +*/ void KDUpdater::FileDownloader::cancelDownload() { // Do nothing } +/*! + Starts the download speed timer. +*/ void KDUpdater::FileDownloader::runDownloadSpeedTimer() { if (!d->m_timer.isActive()) d->m_timer.start(d->m_speedTimerInterval, this); } +/*! + Stops the download speed timer. +*/ void KDUpdater::FileDownloader::stopDownloadSpeedTimer() { d->m_timer.stop(); } +/*! + Adds \a sample to the current speed bin. +*/ void KDUpdater::FileDownloader::addSample(qint64 sample) { d->m_currentSpeedBin += sample; } +/*! + Returns the download speed timer ID. +*/ int KDUpdater::FileDownloader::downloadSpeedTimerId() const { return d->m_timer.timerId(); } +/*! + Sets the file download progress to the number of received bytes, \a bytesReceived, + and the number of total bytes to receive, \a bytesToReceive. +*/ void KDUpdater::FileDownloader::setProgress(qint64 bytesReceived, qint64 bytesToReceive) { d->m_bytesReceived = bytesReceived; d->m_bytesToReceive = bytesToReceive; } +/*! + Calculates the download speed in bytes per second and emits the downloadSpeed() signal. +*/ void KDUpdater::FileDownloader::emitDownloadSpeed() { unsigned int windowSize = sizeof(d->m_samples) / sizeof(qint64); @@ -290,6 +450,12 @@ void KDUpdater::FileDownloader::emitDownloadSpeed() emit downloadSpeed(d->m_downloadSpeed); } +/*! + Builds a textual representation of the download status in the following format: + "100 MiB of 150 MiB - (DAYS) (HOURS) (MINUTES) (SECONDS) remaining". + + Emits the downloadStatus() signal. +*/ void KDUpdater::FileDownloader::emitDownloadStatus() { QString status; @@ -342,11 +508,17 @@ void KDUpdater::FileDownloader::emitDownloadStatus() emit downloadStatus(status); } +/*! + Emits dowload progress. +*/ void KDUpdater::FileDownloader::emitDownloadProgress() { emit downloadProgress(d->m_bytesReceived, d->m_bytesToReceive); } +/*! + Emits the estimated download time. +*/ void KDUpdater::FileDownloader::emitEstimatedDownloadTime() { if (d->m_bytesToReceive <= 0 || d->m_downloadSpeed <= 0) { @@ -356,16 +528,25 @@ void KDUpdater::FileDownloader::emitEstimatedDownloadTime() emit estimatedDownloadTime((d->m_bytesToReceive - d->m_bytesReceived) / d->m_downloadSpeed); } +/*! + \overload addCheckSumData() +*/ void KDUpdater::FileDownloader::addCheckSumData(const QByteArray &data) { d->m_hash.addData(data); } +/*! + Adds the \a length of characters of \a data to the cryptographic hash of the downloaded file. +*/ void KDUpdater::FileDownloader::addCheckSumData(const char *data, int length) { d->m_hash.addData(data, length); } +/*! + Resets SHA-1 checksum data of the downloaded file. +*/ void KDUpdater::FileDownloader::resetCheckSumData() { d->m_hash.reset(); @@ -373,8 +554,8 @@ void KDUpdater::FileDownloader::resetCheckSumData() /*! - Returns a copy of the proxy factory that this FileDownloader object is using to determine the proxies to - be used for requests. + Returns a copy of the proxy factory that this FileDownloader object is using to determine the + proxies to be used for requests. */ FileDownloaderProxyFactory *KDUpdater::FileDownloader::proxyFactory() const { @@ -384,9 +565,9 @@ FileDownloaderProxyFactory *KDUpdater::FileDownloader::proxyFactory() const } /*! - Sets the proxy factory for this class to be \a factory. A proxy factory is used to determine a more - specific list of proxies to be used for a given request, instead of trying to use the same proxy value - for all requests. This might only be of use for http or ftp requests. + Sets the proxy factory for this class to be \a factory. A proxy factory is used to determine a + more specific list of proxies to be used for a given request, instead of trying to use the same + proxy value for all requests. This might only be of use for HTTP or FTP requests. */ void KDUpdater::FileDownloader::setProxyFactory(FileDownloaderProxyFactory *factory) { @@ -395,8 +576,8 @@ void KDUpdater::FileDownloader::setProxyFactory(FileDownloaderProxyFactory *fact } /*! - Returns a copy of the authenticator that this FileDownloader object is using to set the username and - password for download request. + Returns a copy of the authenticator that this FileDownloader object is using to set the username + and password for a download request. */ QAuthenticator KDUpdater::FileDownloader::authenticator() const { @@ -404,9 +585,9 @@ QAuthenticator KDUpdater::FileDownloader::authenticator() const } /*! - Sets the authenticator object for this class to be \a authenticator. A authenticator is used to - pass on the required authentication information. This might only be of use for http or ftp requests. - Emits the authenticator changed signal with the new authenticator in use. + Sets the authenticator object for this class to be \a authenticator. An authenticator is used to + pass on the required authentication information. This might only be of use for HTTP or FTP + requests. Emits the authenticator changed signal with the new authenticator in use. */ void KDUpdater::FileDownloader::setAuthenticator(const QAuthenticator &authenticator) { @@ -416,11 +597,17 @@ void KDUpdater::FileDownloader::setAuthenticator(const QAuthenticator &authentic } } +/*! + Returns \c true if SSL errors should be ignored. +*/ bool KDUpdater::FileDownloader::ignoreSslErrors() { return d->m_ignoreSslErrors; } +/*! + Determines that SSL errors should be ignored if \a ignore is \c true. +*/ void KDUpdater::FileDownloader::setIgnoreSslErrors(bool ignore) { d->m_ignoreSslErrors = ignore; @@ -428,20 +615,17 @@ void KDUpdater::FileDownloader::setIgnoreSslErrors(bool ignore) // -- KDUpdater::LocalFileDownloader -/* - Even though QFile::copy() does the task of copying local files from one place - to another, I prefer to use the timer and copy one block of data per unit time. - - This is because, it is possible that the user of KDUpdater is simultaneously - downloading several files. Sometimes in tandem with other file downloaders. - If the local file that is being downloaded takes a long time; then that will - hang the other downloads. - - On the other hand, local downloads need not actually download the file. It can - simply pass on the source file as destination file. At this moment however, - I think the user of LocalFileDownloader will assume that the downloaded file - can be fiddled around with without worrying about whether it would mess up - the original source or not. +/*! + \inmodule kdupdater + \class KDUpdater::LocalFileDownloader + \brief The LocalFileDownloader class is used to copy files from the local + file system. + + The user of KDUpdater might be simultaneously downloading several files; + sometimes in parallel to other file downloaders. If copying a local file takes + a long time, it will make the other downloads hang. Therefore, a timer is used + and one block of data is copied per unit time, even though QFile::copy() does the + task of copying local files from one place to another. */ struct KDUpdater::LocalFileDownloader::Private @@ -460,12 +644,18 @@ struct KDUpdater::LocalFileDownloader::Private int timerId; }; +/*! + Creates a local file downloader with the parent \a parent. +*/ KDUpdater::LocalFileDownloader::LocalFileDownloader(QObject *parent) : KDUpdater::FileDownloader(QLatin1String("file"), parent) , d (new Private) { } +/*! + Destroys the local file downloader. +*/ KDUpdater::LocalFileDownloader::~LocalFileDownloader() { if (this->isAutoRemoveDownloadedFile() && !d->destFileName.isEmpty()) @@ -474,12 +664,18 @@ KDUpdater::LocalFileDownloader::~LocalFileDownloader() delete d; } +/*! + Returns \c true if the file exists and is readable. +*/ bool KDUpdater::LocalFileDownloader::canDownload() const { QFileInfo fi(url().toLocalFile()); return fi.exists() && fi.isReadable(); } +/*! + Returns \c true if the file is copied. +*/ bool KDUpdater::LocalFileDownloader::isDownloaded() const { return d->downloaded; @@ -529,21 +725,34 @@ void KDUpdater::LocalFileDownloader::doDownload() emit downloadProgress(0); } +/*! + Returns the file name of the copied file. +*/ QString KDUpdater::LocalFileDownloader::downloadedFileName() const { return d->destFileName; } +/*! + Sets the file name of the copied file to \a name. +*/ void KDUpdater::LocalFileDownloader::setDownloadedFileName(const QString &name) { d->destFileName = name; } +/*! + Clones the local file downloader and assigns it the parent \a parent. Returns + the new local file downloader. +*/ KDUpdater::LocalFileDownloader *KDUpdater::LocalFileDownloader::clone(QObject *parent) const { return new LocalFileDownloader(parent); } +/*! + Cancels copying the file. +*/ void KDUpdater::LocalFileDownloader::cancelDownload() { if (d->timerId < 0) @@ -556,6 +765,9 @@ void KDUpdater::LocalFileDownloader::cancelDownload() setDownloadCanceled(); } +/*! + Called when the download timer event \a event occurs. +*/ void KDUpdater::LocalFileDownloader::timerEvent(QTimerEvent *event) { if (event->timerId() == d->timerId) { @@ -602,6 +814,10 @@ void KDUpdater::LocalFileDownloader::timerEvent(QTimerEvent *event) } } +/*! + Closes the destination file after it has been successfully copied and stops + the download speed timer. +*/ void LocalFileDownloader::onSuccess() { d->downloaded = true; @@ -616,6 +832,10 @@ void LocalFileDownloader::onSuccess() stopDownloadSpeedTimer(); } +/*! + Clears the destination file if an error occurs during copying and stops + the download speed timer. +*/ void LocalFileDownloader::onError() { d->downloaded = false; @@ -630,6 +850,11 @@ void LocalFileDownloader::onError() // -- ResourceFileDownloader +/*! + \inmodule kdupdater + \class KDUpdater::ResourceFileDownloader + \brief The ResourceFileDownloader class can be used to download resource files. +*/ struct KDUpdater::ResourceFileDownloader::Private { Private() @@ -642,28 +867,43 @@ struct KDUpdater::ResourceFileDownloader::Private bool downloaded; }; +/*! + Creates a resource file downloader with the parent \a parent. +*/ KDUpdater::ResourceFileDownloader::ResourceFileDownloader(QObject *parent) : KDUpdater::FileDownloader(QLatin1String("resource"), parent) , d(new Private) { } +/*! + Destroys the resource file downloader. +*/ KDUpdater::ResourceFileDownloader::~ResourceFileDownloader() { delete d; } +/*! + Returns \c true if the file exists and is readable. +*/ bool KDUpdater::ResourceFileDownloader::canDownload() const { const QFileInfo fi(QInstaller::pathFromUrl(url())); return fi.exists() && fi.isReadable(); } +/*! + Returns \c true if the file is downloaded. +*/ bool KDUpdater::ResourceFileDownloader::isDownloaded() const { return d->downloaded; } +/*! + Downloads a resource file. +*/ void KDUpdater::ResourceFileDownloader::doDownload() { // Already downloaded @@ -686,21 +926,34 @@ void KDUpdater::ResourceFileDownloader::doDownload() d->timerId = startTimer(0); // start as fast as possible } +/*! + Returns the file name of the downloaded file. +*/ QString KDUpdater::ResourceFileDownloader::downloadedFileName() const { return d->destFile.fileName(); } +/*! + Sets the file name of the downloaded file to \a name. +*/ void KDUpdater::ResourceFileDownloader::setDownloadedFileName(const QString &/*name*/) { // Not supported! } +/*! + Clones the resource file downloader and assigns it the parent \a parent. Returns + the new resource file downloader. +*/ KDUpdater::ResourceFileDownloader *KDUpdater::ResourceFileDownloader::clone(QObject *parent) const { return new ResourceFileDownloader(parent); } +/*! + Cancels downloading the file. +*/ void KDUpdater::ResourceFileDownloader::cancelDownload() { if (d->timerId < 0) @@ -712,6 +965,9 @@ void KDUpdater::ResourceFileDownloader::cancelDownload() setDownloadCanceled(); } +/*! + Called when the download timer event \a event occurs. +*/ void KDUpdater::ResourceFileDownloader::timerEvent(QTimerEvent *event) { if (event->timerId() == d->timerId) { @@ -748,6 +1004,10 @@ void KDUpdater::ResourceFileDownloader::timerEvent(QTimerEvent *event) } } +/*! + Closes the destination file after it has been successfully copied and stops + the download speed timer. +*/ void KDUpdater::ResourceFileDownloader::onSuccess() { d->destFile.close(); @@ -755,6 +1015,10 @@ void KDUpdater::ResourceFileDownloader::onSuccess() stopDownloadSpeedTimer(); } +/*! + Closes the destination file if an error occurs during copying and stops + the download speed timer. +*/ void KDUpdater::ResourceFileDownloader::onError() { d->destFile.close(); @@ -766,6 +1030,13 @@ void KDUpdater::ResourceFileDownloader::onError() // -- KDUpdater::HttpDownloader +/*! + \inmodule kdupdater + \class KDUpdater::HttpDownloader + \brief The HttpDownloader class is used to download files over FTP, HTTP, or HTTPS. + + HTTPS is supported if Qt is built with SSL. +*/ struct KDUpdater::HttpDownloader::Private { explicit Private(HttpDownloader *qq) @@ -798,6 +1069,9 @@ struct KDUpdater::HttpDownloader::Private } }; +/*! + Creates an HTTP downloader with the parent \a parent. +*/ KDUpdater::HttpDownloader::HttpDownloader(QObject *parent) : KDUpdater::FileDownloader(QLatin1String("http"), parent) , d(new Private(this)) @@ -810,6 +1084,12 @@ KDUpdater::HttpDownloader::HttpDownloader(QObject *parent) SLOT(onAuthenticationRequired(QNetworkReply*, QAuthenticator*))); } +/*! + Destroys an HTTP downloader. + + Removes the downloaded file if FileDownloader::isAutoRemoveDownloadedFile() returns \c true or + FileDownloader::setAutoRemoveDownloadedFile() was called with \c true. +*/ KDUpdater::HttpDownloader::~HttpDownloader() { if (this->isAutoRemoveDownloadedFile() && !d->destFileName.isEmpty()) @@ -817,12 +1097,18 @@ KDUpdater::HttpDownloader::~HttpDownloader() delete d; } +/*! + Returns \c true if the file exists and is readable. +*/ bool KDUpdater::HttpDownloader::canDownload() const { // TODO: Check whether the http file actually exists or not. return true; } +/*! + Returns \c true if the file is downloaded. +*/ bool KDUpdater::HttpDownloader::isDownloaded() const { return d->downloaded; @@ -840,16 +1126,26 @@ void KDUpdater::HttpDownloader::doDownload() runDownloadSpeedTimer(); } +/*! + Returns the file name of the downloaded file. +*/ QString KDUpdater::HttpDownloader::downloadedFileName() const { return d->destFileName; } +/*! + Sets the file name of the downloaded file to \a name. +*/ void KDUpdater::HttpDownloader::setDownloadedFileName(const QString &name) { d->destFileName = name; } +/*! + Clones the HTTP downloader and assigns it the parent \a parent. Returns the new + HTTP downloader. +*/ KDUpdater::HttpDownloader *KDUpdater::HttpDownloader::clone(QObject *parent) const { return new HttpDownloader(parent); @@ -884,6 +1180,9 @@ void KDUpdater::HttpDownloader::httpError(QNetworkReply::NetworkError) httpDone(true); } +/*! + Cancels downloading the file. +*/ void KDUpdater::HttpDownloader::cancelDownload() { d->aborted = true; @@ -914,6 +1213,10 @@ void KDUpdater::HttpDownloader::httpDone(bool error) //PENDING: what about the non-error case?? } +/*! + Closes the destination file if an error occurs during copying and stops + the download speed timer. +*/ void KDUpdater::HttpDownloader::onError() { d->downloaded = false; @@ -923,6 +1226,10 @@ void KDUpdater::HttpDownloader::onError() stopDownloadSpeedTimer(); } +/*! + Closes the destination file after it has been successfully copied and stops + the download speed timer. +*/ void KDUpdater::HttpDownloader::onSuccess() { d->downloaded = true; @@ -967,6 +1274,9 @@ void KDUpdater::HttpDownloader::httpReadProgress(qint64 done, qint64 total) emit downloadProgress(calcProgress(done, total)); } +/*! + Called when the download timer event \a event occurs. +*/ void KDUpdater::HttpDownloader::timerEvent(QTimerEvent *event) { if (event->timerId() == downloadSpeedTimerId()) { diff --git a/src/libs/kdtools/kdupdaterfiledownloader.h b/src/libs/kdtools/kdupdaterfiledownloader.h index c8016b082..0a4cbce22 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader.h +++ b/src/libs/kdtools/kdupdaterfiledownloader.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterfiledownloader_p.h b/src/libs/kdtools/kdupdaterfiledownloader_p.h index b25e25b7d..e3be06ae4 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader_p.h +++ b/src/libs/kdtools/kdupdaterfiledownloader_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp b/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp index 39e6ba952..fad1023d1 100644 --- a/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp +++ b/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -49,7 +49,9 @@ using namespace KDUpdater; be created and its reference can be fetched from the instance() method. */ - +/*! + Returns the file downloader factory instance. +*/ FileDownloaderFactory& FileDownloaderFactory::instance() { static KDUpdater::FileDownloaderFactory theFactory; @@ -57,7 +59,7 @@ FileDownloaderFactory& FileDownloaderFactory::instance() } /*! - Constructor + Constructs a file downloader factory and registers the default file downloader set. */ FileDownloaderFactory::FileDownloaderFactory() : d (new FileDownloaderFactoryData) @@ -78,42 +80,66 @@ FileDownloaderFactory::FileDownloaderFactory() d->m_followRedirects = false; } +/*! + Returns whether redirects should be followed. +*/ bool FileDownloaderFactory::followRedirects() { return FileDownloaderFactory::instance().d->m_followRedirects; } +/*! + Determines that redirects should be followed if \a val is \c true. +*/ void FileDownloaderFactory::setFollowRedirects(bool val) { FileDownloaderFactory::instance().d->m_followRedirects = val; } +/*! + Sets \a factory as the file downloader proxy factory. +*/ void FileDownloaderFactory::setProxyFactory(FileDownloaderProxyFactory *factory) { delete FileDownloaderFactory::instance().d->m_factory; FileDownloaderFactory::instance().d->m_factory = factory; } +/*! + Returns \c true if SSL errors should be ignored. +*/ bool FileDownloaderFactory::ignoreSslErrors() { return FileDownloaderFactory::instance().d->m_ignoreSslErrors; } +/*! + Determines that SSL errors should be ignored if \a ignore is \c true. +*/ void FileDownloaderFactory::setIgnoreSslErrors(bool ignore) { FileDownloaderFactory::instance().d->m_ignoreSslErrors = ignore; } +/*! + Destroys the file downloader factory. +*/ FileDownloaderFactory::~FileDownloaderFactory() { delete d; } +/*! + Returns a list of supported schemes. +*/ QStringList FileDownloaderFactory::supportedSchemes() { return FileDownloaderFactory::instance().d->m_supportedSchemes; } +/*! + Returns \c true if \a scheme is a supported scheme. +*/ bool FileDownloaderFactory::isSupportedScheme(const QString &scheme) { return FileDownloaderFactory::instance().d->m_supportedSchemes.contains(scheme @@ -121,8 +147,9 @@ bool FileDownloaderFactory::isSupportedScheme(const QString &scheme) } /*! - Returns a new instance of a KDUpdater::FileDownloader subclass. The subclass is instantiated - based on the communication protocol string stored in \a scheme. + Returns a new instance of a KDUpdater::FileDownloader subclass. The + instantiation of a subclass depends on the communication protocol string + stored in \a scheme with the parent \a parent. \note Ownership of the created object remains with the programmer. */ @@ -147,3 +174,26 @@ FileDownloader *FileDownloaderFactory::create(const QString &scheme, QObject *pa a downloader with the same scheme, the downloader is replaced. When create() is called with that \a scheme, the file downloader is constructed using its default constructor. */ + +/*! + \inmodule kdupdater + \class KDUpdater::FileDownloaderProxyFactory + \brief The FileDownloaderProxyFactory class provides fine-grained proxy selection. + + File downloader objects use a proxy factory to determine a more specific + list of proxies to be used for a given request, instead of trying to use the + same proxy value for all requests. This might only be of use for HTTP or FTP + requests. +*/ + +/*! + \fn FileDownloaderProxyFactory::~FileDownloaderProxyFactory() + + Destroys the file downloader proxy factory. +*/ + +/*! + \fn FileDownloaderProxyFactory::clone() const + + Clones a file downloader proxy factory. +*/ diff --git a/src/libs/kdtools/kdupdaterfiledownloaderfactory.h b/src/libs/kdtools/kdupdaterfiledownloaderfactory.h index 4e95755de..ea85f2a05 100644 --- a/src/libs/kdtools/kdupdaterfiledownloaderfactory.h +++ b/src/libs/kdtools/kdupdaterfiledownloaderfactory.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterpackagesinfo.cpp b/src/libs/kdtools/kdupdaterpackagesinfo.cpp index 6eb32f1e3..78540e64d 100644 --- a/src/libs/kdtools/kdupdaterpackagesinfo.cpp +++ b/src/libs/kdtools/kdupdaterpackagesinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -325,7 +325,11 @@ void PackagesInfo::refresh() } /*! - Marks the package with \a name and \a version as installed. + Marks the package specified by \a name as installed. Sets the values of + \a version, \a title, \a description, \a dependencies, \a forcedInstallation, + \a virtualComp, \a uncompressedSize, and \a inheritVersionFrom for the + package. + */ bool PackagesInfo::installPackage(const QString &name, const QString &version, const QString &title, const QString &description, @@ -353,8 +357,10 @@ bool PackagesInfo::installPackage(const QString &name, const QString &version, } /*! - Updates the package and sets the package name to \a name, the version to \a version and the - last update date to \a date. + Updates the package specified by \a name and sets its version to \a version + and the last update date to \a date. + + Returns \c false if the package is not found. */ bool PackagesInfo::updatePackage(const QString &name, const QString &version, const QDate &date) { @@ -370,7 +376,9 @@ bool PackagesInfo::updatePackage(const QString &name, const QString &version, co } /*! - Remove the package with \a name. + Removes the package specified by \a name. + + Returns \c false if the package is not found. */ bool PackagesInfo::removePackage(const QString &name) { diff --git a/src/libs/kdtools/kdupdaterpackagesinfo.h b/src/libs/kdtools/kdupdaterpackagesinfo.h index 4969fa9a4..1301d0b81 100644 --- a/src/libs/kdtools/kdupdaterpackagesinfo.h +++ b/src/libs/kdtools/kdupdaterpackagesinfo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdatertask.cpp b/src/libs/kdtools/kdupdatertask.cpp index 922fc4c28..8278ff6a6 100644 --- a/src/libs/kdtools/kdupdatertask.cpp +++ b/src/libs/kdtools/kdupdatertask.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -50,17 +50,20 @@ using namespace KDUpdater; User should be careful of these points: \list \li Task classes can be started only once. - \li Instances of this class cannot be created. Only instance of the subclasses can. + \li Instances of this class cannot be created. Only instances of the subclasses can. \endlist */ /*! \enum Task::Capability - Sets the capabilities of the task. + This enum value sets the capabilities of the task. \value NoCapability + The task has no capabilities, so it cannot be paused or stopped. \value Pausable + The task can be paused. \value Stoppable + The task can be stopped. */ /*! @@ -95,7 +98,8 @@ QString Task::name() const } /*! - Returns the capabilities of the task. It is a combination of one or more Capability flags. + Returns the capabilities of the task. It is a combination of one or more + Task::Capability flags. */ int Task::capabilities() const { @@ -119,7 +123,7 @@ QString Task::errorString() const } /*! - Returns whether the task has started and is running or not. + Returns whether the task has started and is running. */ bool Task::isRunning() const { @@ -195,7 +199,7 @@ void Task::run() } /*! - Stops the task, provided the task has Stoppable capability. + Stops the task, provided the task has the Task::Stoppable capability. \note Once the task is stopped, it cannot be restarted. */ @@ -234,7 +238,7 @@ void Task::stop() } /*! - Pauses the task, provided the task has KDUpdater::Task::Pausable capability. + Pauses the task, provided the task has the Task::Pausable capability. */ void Task::pause() { @@ -357,30 +361,44 @@ void Task::reportDone() deleteLater(); } +/*! + Returns \c true if the task will be automatically deleted. +*/ bool Task::autoDelete() const { return m_autoDelete; } +/*! + Automatically deletes the task if \a autoDelete is \c true. +*/ void Task::setAutoDelete(bool autoDelete) { m_autoDelete = autoDelete; } /*! - \fn virtual bool KDUpdater::Task::doRun() = 0; + \fn virtual void KDUpdater::Task::doRun() = 0; + + Returns \c 0 if the task is run. */ /*! \fn virtual bool KDUpdater::Task::doStop() = 0; + + Returns \c true if the task is stopped. */ /*! \fn virtual bool KDUpdater::Task::doPause() = 0; + + Returns \c true if the task is paused. */ /*! \fn virtual bool KDUpdater::Task::doResume() = 0; + + Returns \c true if the task is resumed. */ /*! diff --git a/src/libs/kdtools/kdupdatertask.h b/src/libs/kdtools/kdupdatertask.h index 6f88fa949..5eea26348 100644 --- a/src/libs/kdtools/kdupdatertask.h +++ b/src/libs/kdtools/kdupdatertask.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdate.cpp b/src/libs/kdtools/kdupdaterupdate.cpp index e1f5b50db..69872ea92 100644 --- a/src/libs/kdtools/kdupdaterupdate.cpp +++ b/src/libs/kdtools/kdupdaterupdate.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -60,18 +60,26 @@ Update::Update(int priority, const QUrl &sourceInfoUrl, const QHash<QString, QVa } /*! - Returns data whose name is given in parameter, or an invalid QVariant if the data doesn't exist. + Returns the data specified by \a name, or an invalid \a defaultValue if the + data does not exist. */ QVariant Update::data(const QString &name, const QVariant &defaultValue) const { return m_data.value(name, defaultValue); } +/*! + Returns the priority of the update. +*/ int Update::priority() const { return m_priority; } +/*! + Returns the URL of the update source. An update source is a repository that + contains an update for the application. +*/ QUrl Update::sourceInfoUrl() const { return m_sourceInfoUrl; diff --git a/src/libs/kdtools/kdupdaterupdate.h b/src/libs/kdtools/kdupdaterupdate.h index 523aa272d..f676f0b31 100644 --- a/src/libs/kdtools/kdupdaterupdate.h +++ b/src/libs/kdtools/kdupdaterupdate.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/kdupdaterupdatefinder.cpp index e6c9044b8..21f6f86a5 100644 --- a/src/libs/kdtools/kdupdaterupdatefinder.cpp +++ b/src/libs/kdtools/kdupdaterupdatefinder.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -460,7 +460,8 @@ UpdateFinder::Private::Resolution UpdateFinder::Private::checkPriorityAndVersion // /*! - Constructs an update finder for a given KDUpdater::Application. + Constructs an update finder for the KDUpdater::Application specified by + \a application. */ UpdateFinder::UpdateFinder(Application *application) : Task(QLatin1String("UpdateFinder"), Stoppable, application), diff --git a/src/libs/kdtools/kdupdaterupdatefinder.h b/src/libs/kdtools/kdupdaterupdatefinder.h index 10584b9f9..c94b0cd98 100644 --- a/src/libs/kdtools/kdupdaterupdatefinder.h +++ b/src/libs/kdtools/kdupdaterupdatefinder.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperation.cpp b/src/libs/kdtools/kdupdaterupdateoperation.cpp index 50d396671..8b6cbec64 100644 --- a/src/libs/kdtools/kdupdaterupdateoperation.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperation.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -50,7 +50,7 @@ using namespace KDUpdater; The KDUpdater::UpdateOperation is an abstract class that specifies an interface for update operations. Concrete implementations of this class must perform a single update - operation like copy, move, delete. + operation, such as copy, move, or delete. \note Two separate threads cannot be using a single instance of KDUpdater::UpdateOperation at the same time. @@ -58,12 +58,16 @@ using namespace KDUpdater; /*! \enum UpdateOperation::Error - Error codes related to operation arguments and operation runtime failures. - - NoError No error occurred. - InvalidArguments Number of arguments does not match or an invalid argument was set. - UserDefinedError An error occurred during operation run. Use UpdateOperation::errorString() - to get the human-readable description of the error that occurred. + This enum code specifies error codes related to operation arguments and + operation runtime failures. + + \value NoError + No error occurred. + \value InvalidArguments + Number of arguments does not match or an invalid argument was set. + \value UserDefinedError + An error occurred during operation run. Use UpdateOperation::errorString() + to get the human-readable description of the error that occurred. */ /* @@ -120,7 +124,7 @@ QString UpdateOperation::operationCommand() const } /*! - Returns \c true if there exists a value called \a name, otherwise returns \c false. + Returns \c true if a value called \a name exists, otherwise returns \c false. */ bool UpdateOperation::hasValue(const QString &name) const { @@ -136,7 +140,7 @@ void UpdateOperation::clearValue(const QString &name) } /*! - Returns the value of \a name. If the value does not exists, this returns an empty QVariant. + Returns the value of \a name. If the value does not exist, returns an empty QVariant. */ QVariant UpdateOperation::value(const QString &name) const { @@ -189,7 +193,11 @@ struct StartsWith QString m_searchTerm; }; - +/*! + Searches the arguments for the key specified by \a key. If it can find the + key, it returns the value set for it. Otherwise, it returns \a defaultValue. + Arguments are specified in the following form: \c{key=value}. +*/ QString UpdateOperation::argumentKeyValue(const QString &key, const QString &defaultValue) const { const QString keySeparater(key + QLatin1String("=")); @@ -278,6 +286,9 @@ void UpdateOperation::registerForDelayedDeletion(const QStringList &files) /*! Tries to delete \a file. If \a file cannot be deleted, it is registered for delayed deletion. + + If a backup copy of the file cannot be created, returns \c false and displays the error + message specified by \a errorString. */ bool UpdateOperation::deleteFileNowOrLater(const QString &file, QString *errorString) { @@ -308,18 +319,24 @@ bool UpdateOperation::deleteFileNowOrLater(const QString &file, QString *errorSt \fn virtual bool KDUpdater::UpdateOperation::performOperation() = 0; Subclasses must implement this function to perform the update operation. + + Returns \c true if the operation is successful. */ /*! \fn virtual bool KDUpdater::UpdateOperation::undoOperation() = 0; Subclasses must implement this function to perform the undo of the update operation. + + Returns \c true if the operation is successful. */ /*! \fn virtual bool KDUpdater::UpdateOperation::testOperation() = 0; Subclasses must implement this function to perform the test operation. + + Returns \c true if the operation is successful. */ /*! @@ -329,7 +346,8 @@ bool UpdateOperation::deleteFileNowOrLater(const QString &file, QString *errorSt */ /*! - Saves operation arguments and values as XML. You can override this method to store your + Saves operation arguments and values as an XML document and returns the + document. You can override this method to store your own extra-data. Extra-data can be any data that you need to store to perform or undo the operation. The default implementation is taking care of arguments and values set via UpdateOperation::setValue(). diff --git a/src/libs/kdtools/kdupdaterupdateoperation.h b/src/libs/kdtools/kdupdaterupdateoperation.h index 180481ed4..d841fb564 100644 --- a/src/libs/kdtools/kdupdaterupdateoperation.h +++ b/src/libs/kdtools/kdupdaterupdateoperation.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp b/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp index 9296bc955..f70134f36 100644 --- a/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperationfactory.h b/src/libs/kdtools/kdupdaterupdateoperationfactory.h index a4ea6a075..394cc56e5 100644 --- a/src/libs/kdtools/kdupdaterupdateoperationfactory.h +++ b/src/libs/kdtools/kdupdaterupdateoperationfactory.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperations.cpp b/src/libs/kdtools/kdupdaterupdateoperations.cpp index bba4bd087..31d9d1f44 100644 --- a/src/libs/kdtools/kdupdaterupdateoperations.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperations.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperations.h b/src/libs/kdtools/kdupdaterupdateoperations.h index 44dec5a6e..4eafed744 100644 --- a/src/libs/kdtools/kdupdaterupdateoperations.h +++ b/src/libs/kdtools/kdupdaterupdateoperations.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatesinfo.cpp b/src/libs/kdtools/kdupdaterupdatesinfo.cpp index a4b19f371..b46d96943 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfo.cpp +++ b/src/libs/kdtools/kdupdaterupdatesinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatesinfo_p.h b/src/libs/kdtools/kdupdaterupdatesinfo_p.h index 4ae3d2a6b..716bc4fcf 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfo_p.h +++ b/src/libs/kdtools/kdupdaterupdatesinfo_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatesinfodata_p.h b/src/libs/kdtools/kdupdaterupdatesinfodata_p.h index 6ae156ebb..19e44fa10 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfodata_p.h +++ b/src/libs/kdtools/kdupdaterupdatesinfodata_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp b/src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp index 96358214e..25b20c256 100644 --- a/src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp +++ b/src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -72,6 +72,18 @@ using namespace KDUpdater; */ /*! + \fn KDUpdater::operator==(const UpdateSourceInfo &lhs, const UpdateSourceInfo &rhs) + + Returns \c true if \a lhs and \a rhs are equal; otherwise returns \c false. +*/ + +/*! + \fn KDUpdater::operator!=(const UpdateSourceInfo &lhs, const UpdateSourceInfo &rhs) + + Returns \c true if \a lhs and \a rhs are different; otherwise returns \c false. +*/ + +/*! \enum UpdateSourcesInfo::Error Error codes related to retrieving update sources. diff --git a/src/libs/kdtools/kdupdaterupdatesourcesinfo.h b/src/libs/kdtools/kdupdaterupdatesourcesinfo.h index 8d8a66af7..d0207de63 100644 --- a/src/libs/kdtools/kdupdaterupdatesourcesinfo.h +++ b/src/libs/kdtools/kdupdaterupdatesourcesinfo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/commandlineparser.cpp b/src/sdk/commandlineparser.cpp index bb7ccd679..23e9a5dfc 100644 --- a/src/sdk/commandlineparser.cpp +++ b/src/sdk/commandlineparser.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -97,12 +97,12 @@ CommandLineParser::CommandLineParser() QLatin1String("Starts the application as headless process waiting for commands to execute." " Mode can be DEBUG or PRODUCTION. In DEBUG mode, the option values can be omitted." "Note: The server will not shutdown on his own, you need to quit the process by hand."), - QLatin1String("mode,port,key"))); + QLatin1String("mode,socketname,key"))); m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::StartClient), QString::fromLatin1("Starts the application to debug the client-server communication. If " "a value is omitted, the client will use a default instead. Note: The server process is " "not started by the client application in that case, you need to start it on your own."), - QLatin1String("port,key"))); + QLatin1String("socketname,key"))); m_parser.addPositionalArgument(QLatin1String(CommandLineOptions::KeyValue), QLatin1String("Key Value pair to be set.")); diff --git a/src/sdk/commandlineparser.h b/src/sdk/commandlineparser.h index 2bdd34f0d..9a51f697a 100644 --- a/src/sdk/commandlineparser.h +++ b/src/sdk/commandlineparser.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/console.h b/src/sdk/console.h index a29c7b088..cc10cbffd 100644 --- a/src/sdk/console.h +++ b/src/sdk/console.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/console_win.cpp b/src/sdk/console_win.cpp index da5dca49f..ad9f5ca6d 100644 --- a/src/sdk/console_win.cpp +++ b/src/sdk/console_win.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/constants.h b/src/sdk/constants.h index 924d4783a..089a3b6d4 100644 --- a/src/sdk/constants.h +++ b/src/sdk/constants.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 9387b3b81..d2fb82562 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -116,15 +116,16 @@ int InstallerBase::run() SDKApp::registerMetaResources(manager.collectionByName("QResources")); if (parser.isSet(QLatin1String(CommandLineOptions::StartClient))) { - const QStringList arguments = parser.value(QLatin1String(CommandLineOptions::StartServer)) + const QStringList arguments = parser.value(QLatin1String(CommandLineOptions::StartClient)) .split(QLatin1Char(','), QString::SkipEmptyParts); - m_core = new QInstaller::PackageManagerCore(magicMarker, oldOperations, QString(arguments - .value(0, QString::number(QInstaller::Protocol::DefaultPort))).toInt(), + m_core = new QInstaller::PackageManagerCore( + magicMarker, oldOperations, + arguments.value(0, QLatin1String(QInstaller::Protocol::DefaultSocket)), arguments.value(1, QLatin1String(QInstaller::Protocol::DefaultAuthorizationKey)), QInstaller::Protocol::Mode::Debug); } else { m_core = new QInstaller::PackageManagerCore(magicMarker, oldOperations, - 30000 + qrand() % 100, QUuid::createUuid().toString()); + QUuid::createUuid().toString(), QUuid::createUuid().toString()); } { @@ -214,35 +215,28 @@ int InstallerBase::run() const QString directory = QLatin1String(":/translations"); const QStringList translations = m_core->settings().translations(); - // install the default Qt translator - QScopedPointer<QTranslator> translator(new QTranslator(QCoreApplication::instance())); - foreach (const QLocale locale, QLocale().uiLanguages()) { - // As there is no qt_en.qm, we simply end the search when the next - // preferred language is English. - if (locale.language() == QLocale::English) - break; - if (translator->load(locale, QLatin1String("qt"), QString::fromLatin1("_"), directory)) { - QCoreApplication::instance()->installTranslator(translator.take()); - break; - } - } - - translator.reset(new QTranslator(QCoreApplication::instance())); - // install English translation as fallback so that correct license button text is used - if (translator->load(QLatin1String("en"), directory)) - QCoreApplication::instance()->installTranslator(translator.take()); - if (translations.isEmpty()) { - translator.reset(new QTranslator(QCoreApplication::instance())); foreach (const QLocale locale, QLocale().uiLanguages()) { - if (translator->load(locale, QLatin1String(""), QLatin1String(""), directory)) { - QCoreApplication::instance()->installTranslator(translator.take()); + QScopedPointer<QTranslator> qtTranslator(new QTranslator(QCoreApplication::instance())); + const bool qtLoaded = qtTranslator->load(locale, QLatin1String("qt"), + QLatin1String("_"), directory); + + if (qtLoaded || locale.language() == QLocale::English) { + if (qtLoaded) + QCoreApplication::instance()->installTranslator(qtTranslator.take()); + + QScopedPointer<QTranslator> ifwTranslator(new QTranslator(QCoreApplication::instance())); + if (ifwTranslator->load(locale, QString(), QString(), directory)) + QCoreApplication::instance()->installTranslator(ifwTranslator.take()); + + // To stop loading other translations it's sufficient that + // qt was loaded successfully or we hit English as system language break; } } } else { foreach (const QString &translation, translations) { - translator.reset(new QTranslator(QCoreApplication::instance())); + QScopedPointer<QTranslator> translator(new QTranslator(QCoreApplication::instance())); if (translator->load(translation, QLatin1String(":/translations"))) QCoreApplication::instance()->installTranslator(translator.take()); } diff --git a/src/sdk/installerbase.h b/src/sdk/installerbase.h index 8230a89e0..09e914dc2 100644 --- a/src/sdk/installerbase.h +++ b/src/sdk/installerbase.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/installerbase.qrc b/src/sdk/installerbase.qrc index cc281e565..122ec918b 100644 --- a/src/sdk/installerbase.qrc +++ b/src/sdk/installerbase.qrc @@ -5,10 +5,12 @@ <file>translations/fr.qm</file> <file>translations/ja.qm</file> <file>translations/ru.qm</file> + <file>translations/pl.qm</file> <file alias="translations/zh_CN.qm">translations/zh_cn.qm</file> <file>translations/qt_fr.qm</file> <file alias="translations/qt_de.qm">translations/qtbase_de.qm</file> <file alias="translations/qt_ja.qm">translations/qtbase_ja.qm</file> + <file>translations/qt_pl.qm</file> <file alias="translations/qt_ru.qm">translations/qtbase_ru.qm</file> <file>translations/qt_zh_CN.qm</file> </qresource> diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp index eb8c3a562..15c9bb1f5 100644 --- a/src/sdk/installerbasecommons.cpp +++ b/src/sdk/installerbasecommons.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/installerbasecommons.h b/src/sdk/installerbasecommons.h index f6bde1fd0..a6e55e989 100644 --- a/src/sdk/installerbasecommons.h +++ b/src/sdk/installerbasecommons.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp index 2e698f35d..a35f1a95a 100644 --- a/src/sdk/main.cpp +++ b/src/sdk/main.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -119,22 +119,22 @@ int main(int argc, char *argv[]) const QStringList arguments = parser.value(QLatin1String(CommandLineOptions::StartServer)) .split(QLatin1Char(','), QString::SkipEmptyParts); - QString port, key; + QString socketName, key; const QString mode = arguments.value(0); bool argumentsValid = (mode.compare(QLatin1String(QInstaller::Protocol::ModeDebug), Qt::CaseInsensitive) == 0); if (argumentsValid) { - port = arguments.value(1, QString::number(QInstaller::Protocol::DefaultPort)); + socketName = arguments.value(1, QLatin1String(QInstaller::Protocol::DefaultSocket)); key = arguments.value(2, QLatin1String(QInstaller::Protocol::DefaultAuthorizationKey)); } else { - port = arguments.value(1); + socketName = arguments.value(1); key = arguments.value(2); } const bool production = (mode.compare(QLatin1String(QInstaller::Protocol::ModeProduction), Qt::CaseInsensitive) == 0); if (production) - argumentsValid = (!key.isEmpty()) && (!port.isEmpty()); + argumentsValid = (!key.isEmpty()) && (!socketName.isEmpty()); SDKApp<QCoreApplication> app(argc, argv); if (!argumentsValid) { @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) QInstaller::RemoteServer *server = new QInstaller::RemoteServer; QObject::connect(server, SIGNAL(destroyed()), &app, SLOT(quit())); - server->init(port.toInt(), key, (production ? QInstaller::Protocol::Mode::Production + server->init(socketName, key, (production ? QInstaller::Protocol::Mode::Production : QInstaller::Protocol::Mode::Debug)); server->start(); diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index bec0b259d..d228593da 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -12,11 +12,18 @@ QT += network qml xml widgets QTPLUGIN += qminimal } +CONFIG(static, static|shared) { + # prevent qmake from automatically linking in imageformats, bearer, qmltooling plugins + QTPLUGIN.imageformats = - + QTPLUGIN.bearer = - + QTPLUGIN.qmltooling = - +} + DESTDIR = $$IFW_APP_PATH exists($$LRELEASE) { - QT_LANGUAGES = qtbase_de qt_fr qtbase_ja qtbase_ru qt_zh_CN - IB_LANGUAGES = de en fr ja ru zh_cn + QT_LANGUAGES = qtbase_de qt_fr qtbase_ja qt_pl qtbase_ru qt_zh_CN + IB_LANGUAGES = de en fr ja pl ru zh_cn defineReplace(prependAll) { for(a,$$1):result += $$2$${a}$$3 return($$result) diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index 1a5520c85..35706d058 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp index 3281cc45d..6fd54244a 100644 --- a/src/sdk/settingsdialog.cpp +++ b/src/sdk/settingsdialog.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/settingsdialog.h b/src/sdk/settingsdialog.h index fb0253d26..e83c94051 100644 --- a/src/sdk/settingsdialog.h +++ b/src/sdk/settingsdialog.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp index 4cdb23d50..80eb29ed5 100644 --- a/src/sdk/tabcontroller.cpp +++ b/src/sdk/tabcontroller.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/tabcontroller.h b/src/sdk/tabcontroller.h index 831211453..eb7c1669a 100644 --- a/src/sdk/tabcontroller.h +++ b/src/sdk/tabcontroller.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/translations/README b/src/sdk/translations/README new file mode 100644 index 000000000..35da60d6a --- /dev/null +++ b/src/sdk/translations/README @@ -0,0 +1,17 @@ +You need to have a Qt translation for your new language, +otherwise your language won't be loaded at runtime. + +To add a new language: +1) Inside src/sdk/sdk.pro: + add your language into IB_LANGUAGES and QT_LANGUAGES. + QT_LANGUAGES contains base name of the Qt translation file. +2) Add Installer Framework translation filename into: + src/src.pro +3) Add Installer Framework and Qt messages (.qm) filenames into: + src/sdk/installerbase.qrc + +In order to provide an update to translations, according to changes done in sources, run: + +lupdate installerfw.pro + +in a root directory. diff --git a/src/sdk/translations/de.ts b/src/sdk/translations/de.ts index 19055cfd5..bc6787b42 100644 --- a/src/sdk/translations/de.ts +++ b/src/sdk/translations/de.ts @@ -148,12 +148,12 @@ <translation>Ausgewählte Komponenten ohne Abhängigkeiten:</translation> </message> <message> - <location filename="../../libs/installer/installercalculator.cpp" line="114"/> + <location filename="../../libs/installer/installercalculator.cpp" line="111"/> <source>Recursion detected, component '%1' already added with reason: '%2'</source> <translation>Rekursion entdeckt, Komponente '%1' wurde bereits zugefügt aufgrund von: '%2'</translation> </message> <message> - <location filename="../../libs/installer/installercalculator.cpp" line="176"/> + <location filename="../../libs/installer/installercalculator.cpp" line="173"/> <source>Cannot find missing dependency '%1' for '%2'.</source> <translation>Konnte fehlende Abhängigkeit '%1' für '%2' nicht finden.</translation> </message> @@ -1032,12 +1032,12 @@ <translation>Konnte die lokale Dateizeit nicht in die Systemzeit umwandeln.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="725"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="755"/> <source>Corrupt installation</source> <translation>Installation beschädigt</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="726"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="756"/> <source>Your installation seems to be corrupted. Please consider re-installing from scratch.</source> <translation>Ihre Installation scheint beschädigt zu sein. Komplette Neuinstallation empfohlen.</translation> </message> @@ -1055,17 +1055,17 @@ <translation>Komponenten können im Updater Modus keine Kinder haben.</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="555"/> + <location filename="../../libs/installer/component.cpp" line="554"/> <source>Could not open the requested translation file '%1'.</source> <translation>Konnte angeforderte Ãœbersetzungsdatei %1 nicht öffnen.</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="574"/> + <location filename="../../libs/installer/component.cpp" line="573"/> <source>Could not open the requested UI file '%1'. Error: %2</source> <translation>Konnte angeforderte UI-Datei '%1' nicht öffnen. Fehlermeldung: %2</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="583"/> + <location filename="../../libs/installer/component.cpp" line="582"/> <source>Could not load the requested UI file '%1'. Error: %2</source> <translation>Konnte angeforderte UI-Datei '%1' nicht laden. Fehlermeldung: %2</translation> </message> @@ -1098,104 +1098,129 @@ <context> <name>QInstaller::ComponentModel</name> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2448"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2485"/> <source>Component Name</source> <translation>Komponentenname</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2450"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2487"/> + <source>Action</source> + <translation>Aktion</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2489"/> <source>Installed Version</source> <translation>Installierte Version</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2452"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2491"/> <source>New Version</source> <translation>Neue Version</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2454"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2493"/> <source>Release Date</source> <translation>Veröffentlichungsdatum</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2456"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2495"/> <source>Size</source> <translation>Grösse</translation> </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="203"/> + <source>Component is marked for installation.</source> + <translation>Komponente wird installiert.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="205"/> + <source>Component is marked for uninstallation.</source> + <translation>Komponente wird deinstalliert.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="207"/> + <source>Component is installed.</source> + <translation>Komponente ist installiert.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="209"/> + <source>Component is not installed.</source> + <translation>Komponente ist nicht installiert.</translation> + </message> </context> <context> <name>QInstaller::ComponentSelectionPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1445"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1420"/> <source>Alt+A</source> <comment>select default components</comment> <translation>Alt+A</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1447"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1422"/> <source>Def&ault</source> <translation>St&andard</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1451"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1426"/> <source>Alt+R</source> <comment>reset to already installed components</comment> <translation>Alt+Z</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1453"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1428"/> <source>&Reset</source> <translation>&Zurücksetzen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1462"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1437"/> <source>Alt+S</source> <comment>select all components</comment> <translation>Alt+S</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1464"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1439"/> <source>&Select All</source> <translation>Alle au&swählen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1470"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1445"/> <source>Alt+D</source> <comment>deselect all components</comment> <translation>Alt+B</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1472"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1447"/> <source>&Deselect All</source> <translation>Alle a&bwählen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1528"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1521"/> <source>This component will occupy approximately %1 on your hard disk drive.</source> <translation>Diese Komponente wird ungefähr %1 auf Ihrer Festplatte belegen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1597"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1590"/> <source>Select Components</source> <translation>Komponenten auswählen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1608"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1601"/> <source>Please select the components you want to update.</source> <translation>Bitte wählen Sie die Komponenten aus, die Sie aktualisieren möchten.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1609"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1602"/> <source>Please select the components you want to install.</source> <translation>Bitte wählen Sie die Komponenten aus, die Sie installieren möchten.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1610"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1603"/> <source>Please select the components you want to uninstall.</source> <translation>Bitte wählen Sie die Komponenten aus, die Sie entfernen möchten.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1611"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1604"/> <source>Select the components to install. Deselect installed components to uninstall them.</source> <translation>Bitte wählen Sie die Komponenten aus, die Sie installieren möchten. Wählen Sie die Komponenten ab, die Sie entfernen möchten.</translation> </message> @@ -1742,32 +1767,32 @@ Fehler beim Laden von %2</translation> <context> <name>QInstaller::FinishedPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2344"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2335"/> <source>Completing the %1 Wizard</source> <translation>Beende den %1 Assistenten.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2351"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2342"/> <source>Click Done to exit the %1 Wizard.</source> <translation>Klicken Sie "Abschließen", um den %1 Assistenten zu beenden.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2353"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2344"/> <source>Click Finish to exit the %1 Wizard.</source> <translation>Klicken Sie "Abschließen", um den %1 Assistenten zu beenden.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2392"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2383"/> <source>Restart</source> <translation>Neu starten</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2424"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2413"/> <source>Run %1 now.</source> <translation>Starte jetzt %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2429"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2418"/> <source>The %1 Wizard failed.</source> <translation>Der %1 Assistent ist fehlgeschlagen.</translation> </message> @@ -1841,52 +1866,52 @@ Fehler beim Laden von %2</translation> <context> <name>QInstaller::IntroductionPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="908"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="883"/> <source>Setup - %1</source> <translation>Einrichten - %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="916"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="891"/> <source>Welcome to the %1 Setup Wizard.</source> <translation>Willkommen zum %1 Einrichtungsassistenten.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="921"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="896"/> <source>Add or remove components</source> <translation>Komponenten hinzufügen oder entfernen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="927"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="902"/> <source>Update components</source> <translation>Komponenten aktualisieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="933"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="908"/> <source>Remove all components</source> <translation>Alle Komponenten entfernen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="945"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="920"/> <source>Retrieving information from remote installation sources...</source> <translation>Empfange Daten vom Installationsserver...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="997"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="972"/> <source>At least one valid and enabled repository required for this action to succeed.</source> <translation>Mindestens ein gültiges und aktiviertes Repository wird benötigt, um diese Aktion erfolgreich abzuschliessen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1032"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1007"/> <source>No updates available.</source> <translation>Keine Aktualisierungen verfügbar.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1051"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1026"/> <source> Only local package management available.</source> <translation> Nur lokale Paketverwaltung verfügbar.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1202"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1177"/> <source>Quit</source> <translation>Beenden</translation> </message> @@ -1894,49 +1919,49 @@ Fehler beim Laden von %2</translation> <context> <name>QInstaller::LicenseAgreementPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1269"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1244"/> <source>License Agreement</source> <translation>Lizenzabkommen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1293"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1268"/> <source>Alt+A</source> <comment>agree license</comment> <translatorcomment>Lizenz akzeptieren</translatorcomment> <translation>Alt+A</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1378"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1353"/> <source>Please read the following license agreement. You must accept the terms contained in this agreement before continuing with the installation.</source> <translation>Bitte lesen Sie das folgende Lizenzabkommen. Sie müssen die Bedingungen in diesem Abkommen akzeptieren, um die Installation fortsetzen zu können.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1380"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1355"/> <source>I accept the license.</source> <translation>Ich akzeptiere die Lizenzvereinbarung.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1381"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1356"/> <source>I do not accept the license.</source> <translation>Ich akzeptiere die Lizenzvereinbarung nicht.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1383"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1358"/> <source>Please read the following license agreements. You must accept the terms contained in these agreements before continuing with the installation.</source> <translation>Bitte lesen Sie die folgenden Lizenzabkommen. Sie müssen die Bedingungen in diesen Abkommen akzeptieren, um die Installation fortsetzen zu können.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1386"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1361"/> <source>I do not accept the licenses.</source> <translation>Ich akzeptiere die Lizenzvereinbarungen nicht.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1385"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1360"/> <source>I accept the licenses.</source> <translation>Ich akzeptiere die Lizenzvereinbarungen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1306"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1281"/> <source>Alt+D</source> <comment>do not agree license</comment> <translatorcomment>Der Lizenz nicht zustimmen</translatorcomment> @@ -2061,29 +2086,29 @@ Fehler beim Laden von %2</translation> <context> <name>QInstaller::PackageManagerCore</name> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="533"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="563"/> <source> Downloading packages...</source> <translation> Lade Pakete herunter...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="556"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="586"/> <source>Installation canceled by user</source> <translation>Installation durch den Nutzer abgebrochen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="558"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="588"/> <source>All downloads finished.</source> <translation>Alle Herunterladeprozesse abgeschlossen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2387"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2424"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="580"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="610"/> <source>Cancelling the Installer</source> <translation>Breche den Installationsvorgang ab</translation> </message> @@ -2093,52 +2118,52 @@ Lade Pakete herunter...</translation> <translation>Fehler beim Schreiben des Verwaltungswerkzeugs</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="642"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="672"/> <source>Authentication Error</source> <translation>Autentifizierungsfehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="642"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="672"/> <source>Some components could not be removed completely because admin rights could not be acquired: %1.</source> <translation>Einige Komponenten konnten nicht vollständig entfernt werden, weil die nötigen Systemverwalterrechte nicht erlangt werden konnten. Fehlermeldung: %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="647"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="677"/> <source>Unknown error.</source> <translation>Unbekannter Fehler.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="647"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="677"/> <source>Some components could not be removed completely because an unknown error happened.</source> <translation>Einige Komponenten konnten nicht vollständig entfernt werden, weil ein unbekannter Fehler auftrat.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="812"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="842"/> <source>Application not running in Package Manager mode!</source> <translation>Die Anwendung ist nicht im Paketverwaltermodus!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="819"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="849"/> <source>No installed packages found.</source> <translation>Keine installierten Pakete gefunden.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="896"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="926"/> <source>Application running in Uninstaller mode!</source> <translation>Die Anwendung befindet sich im Deinstallierermodus!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="947"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="977"/> <source>There is an important update available, please run the updater first.</source> <translation>Es gibt eine wichtige Aktualisierung, bitte zuerst den Updater starten.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1409"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="1446"/> <source>Error while elevating access rights.</source> <translation>Fehler beim Erlangen von Administratorrechten.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2418"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2455"/> <source>invalid</source> <translation>ungültig</translation> </message> @@ -2146,36 +2171,36 @@ Lade Pakete herunter...</translation> <context> <name>QInstaller::PackageManagerCorePrivate</name> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="402"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1524"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1550"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1723"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1792"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="406"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1531"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1557"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1732"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1801"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="749"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="754"/> <source>Access error</source> <translation>Zugriffsfehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="750"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="755"/> <source>Format error</source> <translation>Formatfehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="751"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="756"/> <source>Could not write installer configuration to %1: %2</source> <translation>Konnte Einstellungen des Installers nicht nach %1 schreiben. Fehlermeldung: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="867"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="872"/> <source>Stop Processes</source> <translation>Prozesse anhalten</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="867"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="872"/> <source>These processes should be stopped to continue: %1</source> @@ -2184,204 +2209,199 @@ Lade Pakete herunter...</translation> %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="875"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1823"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2001"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="880"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1832"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2010"/> <source>Installation canceled by user</source> <translation>Installation durch den Nutzer abgebrochen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1379"/> - <source>ProductName should be set</source> - <translation>ProductName muss gesetzt sein</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1403"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1411"/> <source>Variable 'TargetDir' not set.</source> <translation>TargetDir muss gesetzt sein.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1441"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1686"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1449"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1695"/> <source>Preparing the installation...</source> <translation>Bereite Installation vor...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1451"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1459"/> <source>It is not possible to install from network location</source> <translation>Es ist nicht möglich, von einem Netzwerkort aus zu installieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1493"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1495"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1500"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1502"/> <source>Creating local repository</source> <translation>Erstelle lokale Quelle</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1540"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1547"/> <source> Installation finished!</source> <translation> Installation abgeschlossen!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1556"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1563"/> <source> Installation aborted!</source> <translation> Installation abgebrochen!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1590"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1597"/> <source>It is not possible to run that operation from a network location</source> <translation>Es ist nicht möglich, diese Oparation von einem Netzwerkort aus zu starten</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1692"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1701"/> <source>Removing deselected components...</source> <translation>Entferne abgewählte Komponenten...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1713"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1722"/> <source> Update finished!</source> <translation> Aktualisierung beendet!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1729"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1738"/> <source> Update aborted!</source> <translation> Aktualisierung abgebrochen!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="389"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="393"/> <source>Unresolved dependencies</source> <translation>Nicht aufgelöste Abhängigkeiten</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="975"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="980"/> <source>Writing maintenance tool.</source> <translation>Schreiben des Verwaltungswerkzeugs.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="981"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="986"/> <source>Failed to seek in file %1: %2</source> <translation>Suchen in Datei %1 fehlgeschlagen. Fehlermeldung: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="988"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="993"/> <source>Maintenance tool is not a bundle</source> <translation>Verwaltungswerkzeug ist kein Bundle</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1002"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1007"/> <source>Could not write maintenance tool data to %1: %2</source> <translation>Konnte Daten des Verwaltungswerkzeugs nicht nach %1 schreiben. Fehlermeldung: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1021"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1322"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1026"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1327"/> <source>Could not remove data file '%1': %2</source> <translation>Konnte Datei %1 nicht löschen. Fehlermeldung: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1027"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1032"/> <source>Could not write maintenance tool to %1: %2</source> <translation>Konnte Verwaltungswerkzeug nicht nach %1 schreiben: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1327"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1332"/> <source>Could not write maintenance tool binary data to %1: %2</source> <translation>Konnte Binäre Datei des Verwaltungswerkzeugs nicht nach %1 schreiben: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1530"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1703"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1537"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1712"/> <source>Creating Maintenance Tool</source> <translation>Erstelle Verwaltungswerkzeug</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1801"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1810"/> <source>Uninstallation completed successfully.</source> <translation>Deinstallation erfolgreich abgeschlossen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1801"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1810"/> <source>Uninstallation aborted.</source> <translation>Deinstallation abgebrochen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1817"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1826"/> <source> Installing component %1</source> <translation> Installiere Komponente %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1846"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2019"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1855"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2028"/> <source>Installer Error</source> <translation>Installationsfehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1847"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1856"/> <source>Error during installation process (%1): %2</source> <translation>Fehler beim Installieren von Komponente %1: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1912"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1921"/> <source>Cannot prepare uninstall</source> <translation>Kann Deinstallation nicht vorbereiten</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1943"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1952"/> <source>Cannot start uninstall</source> <translation>Kann Deinstallation nicht starten</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2020"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2029"/> <source>Error during uninstallation process: %1</source> <translation>Fehler bei der Deinstallation: %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2048"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2057"/> <source>Unknown error</source> <translation>Unbekannter Fehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2066"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2075"/> <source>Could not retrieve remote tree: %1.</source> <translation>Kann entfernten Baum nicht empfangen: %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2095"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2104"/> <source>Failure to read packages from: %1.</source> <translation>Fehler beim Lesen der Pakete von %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2120"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2129"/> <source>Could not retrieve meta information: %1</source> <translation>Konnte die Metainformationen nicht empfangen: %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2177"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2188"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2186"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2197"/> <source>Could not add temporary update source information.</source> <translation>Konnte Informationen zu temporären Aktualisierungsquellen nicht hinzufügen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2203"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2212"/> <source>Could not find any update source information.</source> <translation>Konnte keine Informationen zu Aktualisierungsquellen finden.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2273"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2282"/> <source>Dependency cycle between components detected: '%1' and '%2'.</source> <translation>Zyklische Abhängigkeit zwischen Komponenten entdeckt: '%1' und '%2'.</translation> </message> @@ -2389,57 +2409,57 @@ Installiere Komponente %1</translation> <context> <name>QInstaller::PackageManagerGui</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="254"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="256"/> <source>%1 Setup</source> <translation>%1 Einrichtung</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="256"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="258"/> <source>Maintain %1</source> <translation>%1 verwalten</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="599"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="602"/> <source>Do you want to cancel the installation process?</source> <translation>Möchten Sie den Installationsprozess abbrechen?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="601"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="604"/> <source>Do you want to cancel the uninstallation process?</source> <translation>Möchten Sie den Deinstallationsprozess abbrechen?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="603"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="606"/> <source>Do you want to quit the installer application?</source> <translation>Möchten Sie die Installationsanwendung beenden?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="605"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="608"/> <source>Do you want to quit the uninstaller application?</source> <translation>Möchten Sie die Deinstallationsanwendung beenden?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="607"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="610"/> <source>Do you want to quit the maintenance application?</source> <translation>Möchten Sie die Wartungsanwendung beenden?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="612"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="615"/> <source>Question</source> <translation>Frage</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="654"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="657"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="731"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="714"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="732"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="715"/> <source>It is not possible to install from network location. Please copy the installer to a local drive</source> <translation>Es ist nicht möglich, von einem Netzwerkort aus zu installieren. @@ -2464,32 +2484,32 @@ Bitte kopieren Sie den Installer auf ein lokales Laufwerk</translation> <context> <name>QInstaller::PerformInstallationPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2263"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2254"/> <source>U&ninstall</source> <translation>&Deinstallieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2264"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2255"/> <source>Uninstalling %1</source> <translation>Deinstalliere %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2268"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2259"/> <source>&Update</source> <translation>&Aktualisieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2269"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2260"/> <source>Updating components of %1</source> <translation>Aktualisiere Komponenten des %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2273"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2264"/> <source>&Install</source> <translation>&Installieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2274"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2265"/> <source>Installing %1</source> <translation>Installiere %1</translation> </message> @@ -2530,87 +2550,87 @@ Bitte kopieren Sie den Installer auf ein lokales Laufwerk</translation> <context> <name>QInstaller::ReadyForInstallationPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2038"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2029"/> <source>U&ninstall</source> <translation>&Deinstallieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2039"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2030"/> <source>Ready to Uninstall</source> <translation>Bereit zum Deinstallieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2040"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2031"/> <source>Setup is now ready to begin removing %1 from your computer.<br><font color="red">The program directory %2 will be deleted completely</font>, including all content in that directory!</source> <translation>Das Einrichtungsprogramm ist jetzt bereit, %1 von Ihrem Computer zu entfernen. <br><font color="red">Das Programmverzeichnis %2 wird vollständig gelöscht</font>, inklusive allen Inhalten in diesem Ordner!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2049"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2040"/> <source>U&pdate</source> <translation>&Aktualisieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2050"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2041"/> <source>Ready to Update Packages</source> <translation>Bereit zum Aktualisieren der Pakete</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2051"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2042"/> <source>Setup is now ready to begin updating your installation.</source> <translation>Das Einrichtungsprogramm ist jetzt bereit, Ihre Installation zu aktualisieren.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2054"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2045"/> <source>&Install</source> <translation>&Installieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2055"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2046"/> <source>Ready to Install</source> <translation>Bereit zum Installieren</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2056"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2047"/> <source>Setup is now ready to begin installing %1 on your computer.</source> <translation>Das Einrichtungsprogramm ist jetzt bereit, %1 auf Ihrem Computer einzurichten.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2117"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2108"/> <source>Not enough disk space to store temporary files and the installation! Available space: %1, at least required %2.</source> <translation>Nicht genügend Plattenplatz für temporäre Dateien und die Installation! Verfügbarer Platz: %1, mindestens benötigt: %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2126"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2117"/> <source>Not enough disk space to store all selected components! Available space: %1, at least required: %2.</source> <translation>Nicht genügend Plattenplatz für alle ausgewählten Komponenten! Verfügbarer Platz: %1, mindestens benötigt: %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2134"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2125"/> <source>Not enough disk space to store temporary files! Available space: %1, at least required: %2.</source> <translation>Nicht genügend Plattenplatz für temporäre Dateien! Verfügbarer Platz: %1, mindestens benötigt: %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2143"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2134"/> <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 1% of the volume's space available afterwards. %1</source> <translation>Die für die Installation ausgewählte Partition scheint genügend Platz zu bieten, aber es werden anschließend weniger als 1% der Partitionsgröße verfügbar sein. %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2148"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2139"/> <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 100 MB available afterwards. %1</source> <translation>Die für die Installation ausgewählte Partition scheint genügend Platz zu bieten, aber es werden anschließend weniger als 100 MiB verfügbar sein. %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2154"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2145"/> <source>Installation will use %1 of disk space.</source> <translation>Installation wird %1 Plattenplatz verwenden.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2164"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2155"/> <source>Cannot resolve all dependencies.</source> <translation>Konnte nicht alle Abhängigkeiten auflösen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2180"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2171"/> <source>Components about to be removed.</source> <translation>Komponenten, die entfernt werden.</translation> </message> @@ -2650,9 +2670,9 @@ Bitte kopieren Sie den Installer auf ein lokales Laufwerk</translation> <context> <name>QInstaller::RemoteServerConnection</name> <message> - <location filename="../../libs/installer/remoteserverconnection.cpp" line="189"/> - <location filename="../../libs/installer/remoteserverconnection.cpp" line="299"/> - <location filename="../../libs/installer/remoteserverconnection.cpp" line="390"/> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="186"/> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="300"/> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="391"/> <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> <translation>Konnte nicht alle Daten nach dem Senden des Kommandos '%1' lesen. Bytes erwartet: %2, Bytes erhalten: %3. Fehler: %4</translation> </message> @@ -2701,7 +2721,7 @@ Bitte kopieren Sie den Installer auf ein lokales Laufwerk</translation> <context> <name>QInstaller::RestartPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2483"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2472"/> <source>Completing the %1 Setup Wizard</source> <translation>Vervollständige den %1 Assistenten</translation> </message> @@ -2709,12 +2729,12 @@ Bitte kopieren Sie den Installer auf ein lokales Laufwerk</translation> <context> <name>QInstaller::ScriptEngine</name> <message> - <location filename="../../libs/installer/scriptengine.cpp" line="378"/> + <location filename="../../libs/installer/scriptengine.cpp" line="620"/> <source>Could not open the requested script file at %1: %2.</source> <translation>Konnte angeforderte Skriptdatei '%1' nicht öffnen. Fehlermeldung: %2</translation> </message> <message> - <location filename="../../libs/installer/scriptengine.cpp" line="396"/> + <location filename="../../libs/installer/scriptengine.cpp" line="638"/> <source>Exception while loading the component script '%1'. (%2)</source> <translation>Ausnahme beim Laden des Komponentenskripts '%1'. (%2)</translation> </message> @@ -2815,12 +2835,12 @@ Bitte kopieren Sie den Installer auf ein lokales Laufwerk</translation> <context> <name>QInstaller::StartMenuDirectoryPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1937"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1928"/> <source>Start Menu shortcuts</source> <translation>Verknüpfungen im Startmenü</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1938"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1929"/> <source>Select the Start Menu in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.</source> <translation>Wählen Sie den Ordner im Startmenü, in dem die Verknüpfungen zur Anwendung erstellt werden sollen. Sie können einen Namen angeben, um einen neuen Ordner anzulegen.</translation> </message> @@ -2828,34 +2848,34 @@ Bitte kopieren Sie den Installer auf ein lokales Laufwerk</translation> <context> <name>QInstaller::TargetDirectoryPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1689"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1682"/> <source>Installation Folder</source> <translation>Installationsverzeichnis</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1696"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1689"/> <source>Please specify the folder where %1 will be installed.</source> <translation>Bitte geben Sie den Ordner an, in dem %1 installiert werden soll.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1709"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1702"/> <source>Alt+R</source> <comment>browse file system to choose a file</comment> <translatorcomment>Dateisystem durchsuchen, um eine Datei auszuwählen</translatorcomment> <translation>Alt+D</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1710"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1703"/> <source>B&rowse...</source> <translation>&Durchsuchen...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1783"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1776"/> <source>The folder you selected already exists and contains an installation. Choose a different target for installation.</source> <translation>Der ausgewählte Ordner existiert bereits und enthält eine Installation. Bitte ein anderes Zielverzeichnis auswählen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1788"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1781"/> <source>You have selected an existing, non-empty folder for installation. Note that it will be completely wiped on uninstallation of this application. It is not advisable to install into this folder as installation might fail. @@ -2866,67 +2886,67 @@ Es wird nicht empfohlen, in diesen Ordner zu installieren. Möchten Sie trotzdem fortsetzen?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1792"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1785"/> <source>You have selected an existing file or symlink, please choose a different target for installation.</source> <translation>Existierende Datei oder Symlink ausgewählt, bitte ein anderes Installationsziel auswählen.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1829"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1820"/> <source>The installation path cannot be empty, please specify a valid folder.</source> <translation>Der Installationspfad darf nicht leer sein. Bitte einen gültigen Ordner angeben.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1833"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1824"/> <source>The installation path cannot be relative, please specify an absolute path.</source> <translation>Der Installationspfad darf nicht relativ sein. Bitte einen absoluten Pfad angeben.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1839"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1830"/> <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> <translation>Der Pfad zum Installationsverzeichnis enthält Zeichen ausserhalb des ASCII Zeichensatzes. Dies ist zur Zeit nicht unterstützt. Bitte wählen Sie einen anderen Pfad für das Installationsverzeichnis.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1856"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1847"/> <source>The path you have entered is too long, please make sure to specify a valid path.</source> <translation>Der von ihnen eingegebene Pfad ist zu lang, bitte geben sie einen gültigen Pfad ein.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1871"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1862"/> <source>The path you have entered is not valid, please make sure to specify a valid target.</source> <translation>Der eingegebene Pfad ist ungültig, bitte ein gültiges Ziel angeben.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1885"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1876"/> <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> <translation>Der von ihnen eingegebene Pfad ist ungültig, bitte geben sie ein gültiges Laufwerk an.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1892"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1883"/> <source>The installation path must not end with '.', please specify a valid folder.</source> <translation>Der Installationspfad darf nicht auf '.' enden, bitte einen gültigen Ordner angeben.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1907"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1898"/> <source>The installation path must not contain '%1', please specify a valid folder.</source> <translation>Der Installationspfad darf nicht %1 enthalten, bitte einen gültigen Ordner angeben.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1925"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1916"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1848"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1839"/> <source>As the install directory is completely deleted, installing in %1 is forbidden.</source> <translation>Da das Installationsverzeichnis komplett gelöscht wird, ist eine Installation nach %1 nicht zulässig.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1918"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1909"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1814"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1805"/> <source>Select Installation Folder</source> <translation>Installationsverzeichnis auswählen.</translation> </message> diff --git a/src/sdk/translations/fr.ts b/src/sdk/translations/fr.ts index ba99993af..de7231a5a 100644 --- a/src/sdk/translations/fr.ts +++ b/src/sdk/translations/fr.ts @@ -2,11 +2,52 @@ <!DOCTYPE TS> <TS version="2.1" language="fr_FR"> <context> - <name>Component</name> + <name>AuthenticationRequiredException</name> <message> - <location filename="../../libs/installer/binaryformat.cpp" line="595"/> - <source>Could not open archive %1: %2</source> - <translation>Impossible d'ouvrir l'archive %1 : %2</translation> + <location filename="../../libs/installer/downloadfiletask.cpp" line="283"/> + <source>%1 at %2</source> + <translation>%1 sur %2</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="300"/> + <source>Proxy requires authentication.</source> + <translation>Le proxy requiert une authentification.</translation> + </message> +</context> +<context> + <name>BinaryContent</name> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="207"/> + <source>Could not seek to %1 to read the operation data.</source> + <translation>Impossible de rechercher dans %1 pour lire les données d'exploitation.</translation> + </message> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="225"/> + <source>Could not seek to %1 to read the resource collection block.</source> + <translation>Impossible de rechercher dans %1 pour lire l'ensemble des ressources.</translation> + </message> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="263"/> + <source>Could not open meta resource. Error: %1</source> + <translation>Impossible d'ouvrir les métadonnées des ressources. Erreur : %1</translation> + </message> +</context> +<context> + <name>BinaryLayout</name> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="121"/> + <source>Could not seek to %1 to read the embedded meta data count.</source> + <translation>Impossible de rechercher dans %1 pour lire le nombre de métadonnées.</translation> + </message> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="132"/> + <source>Could not seek to %1 to read the resource collection segment.</source> + <translation>Impossible de rechercher dans %1 pour lire le segment de l'ensemble des ressources.</translation> + </message> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="145"/> + <source>Unexpected mismatch of meta resources. Read %1, expected: %2.</source> + <translation>Incohérence relevée sur les métadonnées. Lues %1, attendues : %2.</translation> </message> </context> <context> @@ -38,110 +79,154 @@ </message> </context> <context> - <name>IntroductionPageImpl</name> + <name>DirectoryGuard</name> <message> - <location filename="../installerbasecommons.cpp" line="77"/> - <source>Package manager</source> - <translation>Gestionnaire de paquets</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="163"/> + <source>Path exists but is not a folder: %1</source> + <translation>Le chemin existe mais n'est pas un dossier : %1</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="82"/> - <source>Update components</source> - <translation>Mettre à jour les modules</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="180"/> + <source>Could not create folder: %1</source> + <translation>Impossible de créer le dossier : %1</translation> </message> +</context> +<context> + <name>ExtractCallbackImpl</name> <message> - <location filename="../installerbasecommons.cpp" line="87"/> - <source>Remove all components</source> - <translation>Supprimer tous les modules</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="815"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="884"/> + <source>Could not retrieve path of archive item %1</source> + <translation>Impossible de récupérer le chemin de l'élément %1</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="97"/> - <source>Retrieving information from remote installation sources...</source> - <translation>Récupération des informations nécessaires à partir d'une source distante...</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="844"/> + <source>Could not remove already existing symlink. %1</source> + <translation>Impossible de supprimer le lien symbolique existant. %1</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="140"/> - <source>At least one valid and enabled repository required for this action to succeed.</source> - <translation>Au moins un dépôt valide et actif est requis pour pouvoir continuer.</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="852"/> + <source>Could not open file: %1 (%2)</source> + <translation>Impossible d'ouvrir le fichier %1 (%2)</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="166"/> - <source>No updates available.</source> - <translation>Aucune mise à jour n'est disponible.</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="907"/> + <source>Could not create symlink at '%1'. Another one is already existing.</source> + <translation>Impossible de créer le lien symbolique à '%1'. Un autre existe déjà .</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="185"/> - <source> Only local package management available.</source> - <translation>La gestion des modules n'est disponible qu'en local.</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="914"/> + <source>Could not read symlink target from file '%1'.</source> + <translation>Impossible de récupérer la cible du lien symbolique du fichier '%1'.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="336"/> - <source>Quit</source> - <translation>Quitter</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="924"/> + <source>Could not create symlink at %1. %2</source> + <translation>Impossible de créer le lien symbolique à %1. %2</translation> + </message> +</context> +<context> + <name>InstallerCalculator</name> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="76"/> + <source>Components added as automatic dependencies:</source> + <translation>Composants ajoutés comme dépendances automatiques : </translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="79"/> + <source>Components added as dependency for '%1':</source> + <translation>Composants ajoutés comme dépendances pour %1 : </translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="82"/> + <source>Components that have resolved dependencies:</source> + <translation>Composants ayant des dépendances résolues :</translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="85"/> + <source>Selected components without dependencies:</source> + <translation>Composants sélectionnés ne possédant pas de dépendance : </translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="111"/> + <source>Recursion detected, component '%1' already added with reason: '%2'</source> + <translation>Récursion détectée, composant '%1' ajouté via le contexte : '%2'</translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="173"/> + <source>Cannot find missing dependency '%1' for '%2'.</source> + <translation>Impossible de satisfaire la dépendance '%1' pour '%2".</translation> </message> </context> <context> <name>KDJob</name> <message> - <location filename="../../libs/kdtools/kdjob.cpp" line="176"/> + <location filename="../../libs/kdtools/kdjob.cpp" line="188"/> <source>Canceled</source> <translation>Annulé</translation> </message> </context> <context> - <name>KDSaveFile</name> + <name>KDLockFile</name> <message> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="260"/> - <source>Append mode not supported.</source> - <translation>Le mode Ajout n'est pas supporté.</translation> + <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="53"/> + <location filename="../../libs/kdtools/kdlockfile_win.cpp" line="55"/> + <source>Could not create lock file '%1': %2</source> + <translation>Impossible de poser un fichier de verrouillage '%1' : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="265"/> - <source>Read-only access not supported.</source> - <translation>Le mode Lecture Seule n'est pas supporté.</translation> + <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="64"/> + <location filename="../../libs/kdtools/kdlockfile_win.cpp" line="63"/> + <source>Could not write PID to lock file '%1': %2</source> + <translation>Impossible d'écrire le PID pour le verrou de fichier '%1' : '%2'</translation> </message> <message> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="353"/> - <source>Could not backup existing file %1: %2</source> - <translation>Impossible de sauvegarder le fichier existant %1 : %2</translation> + <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="73"/> + <location filename="../../libs/kdtools/kdlockfile_win.cpp" line="70"/> + <source>Could not obtain the lock for file '%1': %2</source> + <translation>Impossible d'obtenir le verrou pour le fichier '%1' : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="394"/> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="405"/> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="416"/> - <source>TODO</source> - <translation>TODO</translation> + <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="88"/> + <location filename="../../libs/kdtools/kdlockfile_win.cpp" line="85"/> + <source>Could not release the lock for file '%1': %2</source> + <translation>Impossible de relâcher le verrou pour le fichier '%1' : %2</translation> </message> </context> <context> <name>KDUpdater::AppendFileOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="551"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="610"/> <source>Cannot backup file %1: %2</source> <translation>Impossible de sauvegarder le fichier %1 : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="563"/> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation>Arguments invalides : %1 arguments fournis, 2 attendus.</translation> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="622"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="575"/> - <source>Could not open file %1 for writing: %2</source> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="623"/> + <source>exactly 2</source> + <translation>exactement 2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="649"/> + <source>Could not open file '%1' for writing: %2</source> <translation>Impossible d'ouvrir le fichier %1 en écriture : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="594"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="668"/> <source>Cannot find backup file for %1.</source> <translation>Impossible de trouver la sauvegarde du fichier %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="600"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="674"/> <source>Could not restore backup file for %1.</source> <translation>Impossible de charger la sauvegarde du fichier %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="611"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="685"/> <source>Could not restore backup file for %1: %2</source> <translation>Impossible de restaurer la sauvegarde du fichier %1 : %2</translation> </message> @@ -149,32 +234,37 @@ <context> <name>KDUpdater::CopyOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="89"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="142"/> <source>Could not backup file %1.</source> <translation>Impossible de faire une sauvegarde du fichier %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="99"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="151"/> <source>Invalid arguments: %1 arguments given, 2 expected.</source> <translation>Arguments invalides : %1 arguments fournis, 2 attendus.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="110"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="161"/> + <source>Could not copy a non-existent file: %1</source> + <translation>Impossible de copier un fichier non-existant : %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="170"/> <source>Could not remove destination file %1: %2</source> <translation>Impossible de supprimer le fichier de destination %1 : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="119"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="178"/> <source>Could not copy %1 to %2: %3</source> <translation>Impossible de copier %1 vers %2 : %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="131"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="195"/> <source>Could not delete file %1: %2</source> <translation>Impossible de supprimer le fichier %1 : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="144"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="208"/> <source>Could not restore backup file into %1: %2</source> <translation>Impossible de restaurer la sauvegarde du fichier vers %1 : %2</translation> </message> @@ -182,17 +272,17 @@ <context> <name>KDUpdater::DeleteOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="305"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="369"/> <source>Cannot create backup of %1: %2</source> <translation>Impossible de créer la sauvegarde de %1 : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="314"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="378"/> <source>Invalid arguments: %1 arguments given, 1 expected.</source> <translation>Arguments invalides : %1 arguments fournis, 1 seul attendu.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="329"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="393"/> <source>Cannot restore backup file for %1: %2</source> <translation>Impossible de restaurer le fichier de sauvegarde pour %1 : %2</translation> </message> @@ -200,87 +290,74 @@ <context> <name>KDUpdater::FileDownloader</name> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="195"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="198"/> <source>Download canceled.</source> <translation>Téléchargement annulé.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="188"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="191"/> <source>Cryptographic hashes do not match.</source> <translation>Les empreintes cryptographiques ne correspondent pas.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="185"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="188"/> <source>Download finished.</source> <translation>Téléchargement terminé.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="302"/> - <source> of </source> - <translation> de </translation> - </message> - <message> <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="305"/> - <source> downloaded.</source> - <translation> téléchargé.</translation> + <source>%1 of %2</source> + <translation>%1 sur %2</translation> </message> <message> <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="308"/> - <source>/sec</source> - <translation>/sec</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="319"/> - <source> day</source> - <translation> jour</translation> + <source>%1 downloaded.</source> + <translation>%1 téléchargé.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="319"/> - <source> days</source> - <translation> jours</translation> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="311"/> + <source>(%1/sec)</source> + <translation>(%1/s)</translation> </message> - <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="323"/> - <source> hour</source> - <translation> heure</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="323"/> - <source> hours</source> - <translation> heures</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="327"/> - <source> minute</source> - <translation> minute</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="327"/> - <source> minutes</source> - <translation> minutes</translation> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="322"/> + <source>%n day(s), </source> + <translation> + <numerusform>%n jour, </numerusform> + <numerusform>%n jours, </numerusform> + </translation> </message> - <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="332"/> - <source> second</source> - <translation> seconde</translation> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="326"/> + <source>%n hour(s), </source> + <translation> + <numerusform>%n heure, </numerusform> + <numerusform>%n heures, </numerusform> + </translation> </message> - <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="332"/> - <source> seconds</source> - <translation> secondes</translation> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="330"/> + <source>%n minute(s)</source> + <translation> + <numerusform>%n minute</numerusform> + <numerusform>%n minutes</numerusform> + </translation> </message> - <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="334"/> - <source> - </source> - <translation> - </translation> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="335"/> + <source>%n second(s)</source> + <translation> + <numerusform>%n seconde</numerusform> + <numerusform>%n secondes</numerusform> + </translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="334"/> - <source> remaining.</source> - <translation> restant.</translation> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="337"/> + <source> - %1%2%3%4 remaining.</source> + <translation> - %1%2%3%4 restant.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="336"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="339"/> <source> - unknown time remaining.</source> <translation> - impossible d'estimer le temps restant.</translation> </message> @@ -288,40 +365,65 @@ <context> <name>KDUpdater::HttpDownloader</name> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="861"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="870"/> <source>Cannot download %1: Writing to file '%2' failed: %3</source> <translation>Impossible de télécharger %1 : l'écriture du fichier '%2' à échoué : %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="991"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1006"/> <source>Cannot download %1: Could not create %2: %3</source> <translation>Impossible de télécharger %1 : impossible de créer %2 : %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1010"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1025"/> <source>%1 at %2</source> <translation>%1 sur %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1026"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1041"/> <source>Authentication request canceled.</source> <translation>Demande d'authentification annulée.</translation> </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1076"/> + <source>Secure Connection Failed</source> + <translation>Échec de la connexion sécurisée</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1077"/> + <source>There was an error during connection to: %1.</source> + <translation>Une erreur s'est produite pendant la connection à : %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1078"/> + <source>This could be a problem with the server's configuration, or it could be someone trying to impersonate the server.</source> + <translation>Cela pourrait être un problème avec la configuration du serveur, ou quelqu'un essaie de se faire passer pour le serveur.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1080"/> + <source>If you have connected to this server successfully in the past or trust this server, the error may be temporary and you can try again.</source> + <translation>Si vous vous êtes déjà connecté à ce serveur avec succès par le passé ou si vous faites confiance à ce serveur, l'erreur peut être temporaire et vous pouvez essayer de nouveau.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1084"/> + <source>Try again</source> + <translation>Essayer à nouveau</translation> + </message> </context> <context> <name>KDUpdater::LocalFileDownloader</name> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="490"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="503"/> <source>Cannot open source file '%1' for reading.</source> <translation>Impossible d'ouvrir le fichier source '%1' en lecture.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="506"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="519"/> <source>Cannot open destination file '%1' for writing.</source> <translation>Impossible d'ouvrir le fichier %1 en écriture.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="563"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="576"/> <source>Writing to %1 failed: %2</source> <translation>L'écriture de %1 à échouée : %2</translation> </message> @@ -329,17 +431,18 @@ <context> <name>KDUpdater::MkdirOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="402"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="465"/> <source>Invalid arguments: %1 arguments given, 1 expected.</source> <translation>Arguments invalides : %1 arguments fournis, 1 seul attendu.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="410"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="473"/> <source>Could not create folder %1: Unknown error.</source> <translation>Impossible de créer le dossier %1 : erreur indéterminée.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="449"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="505"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="507"/> <source>Cannot remove directory %1: %2</source> <translation>Impossible de supprimer le dossier %1 : %2</translation> </message> @@ -347,37 +450,37 @@ <context> <name>KDUpdater::MoveOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="205"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="269"/> <source>Could not backup file %1.</source> <translation>Impossible de sauvegarder le fichier %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="215"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="279"/> <source>Invalid arguments: %1 arguments given, 2 expected.</source> <translation>Arguments invalides : %1 arguments fournis, 2 attendus.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="226"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="290"/> <source>Could not remove destination file %1: %2</source> <translation>Impossible de supprimer le fichier de destination %1 : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="235"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="299"/> <source>Could not copy %1 to %2: %3</source> <translation>Impossible de copier %1 vers %2 : %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="248"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="312"/> <source>Cannot copy %1 to %2: %3</source> <translation>Impossible de copier %1 vers %2 : %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="254"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="318"/> <source>Cannot remove file %1.</source> <translation>Impossible de supprimer le fichier %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="267"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="331"/> <source>Cannot restore backup file for %1: %2</source> <translation></translation> </message> @@ -385,27 +488,27 @@ <context> <name>KDUpdater::PackagesInfo</name> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="97"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="103"/> <source>%1 contains invalid content: %2</source> <translation>%1 contient des informations non valides : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="261"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="269"/> <source>The file %1 does not exist.</source> <translation>Le fichier %1 n'existe pas.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="269"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="277"/> <source>Could not open %1.</source> <translation>Impossible d'ouvrir %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="281"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="289"/> <source>Parse error in %1 at %2, %3: %4</source> <translation>Erreur d'analyse syntaxique dans %1 à %2, %3 : %4</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="294"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="302"/> <source>Root element %1 unexpected, should be 'Packages'.</source> <translation>Élément racine %1 inattendu, il devrait se trouver dans 'Packages'.</translation> </message> @@ -413,37 +516,37 @@ <context> <name>KDUpdater::PrependFileOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="646"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="720"/> <source>Cannot backup file %1: %2</source> <translation>Impossible de sauvegarder le fichier %1 : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="659"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="733"/> <source>Invalid arguments: %1 arguments given, 2 expected.</source> <translation>Arguments invalides : %1 arguments fournis, 2 attendus.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="668"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="742"/> <source>Could not open file %1 for reading: %2</source> <translation>Impossible d'ouvrir le fichier %1 en lecture : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="686"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="760"/> <source>Could not open file %1 for writing: %2</source> <translation>Impossible d'ouvrir le fichier %1 en écriture : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="704"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="778"/> <source>Cannot find backup file for %1.</source> <translation>Impossible de trouver la sauvegarde du fichier %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="709"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="783"/> <source>Cannot restore backup file for %1.</source> <translation>Impossible de restaurer le fichier de sauvegarde pour %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="720"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="794"/> <source>Cannot restore backup file for %1: %2</source> <translation>Impossible de restaurer le fichier de sauvegarde pour %1 : %2</translation> </message> @@ -451,7 +554,7 @@ <context> <name>KDUpdater::ResourceFileDownloader</name> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="712"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="722"/> <source>Could not read resource file "%1". Reason:</source> <translation>Impossible de lire le fichier de ressources "%1". Raison : </translation> </message> @@ -459,22 +562,22 @@ <context> <name>KDUpdater::RmdirOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="485"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="544"/> <source>Invalid arguments: %1 arguments given, 1 expected.</source> <translation>Arguments invalides : %1 arguments fournis, 1 seul attendu.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="492"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="551"/> <source>Could not remove folder %1: The folder does not exist.</source> <translation>Impossible de supprimer le dossier %1 : ce dossier n'existe pas.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="501"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="560"/> <source>Could not remove folder %1: %2</source> <translation>Impossible de supprimer le dossier %1 : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="515"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="574"/> <source>Cannot recreate directory %1: %2</source> <translation>Impossible de recréer le dossier %1 : %2</translation> </message> @@ -482,37 +585,37 @@ <context> <name>KDUpdater::Task</name> <message> - <location filename="../../libs/kdtools/kdupdatertask.cpp" line="179"/> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="192"/> <source>%1 started</source> <translation>%1 commencée</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdatertask.cpp" line="192"/> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="205"/> <source>%1 cannot be stopped</source> <translation>%1 ne peut être stoppée</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdatertask.cpp" line="210"/> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="223"/> <source>Cannot stop task %1</source> <translation>Impossible d'arrêter la tâche %1</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdatertask.cpp" line="229"/> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="242"/> <source>%1 cannot be paused</source> <translation>%1 ne peut être mise en pause</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdatertask.cpp" line="247"/> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="260"/> <source>Cannot pause task %1</source> <translation>Impossible de mettre en pause %1</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdatertask.cpp" line="275"/> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="288"/> <source>Cannot resume task %1</source> <translation>Impossible de reprendre l'exécution de la tâche %1</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdatertask.cpp" line="331"/> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="344"/> <source>%1 done</source> <translation>%1 terminée</translation> </message> @@ -520,43 +623,46 @@ <context> <name>KDUpdater::UpdateFinder</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="177"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="182"/> <source>Could not access the package information of this application.</source> <translation>Impossible d'accéder aux informations contenues dans ce paquet pour cette application.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="188"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="193"/> <source>Could not access the update sources information of this application.</source> <translation>Impossible d'accéder aux informations de mise à jour pour cette application.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="211"/> - <source>%1 updates found.</source> - <translation>%1 mise(s) à jour trouvée(s).</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="288"/> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="510"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="301"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="545"/> <source>Downloading Updates.xml from update sources.</source> <translation>Téléchargement du fichier Updates.xml à partir des sources de mises à jour.</translation> </message> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="216"/> + <source>%n update(s) found.</source> + <translation> + <numerusform>%n mise à jour trouvée.</numerusform> + <numerusform>%n mises à jour trouvées.</numerusform> + </translation> + </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="303"/> - <source>Could not download updates from %1 ('%2')</source> - <translation>Impossible de télécharger les mises à jour pour %1 ('%2')</translation> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="309"/> + <source>Could not download update source %1 from ('%2')</source> + <translation>Impossible de télécharger l'emplacement des mises à jour pour %1 ('%2')</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="311"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="332"/> <source>Updates.xml file(s) downloaded from update sources.</source> <translation>Fichier(s) Updates.xml téléchargé(s) à partir des sources de mise à jour.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="343"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="365"/> <source>Computing applicable updates.</source> <translation>Calcul des mises à jour à appliquer.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="346"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="369"/> <source>Application updates computed.</source> <translation>Mises à jour de l'application calculées.</translation> </message> @@ -564,28 +670,28 @@ <context> <name>KDUpdater::UpdateSourcesInfo</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="122"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="143"/> <source>%1 contains invalid content: %2</source> <translation>%1 contient des informations invalides : %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="271"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="302"/> <source>Could not read "%1"</source> <translation>Impossible de lire "%1"</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="282"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="313"/> <source>XML Parse error in %1 at %2, %3: %4</source> <translation>Erreur d'analyse syntaxique du XML dans %1 à %2, %3 : %4</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="291"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="322"/> <source>Root element %1 unexpected, should be "UpdateSources"</source> <translation>Élément racine %1 inattendu, il devrait se trouver dans "UpdateSources"</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="331"/> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="342"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="362"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="373"/> <source>Could not save changes to "%1": %2</source> <translation>Impossible de sauvegarder les changements dans "%1" : %2</translation> </message> @@ -593,145 +699,398 @@ <context> <name>KDUpdater::UpdatesInfoData</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="51"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="63"/> <source>Could not read "%1"</source> <translation>Impossible de lire "%1"</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="60"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="72"/> <source>Parse error in %1 at %2, %3: %4</source> <translation>Erreur d'analyse syntaxique dans %1 à %2, %3 : %4</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="43"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="55"/> <source>Updates.xml contains invalid content: %1</source> <translation>Updates.xml contient des informations invalides : %1</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="67"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="79"/> <source>Root element %1 unexpected, should be "Updates".</source> <translation>Élément racine %1 inattendu, "Updates" aurait dû être trouvé.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="88"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="100"/> <source>ApplicationName element is missing.</source> <translation>L'élément 'ApplicationName' est manquant.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="93"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="105"/> <source>ApplicationVersion element is missing.</source> <translation>L'élément 'ApplicationVersion' est manquant.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="145"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="160"/> <source>PackageUpdate element without Name</source> <translation>L'élément 'PackageUpdate' ne possède pas l'attribut 'Name'</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="149"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="164"/> <source>PackageUpdate element without Version</source> <translation>L'élément 'PackageUpdate' ne possède pas l'attribut 'Version'</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="153"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="168"/> <source>PackageUpdate element without ReleaseDate</source> <translation>L'élément 'PackageUpdate' ne possède pas l'attribut 'ReleaseDate'</translation> </message> </context> <context> + <name>Lib7z</name> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="717"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1438"/> + <source>Could not retrieve number of items in archive</source> + <translation>Impossible de récupérer le nombre d'éléments dans l'archive</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="724"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1449"/> + <source>Could not retrieve path of archive item %1</source> + <translation>Impossible de récupérer le chemin de l'élément %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="746"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1409"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1465"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1567"/> + <source>Unknown exception caught (%1)</source> + <translation>Une exception de type inconnue a été attrapée (%1)</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1289"/> + <source>internal code: %1</source> + <translation>code interne : %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1310"/> + <source>not enough memory</source> + <translation>pas assez de mémoire</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1316"/> + <source>Error: %1</source> + <translation>Erreur : %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1336"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1542"/> + <source>Could not load codecs</source> + <translation>Impossible de charger les codecs</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1341"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1547"/> + <source>Could not retrieve default format</source> + <translation>Impossible de récupérer le format par défaut</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1387"/> + <source>Could not create archive %1. %2</source> + <translation>Impossible de créer l'archive %1. %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1429"/> + <source>CArc index %1 out of bounds [0, %2]</source> + <translation>Index CArc %1 hors limites [0, %2]</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1443"/> + <source>Item index %1 out of bounds [0, %2]</source> + <translation>Index de l'élément %1 hors limites [0, %2]</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1484"/> + <source>Could not create output file for writing: %1</source> + <translation>Impossible de créer le fichier de sortie : %1</translation> + </message> +</context> +<context> <name>Lib7z::ExtractItemJob</name> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1562"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1577"/> <source>Could not list archive: QIODevice not set or already destroyed.</source> <translation>Impossible de lister l'archive : QIODevice n'est pas renseigné ou à déjà été détruit.</translation> </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1586"/> + <source>Error while extracting '%1': %2</source> + <translation>Erreur lors de l'extraction '%1' : %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1589"/> + <source>Unknown exception caught (%1)</source> + <translation>Une exception de type inconnue a été attrapée (%1)</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1589"/> + <source>Failed</source> + <translation>Échec</translation> + </message> </context> <context> <name>Lib7z::ListArchiveJob</name> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="750"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="756"/> <source>Could not list archive: QIODevice already destroyed.</source> <translation>Impossible de lister l'archive : QIODevice n'est pas renseigné ou à déjà été détruit.</translation> </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="763"/> + <source>Unknown exception caught (%1)</source> + <translation>Une exception de type inconnue a été attrapée (%1)</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="763"/> + <source>Failed</source> + <translation>Échec</translation> + </message> </context> <context> - <name>QInstaller::AddQtCreatorArrayValueOperation</name> + <name>OpenArchiveInfo</name> <message> - <location filename="../../libs/installer/addqtcreatorarrayvalueoperation.cpp" line="73"/> - <source>exactly 4</source> - <translation>exactement 4</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="639"/> + <source>Could not load codecs</source> + <translation>Impossible de charger les codecs</translation> </message> <message> - <location filename="../../libs/installer/addqtcreatorarrayvalueoperation.cpp" line="72"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="643"/> + <source>Could not retrieve default format</source> + <translation>Impossible de récupérer le format par défaut</translation> </message> <message> - <location filename="../../libs/installer/addqtcreatorarrayvalueoperation.cpp" line="73"/> - <source> (group, arrayname, key, value)</source> - <translation> (groupe, nom du tableau, clé, valeur)</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="648"/> + <source>Could not open archive</source> + <translation>Impossible d'ouvrir l'archive</translation> </message> <message> - <location filename="../../libs/installer/addqtcreatorarrayvalueoperation.cpp" line="80"/> - <location filename="../../libs/installer/addqtcreatorarrayvalueoperation.cpp" line="138"/> - <source>Needed installer object in %1 operation is empty.</source> - <translation>Objet installeur requis dans %1 l'opération est vide.</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="652"/> + <source>No CArc found</source> + <translation>Aucun CArc n'a été trouvé</translation> </message> +</context> +<context> + <name>QIODeviceSequentialOutStream</name> <message> - <location filename="../../libs/installer/addqtcreatorarrayvalueoperation.cpp" line="87"/> - <source>There is no value set for %1 on the installer object.</source> - <translation>Il n'y a aucune valeur pour %1 dans l'objet installeur.</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="386"/> + <source>No device set for output stream</source> + <translation>Aucun dispositif n'est prêt pour le flux de sortie</translation> + </message> +</context> +<context> + <name>QInstaller</name> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="103"/> + <source>No marker found, stopped after %1.</source> + <translation>Aucun marqueur n'a été trouvé, arrêt après %1.</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="110"/> + <source>Cannot open file %1 for reading: %2</source> + <translation>Impossible d'ouvrir le fichier %1 en lecture : %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="119"/> + <location filename="../../libs/installer/fileio.cpp" line="128"/> + <source>Cannot open file %1 for writing: %2</source> + <translation>Impossible d'ouvrir le fichier %1 en écriture : %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="141"/> + <source>Read failed after %1 bytes: %2</source> + <translation>La lecture a échouée après %1 octets : %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="163"/> + <source>Copy failed. Error: %1</source> + <translation>La copie a échouée. Erreur : %1</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="181"/> + <source>Write failed after %1 bytes: %2</source> + <translation>L'écriture à échoué après %1 octets : %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="138"/> + <source>bytes</source> + <translation>octets</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="139"/> + <source>KiB</source> + <translation>KiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="140"/> + <source>MiB</source> + <translation>MiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="141"/> + <source>GiB</source> + <translation>GiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="142"/> + <source>TiB</source> + <translation>TiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="143"/> + <source>PiB</source> + <translation>PiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="144"/> + <source>EiB</source> + <translation>EiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="145"/> + <source>ZiB</source> + <translation>ZiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="146"/> + <source>YiB</source> + <translation>YiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="184"/> + <source>Could not remove file %1: %2</source> + <translation>Impossible de supprimer le fichier %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="225"/> + <source>Could not remove folder %1: %2</source> + <translation>Impossible de supprimer le dossier %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="295"/> + <location filename="../../libs/installer/fileutils.cpp" line="321"/> + <source>Could not create folder %1</source> + <translation>Impossible de créer le dossier %1</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="308"/> + <source>Could not copy file from %1 to %2: %3</source> + <translation>Impossible de copier le fichier de %1 vers %2 : %3</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="337"/> + <source>Could not move file from %1 to %2: %3</source> + <translation>Impossible de déplacer le fichier de %1 vers %2 : %3</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="349"/> + <location filename="../../libs/installer/fileutils.cpp" line="358"/> + <source>Could not create folder %1: %2</source> + <translation>Impossible de créer le dossier %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="368"/> + <source>Could not open temporary file: %1</source> + <translation>Impossible d'ouvrir le fichier temporaire : %1</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="387"/> + <source>Could not open temporary file for template %1: %2</source> + <translation>Impossible d'ouvrir le fichier temporaire pour le modèle %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="210"/> + <source>Could not create temporary file</source> + <translation>Impossible de créer le fichier temporaire</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="230"/> + <source>Could not retrieve property %1 for item %2</source> + <translation>Impossible de récupérer la propriété %1 pour l'élément %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="259"/> + <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> + <translation>Propriété %1 pour l'élément %2 n'est pas de type VT_FILETIME mais %3</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="279"/> + <source>Could not convert file time to local time</source> + <translation>Impossible de convertir l'heure du fichier vers l'heure locale</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="284"/> + <source>Could not convert local file time to system time</source> + <translation>Impossible de convertir l'heure du fichier vers l'heure du système</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="755"/> + <source>Corrupt installation</source> + <translation>Installation corrompue</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="756"/> + <source>Your installation seems to be corrupted. Please consider re-installing from scratch.</source> + <translation>Votre installation semble être corrompue. Veuillez retenter une nouvelle installation.</translation> + </message> + <message> + <location filename="../../libs/installer/utils.cpp" line="393"/> + <source>The specified module could not be found.</source> + <translation>Le module spécifié ne peut être trouvé.</translation> </message> </context> <context> <name>QInstaller::Component</name> <message> - <location filename="../../libs/installer/component.cpp" line="526"/> + <location filename="../../libs/installer/component.cpp" line="428"/> + <source>Components cannot have children in updater mode.</source> + <translation>Les composants ne peuvent avoir de composants fils en mode mise-à -jour.</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="554"/> <source>Could not open the requested translation file '%1'.</source> <translation>Impossible d'ouvrir le fichier de traduction '%1'.</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="550"/> + <location filename="../../libs/installer/component.cpp" line="573"/> <source>Could not open the requested UI file '%1'. Error: %2</source> <translation>Impossible d'ouvir le fichier d'IHM '%1'. Erreur : %2</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="559"/> + <location filename="../../libs/installer/component.cpp" line="582"/> <source>Could not load the requested UI file '%1'. Error: %2</source> <translation>Impossible de charger le fichier d'IHM '%1'. Erreur : %2</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="561"/> - <source>An error has occurred while reading the UI file.</source> - <translation>Une erreur s'est produite lors de la lecture du fichier d'IHM.</translation> + <location filename="../../libs/installer/component.cpp" line="1237"/> + <source>Cannot resolve isDefault in %1</source> + <translation>Impossible d'analyser 'isDefault' dans %1</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="591"/> + <location filename="../../libs/installer/component.cpp" line="611"/> <source>Could not open the requested license file '%1'. Error: %2</source> <translation>Impossible d'ouvrir le fichier de licence '%1'. Erreur %2</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="973"/> + <location filename="../../libs/installer/component.cpp" line="991"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="973"/> + <location filename="../../libs/installer/component.cpp" line="991"/> <source>Error: Operation %1 does not exist</source> <translation>Erreur : l'opération %1 n'existe pas</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="1191"/> - <source>Can't resolve isAutoDependOn in %1</source> - <translation>Impossible d'analyser 'isAutoDependOn' dans %1</translation> - </message> - <message> - <location filename="../../libs/installer/component.cpp" line="1241"/> - <source>Can't resolve isDefault in %1</source> - <translation>Impossible d'analyser 'isDefault' dans %1</translation> - </message> - <message> - <location filename="../../libs/installer/component.cpp" line="1403"/> + <location filename="../../libs/installer/component.cpp" line="1411"/> <source>Update Info: </source> <translation>Informations de mises à jour : </translation> </message> @@ -739,103 +1098,133 @@ <context> <name>QInstaller::ComponentModel</name> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2345"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2485"/> <source>Component Name</source> <translation>Nom du composant</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2347"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2487"/> + <source>Action</source> + <translation>Action</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2489"/> <source>Installed Version</source> <translation>Version installée</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2349"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2491"/> <source>New Version</source> <translation>Nouvelle version</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2351"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2493"/> + <source>Release Date</source> + <translation>Date de sortie</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2495"/> <source>Size</source> <translation>Taille</translation> </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="203"/> + <source>Component is marked for installation.</source> + <translation>Le composant est marqué pour installation.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="205"/> + <source>Component is marked for uninstallation.</source> + <translation>Le composant est marqué pour désinstallation.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="207"/> + <source>Component is installed.</source> + <translation>Le composant est installé.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="209"/> + <source>Component is not installed.</source> + <translation>Le composant n'est pas installé.</translation> + </message> </context> <context> <name>QInstaller::ComponentSelectionPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1013"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1420"/> <source>Alt+A</source> <comment>select default components</comment> <translatorcomment>Sélection des composants par défaut</translatorcomment> <translation>Alt+A</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1014"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1422"/> <source>Def&ault</source> <translation>Déf&aut</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1018"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1426"/> <source>Alt+R</source> <comment>reset to already installed components</comment> <translatorcomment>Revenir vers la liste des composants déjà installés</translatorcomment> <translation>Alt+R</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1019"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1428"/> <source>&Reset</source> <translation>&Effacer</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1028"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1437"/> <source>Alt+S</source> <comment>select all components</comment> <translatorcomment>Sélectionner tous les composants</translatorcomment> <translation>Alt+S</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1029"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1439"/> <source>&Select All</source> <translation>&Sélectionner tout</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1035"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1445"/> <source>Alt+D</source> <comment>deselect all components</comment> <translatorcomment>Désélectionner tous les composants</translatorcomment> <translation>Alt+D</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1036"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1447"/> <source>&Deselect All</source> <translation>&Désélectionner tout</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1102"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1521"/> <source>This component will occupy approximately %1 on your hard disk drive.</source> <translation>Ce composant va occuper environ %1 sur le disque dur.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1165"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1590"/> <source>Select Components</source> <translation>Sélection des composants</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1176"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1601"/> <source>Please select the components you want to update.</source> <translation>Veuillez sélectionner les composants que souhaitez mettre à jour.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1177"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1602"/> <source>Please select the components you want to install.</source> <translation>Veuillez sélectionner les composants que vous souhaitez installer.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1178"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1603"/> <source>Please select the components you want to uninstall.</source> <translation>Veuillez sélectionner les composants que vous souhaitez désinstaller.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1179"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1604"/> <source>Select the components to install. Deselect installed components to uninstall them.</source> <translation>Sélection des composants à installer. La désélection d'un composant installé entraîne sa désinstallation.</translation> </message> @@ -843,32 +1232,32 @@ <context> <name>QInstaller::ConsumeOutputOperation</name> <message> - <location filename="../../libs/installer/consumeoutputoperation.cpp" line="71"/> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="64"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/consumeoutputoperation.cpp" line="72"/> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="65"/> <source>at least 2</source> <translation>au moins 2</translation> </message> <message> - <location filename="../../libs/installer/consumeoutputoperation.cpp" line="80"/> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="73"/> <source>Needed installer object in %1 operation is empty.</source> <translation>Objet installeur requis dans %1 l'opération est vide.</translation> </message> <message> - <location filename="../../libs/installer/consumeoutputoperation.cpp" line="87"/> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="80"/> <source>Can not save the output of %1 to an empty installer key value.</source> <translation>Impossible de sauvegarder la sortie de %1 vers un installeur vide.</translation> </message> <message> - <location filename="../../libs/installer/consumeoutputoperation.cpp" line="101"/> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="94"/> <source>File '%1' does not exist or is not an executable binary.</source> <translation>Le fichier '%1' n'existe pas ou n'est pas un fichier binaire exécutable.</translation> </message> <message> - <location filename="../../libs/installer/consumeoutputoperation.cpp" line="119"/> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="115"/> <source>Running '%1' resulted in a crash.</source> <translation>Le lancement de '%1' s'est soldé par un crash.</translation> </message> @@ -876,70 +1265,98 @@ <context> <name>QInstaller::CopyDirectoryOperation</name> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="80"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="70"/> <source>2 or 3</source> <translation>2 ou 3</translation> </message> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="79"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="69"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="80"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="70"/> <source> (<source> <target> [forceOverwrite])</source> <translation> (<source> <cible> [forceOverwrite])</translation> </message> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="93"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="83"/> <source>Invalid argument in %0: Third argument needs to be forceOverwrite, if specified</source> <translation>Argument invalide dans %0 : le troisième argument devrait être à 'forceOverwrite', si spécifié</translation> </message> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="103"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="93"/> <source>Invalid arguments in %0: Directories are invalid: %1 %2</source> <translation>Arguments invalides dans %0 : les dossier sont invalides : %1 %2</translation> </message> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="136"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="126"/> <source>Could not create %0</source> <translation>Impossible de créer %0</translation> </message> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="143"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="133"/> <source>Failed to overwrite %1</source> <translation>L'écrasement de %1 à échoué</translation> </message> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="149"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="139"/> <source>Could not copy %0 to %1, error was: %3</source> <translation>Impossible de copier %0 vers %1, l'erreur rencontrée est : %3</translation> </message> <message> - <location filename="../../libs/installer/copydirectoryoperation.cpp" line="170"/> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="160"/> <source>Could not remove %0</source> <translation>Impossible de supprimer %0</translation> </message> </context> <context> + <name>QInstaller::CopyFileTask</name> + <message> + <location filename="../../libs/installer/copyfiletask.cpp" line="63"/> + <source>Invalid task item count.</source> + <translation>Nombre incorrect d'éléments de la tâche.</translation> + </message> + <message> + <location filename="../../libs/installer/copyfiletask.cpp" line="72"/> + <source>Could not open source '%1' for read. Error: %2.</source> + <translation>Impossible d'ouvrir le fichier source '%1' en lecture. Erreur : %2.</translation> + </message> + <message> + <location filename="../../libs/installer/copyfiletask.cpp" line="88"/> + <source>Could not open target '%1' for write. Error: %2.</source> + <translation>Impossible d'ouvrir le fichier source '%1' en écriture. Erreur : %2.</translation> + </message> + <message> + <location filename="../../libs/installer/copyfiletask.cpp" line="105"/> + <source>Writing to target '%1' failed. Error: %2.</source> + <translation>Échec de l'écriture de la cible '%1'. Erreur : %2.</translation> + </message> +</context> +<context> <name>QInstaller::CreateDesktopEntryOperation</name> <message> - <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="146"/> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="125"/> + <source>Could not backup file %1: %2</source> + <translation>Impossible de faire une sauvegarde du fichier %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="133"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="147"/> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="134"/> <source>exactly 2</source> <translation>exactement 2</translation> </message> <message> - <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="156"/> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="144"/> <source>Failed to overwrite %1</source> <translation>L'écrasement de %1 à échoué</translation> </message> <message> - <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="163"/> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="150"/> <source>Could not write Desktop Entry at %1</source> <translation>Impossible d'écrire un élément 'Desktop Entry' vers %1</translation> </message> @@ -947,50 +1364,65 @@ <context> <name>QInstaller::CreateLinkOperation</name> <message> - <location filename="../../libs/installer/createlinkoperation.cpp" line="68"/> + <location filename="../../libs/installer/createlinkoperation.cpp" line="57"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/createlinkoperation.cpp" line="69"/> + <location filename="../../libs/installer/createlinkoperation.cpp" line="58"/> <source>exactly 2</source> <translation>exactement 2</translation> </message> + <message> + <location filename="../../libs/installer/createlinkoperation.cpp" line="68"/> + <source>Could not create link from %1 to %2.</source> + <translation>Impossible de créer le lien symbolique de %1 vers %2.</translation> + </message> + <message> + <location filename="../../libs/installer/createlinkoperation.cpp" line="88"/> + <source>Could not remove link from %1 to %2.</source> + <translation>Impossible de supprimer le lien de %1 vers %2.</translation> + </message> </context> <context> <name>QInstaller::CreateLocalRepositoryOperation</name> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="94"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="91"/> <source>Could not set file permissions %1!</source> <translation>Impossible d'attribuer les autorisations du fichier %1 !</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="131"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="112"/> + <source>Could not remove file %1: %2</source> + <translation>Impossible de supprimer le fichier %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="130"/> <source>Could not move file %1 to %2. Error: %3</source> <translation>Impossible de déplacer le fichier %1 vers %2. Erreur : %3</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="160"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="159"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="161"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="160"/> <source>exactly 2</source> <translation>exactement 2</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="173"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="172"/> <source>Installer needs to be an offline version: %1.</source> <translation>L'installeur devrait être une version hors ligne : %1.</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="216"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="215"/> <source>Could not open file: %1</source> <translation>Impossible d'ouvrir le fichier %1</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="222"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="221"/> <source>Could not read: %1. Error: %2</source> <translation>Impossible de lire : %1. Erreur : %2</translation> </message> @@ -1000,28 +1432,28 @@ <translation>Impossible d'ouvrir le fichier %1. Erreur : %2</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="309"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="269"/> <source>Could not create target dir: %1.</source> <translation>Impossible de créer le dossier cible : %1.</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="338"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="322"/> <source>Unknown exception caught: %1.</source> <translation>Une exception de type inconnue a été attrapée : %1.</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="354"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="338"/> <source>Removing file: %0</source> <translation>Suppression du fichier : %0</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="357"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="341"/> <source>Could not remove %0.</source> <translation>Impossible de supprimer %0.</translation> </message> <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="377"/> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="381"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="360"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="364"/> <source>Cannot remove directory %1: %2</source> <translation>Impossible de supprimer le dossier %1 : %2</translation> </message> @@ -1039,18 +1471,23 @@ <translation>2 ou 3</translation> </message> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="191"/> - <source> (optional: 'workingDirectory=...')</source> - <translation> (optionnel : 'workingDirectory=...')</translation> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="192"/> + <source> (optional: 'workingDirectory=...', 'iconPath=...', 'iconId=...')</source> + <translation>(optionnel : 'workingDirectory=...', 'iconPath=...', 'iconId=...')</translation> </message> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="209"/> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="213"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="208"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="212"/> <source>Could not create folder %1: %2.</source> <translation>Impossible de créer le dossier %1 : %2.</translation> </message> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="231"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="222"/> + <source>Failed to overwrite %1: %2</source> + <translation>L'écrasement de %1 à échoué : %2</translation> + </message> + <message> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="230"/> <source>Could not create link %1: %2</source> <translation>Impossible de créer le raccourci %1 : %2</translation> </message> @@ -1058,94 +1495,148 @@ <context> <name>QInstaller::DownloadArchivesJob</name> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="124"/> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="173"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="110"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="156"/> <source>Canceled</source> <translation>Annulé</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="160"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="146"/> <source>Downloading hash signature failed.</source> <translation>Le téléchargement de l'empreinte de hashage à échoué.</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="236"/> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="276"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="219"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="254"/> <source>Download Error</source> <translation>Erreur de téléchargement</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="236"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="219"/> <source>Hash verification while downloading failed. This is a temporary error, please retry.</source> <translation>La vérification de l'empreinte pendant le téléchargement à échoué. C'est une erreur temporaire, veuillez réessayer.</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="241"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="224"/> <source>Could not verify Hash</source> <translation>Impossible de vérifier l'empreinte</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="276"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="254"/> <source>Could not download archive: %1 : %2</source> <translation>Impossible de télécharger l'archive : %1 : %2</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="288"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="266"/> <source>Could not fetch archives: %1 Error while loading %2</source> <translation>Impossible de charger les archives : %1 Erreur pendant le chargement %2</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="325"/> - <source>Downloading archive hash for component: %1</source> - <translation>Téléchargement de l'empreinte de l'archive pour le composant : %1</translation> - </message> - <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="327"/> - <source>Downloading archive for component: %1</source> - <translation>Téléchargement de l'archive pour le composant : %1</translation> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="305"/> + <source>Downloading archive '%1' for component: %2</source> + <translation>Téléchargement de l'archive '%1' pour le composant : %2</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="330"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="308"/> <source>Scheme not supported: %1 (%2)</source> <translation>Schéma non supporté : %1 (%2)</translation> </message> <message> - <location filename="../../libs/installer/downloadarchivesjob.cpp" line="333"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="311"/> <source>Could not find component for: %1.</source> <translation>Impossible de trouver le composant pour : %1.</translation> </message> </context> <context> + <name>QInstaller::Downloader</name> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="126"/> + <source>Target '%1' not open for write. Error: %2.</source> + <extracomment>%2 is a sentence describing the error.</extracomment> + <translation>La cible '%1' n'est pas ouverte en écriture. Erreur : %2.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="145"/> + <source>Writing to target '%1' failed. Error: %2.</source> + <extracomment>%2 is a sentence describing the error.</extracomment> + <translation>Échec de l'écriture de la cible '%1'. Erreur : %2.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="194"/> + <source>Redirect loop detected '%1'.</source> + <translation>Cycle de redirection détecté '%1'.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="211"/> + <source>Checksum mismatch detected '%1'.</source> + <translation>Sommes de contrôle différentes détecté '%1'.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="245"/> + <source>Network error while downloading '%1': %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>Erreur réseau pendant le téléchargement de '%1' : %2.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="250"/> + <source>Unknown network error while downloading: %1.</source> + <extracomment>%1 is a sentence describing the error</extracomment> + <translation>Erreur réseau indéterminée pendant le téléchargement : %1.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="315"/> + <source>Pause and resume not supported by network transfers.</source> + <translation>La mise en pause et la reprise ne sont pas supportés lors des transferts réseaux.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="325"/> + <source>Invalid source '%1'. Error: %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>Source invalide '%1'. Erreur : %2.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="342"/> + <source>Target file '%1' already exists but is not a file.</source> + <translation>Le fichier cible '%1' existe déjà mais il n'est pas de type fichier.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="350"/> + <source>Could not open target '%1' for write. Error: %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>Impossible d'ouvrir le fichier cible '%1' en écriture. Erreur : %2.</translation> + </message> +</context> +<context> <name>QInstaller::ElevatedExecuteOperation</name> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="92"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="85"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="93"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="86"/> <source>at least 1</source> <translation>au moins 1</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="155"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="148"/> <source>Execution failed: Could not start detached: "%1"</source> <translation>L'exécution à échouée : impossible de démarrer en mode arrière plan : "%1"</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="207"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="200"/> <source>Execution failed: Could not start: "%1"(%2)</source> <translation>L'exécution à échouée : impossible de démarrer "%1" (%2)</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="223"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="216"/> <source>Execution failed(Crash): "%1"</source> <translation>L'exécution à échouée (plantage) : "%1"</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="230"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="223"/> <source>Execution failed(Unexpected exit code: %1): "%2"</source> <translation>L'exécution à échouée (code de retour inattendu : %1) : "%2"</translation> </message> @@ -1153,25 +1644,25 @@ Erreur pendant le chargement %2</translation> <context> <name>QInstaller::EnvironmentVariableOperation</name> <message> - <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="142"/> + <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="127"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="143"/> - <source>2 or 3</source> - <translation>2 ou 3</translation> + <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="128"/> + <source>2 to 4</source> + <translation>2 sur 4</translation> </message> </context> <context> <name>QInstaller::ExtractArchiveOperation</name> <message> - <location filename="../../libs/installer/extractarchiveoperation.cpp" line="67"/> + <location filename="../../libs/installer/extractarchiveoperation.cpp" line="60"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/extractarchiveoperation.cpp" line="68"/> + <location filename="../../libs/installer/extractarchiveoperation.cpp" line="61"/> <source>exactly 2</source> <translation>exactement 2</translation> </message> @@ -1179,263 +1670,302 @@ Erreur pendant le chargement %2</translation> <context> <name>QInstaller::ExtractArchiveOperation::Runnable</name> <message> - <location filename="../../libs/installer/extractarchiveoperation_p.h" line="185"/> + <location filename="../../libs/installer/extractarchiveoperation_p.h" line="186"/> <source>Could not open %1 for reading: %2.</source> <translation>Impossible d'ouvrir %1 en lecture : %2.</translation> </message> <message> - <location filename="../../libs/installer/extractarchiveoperation_p.h" line="193"/> + <location filename="../../libs/installer/extractarchiveoperation_p.h" line="194"/> <source>Error while extracting '%1': %2</source> <translation>Erreur lors de l'extraction '%1' : %2</translation> </message> <message> - <location filename="../../libs/installer/extractarchiveoperation_p.h" line="195"/> + <location filename="../../libs/installer/extractarchiveoperation_p.h" line="196"/> <source>Unknown exception caught while extracting %1.</source> <translation>Une exception de type inconnue a été attrapée pendant l'extraction de %1.</translation> </message> </context> <context> - <name>QInstaller::FinishedPage</name> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1811"/> - <source>Completing the %1 Wizard</source> - <translation>Finalisation de l'Assistant de %1</translation> - </message> + <name>QInstaller::FakeStopProcessForUpdateOperation</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1818"/> - <source>Click Done to exit the %1 Wizard.</source> - <translation>Cliquer sur Terminer pour quitter %1 Assistant.</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1820"/> - <source>Click Finish to exit the %1 Wizard.</source> - <translation>Cliquer sur Terminer pour quitter %1 Assistant.</translation> + <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="61"/> + <source>Number of arguments does not match: one is required</source> + <translation>Le nombre d'arguments ne correspond pas : un seul est requis</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1850"/> - <source>Restart</source> - <translation>Redémarrer</translation> + <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="68"/> + <source>Could not get package manager core.</source> + <translation>Impossible de récupérer le noyau du gestionnaire de paquets.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1875"/> - <source>Run %1 now.</source> - <translation>Lancer %1 maintenant.</translation> + <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="83"/> + <source>This process should be stopped before continuing: %1</source> + <translation>Le processus suivant devrait être stoppé avant de continuer : %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1881"/> - <source>The %1 Wizard failed.</source> - <translation>%1 Assistant à échoué.</translation> + <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="87"/> + <source>These processes should be stopped before continuing: %1</source> + <translation>Les processus suivant devraient être stoppés avant de continuer : %1</translation> </message> </context> <context> - <name>QInstaller::GetRepositoryMetaInfoJob</name> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="195"/> - <source>Empty repository URL.</source> - <translation>L'URL du dépôt est vide.</translation> - </message> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="241"/> - <source>Retrieving component meta information...</source> - <translation>Récupération des métadonnées des composants...</translation> - </message> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="200"/> - <source>Invalid repository URL: %1</source> - <translation>URL du dépôt invalide : %1</translation> - </message> + <name>QInstaller::FileTaskObserver</name> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="206"/> - <source>URL scheme not supported: %1 (%2)</source> - <translation>Format d'URL non supporté : %1 (%2)</translation> - </message> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="257"/> - <source>Could not move Updates.xml to target location. Error: %1</source> - <translation>Impossible de déplacer 'Updates.xml' vers la cible. Erreur : %1</translation> - </message> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="263"/> - <source>Could not open Updates.xml for reading. Error: %1</source> - <translation>Impossible d'ouvrir 'Updates.xml' en lecture. Erreur : %1</translation> + <location filename="../../libs/installer/observer.cpp" line="71"/> + <source>%1 of %2</source> + <translation>%1 sur %2</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="274"/> - <source>Could not fetch a valid version of Updates.xml from repository: %1. Error: %2</source> - <translation>Impossible de récupérer une version valide de 'Updates.xml' à partir du dépôt : %1. Erreur : %2</translation> + <location filename="../../libs/installer/observer.cpp" line="74"/> + <source>%1 received.</source> + <translation>%1 reçu.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="279"/> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="381"/> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="504"/> - <source>Download Error</source> - <translation>Erreur de téléchargement</translation> + <location filename="../../libs/installer/observer.cpp" line="79"/> + <source>(%1/sec)</source> + <translation>(%1/s)</translation> </message> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="287"/> - <source>Parsing component meta information...</source> - <translation>Analyse des métadonnées du composant...</translation> + <message numerus="yes"> + <location filename="../../libs/installer/observer.cpp" line="90"/> + <source>%n day(s), </source> + <translation> + <numerusform>%n jour, </numerusform> + <numerusform>%n jours, </numerusform> + </translation> </message> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="338"/> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="561"/> - <source>Repository updates received.</source> - <translation>Mises à jour reçues via le dépôt.</translation> + <message numerus="yes"> + <location filename="../../libs/installer/observer.cpp" line="94"/> + <source>%n hour(s), </source> + <translation> + <numerusform>%n heure, </numerusform> + <numerusform>%n heures, </numerusform> + </translation> </message> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="364"/> - <source>Finished updating component meta information.</source> - <translation>La mise à jour des métadonnées du composant est terminée.</translation> + <message numerus="yes"> + <location filename="../../libs/installer/observer.cpp" line="98"/> + <source>%n minute(s)</source> + <translation> + <numerusform>%n minute</numerusform> + <numerusform>%n minutes</numerusform> + </translation> </message> - <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="375"/> - <source>Could not fetch Updates.xml from repository: %1. Error: %2</source> - <translation>Impossible de récupérer 'Updates.xml' sur le dépôt : %1. Erreur %2</translation> + <message numerus="yes"> + <location filename="../../libs/installer/observer.cpp" line="103"/> + <source>%n second(s)</source> + <translation> + <numerusform>%n seconde</numerusform> + <numerusform>%n secondes</numerusform> + </translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="397"/> - <source>Retrieving component information from remote repository...</source> - <translation>Récupération des informations du composant à partir du dépôt distant...</translation> + <location filename="../../libs/installer/observer.cpp" line="105"/> + <source> - %1%2%3%4 remaining.</source> + <translation> - %1%2%3%4 restant.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="468"/> - <source>Could not open meta info archive: %1. Error: %2</source> - <translation>Impossible d'ouvrir les métadonnées de l'archive : %1. Erreur : %2</translation> + <location filename="../../libs/installer/observer.cpp" line="107"/> + <source> - unknown time remaining.</source> + <translation> - impossible d'estimer le temps restant.</translation> </message> +</context> +<context> + <name>QInstaller::FinishedPage</name> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="478"/> - <source>The hash of one component does not match the expected one.</source> - <translation>Une empreinte numérique d'un composant ne correspond pas avec celle attendue.</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2335"/> + <source>Completing the %1 Wizard</source> + <translation>Finalisation de l'Assistant de %1</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="479"/> - <source>Bad hash.</source> - <translation>Mauvaise empreinte numérique.</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2342"/> + <source>Click Done to exit the %1 Wizard.</source> + <translation>Cliquer sur Terminer pour quitter %1 Assistant.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="498"/> - <source>Could not download meta information for component: %1. Error: %2</source> - <translation>Impossible de télécharger les métadonnées du composant : %1. Erreur : %2</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2344"/> + <source>Click Finish to exit the %1 Wizard.</source> + <translation>Cliquer sur Terminer pour quitter %1 Assistant.</translation> </message> -</context> -<context> - <name>QInstaller::GetRepositoryMetaInfoJob::ZipRunnable</name> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="92"/> - <source>Error while extracting '%1': %2</source> - <translation>Erreur pendant l'extraction de '%1' : %2</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2383"/> + <source>Restart</source> + <translation>Redémarrer</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="94"/> - <source>Unknown exception caught while extracting %1.</source> - <translation>Une exception de type inconnue a été attrapée pendant l'extraction de %1.</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2413"/> + <source>Run %1 now.</source> + <translation>Lancer %1 maintenant.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="97"/> - <source>Could not open %1 for reading. Error: %2</source> - <translation>Impossible d'ouvrir %1 en lecture : %2</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2418"/> + <source>The %1 Wizard failed.</source> + <translation>%1 Assistant à échoué.</translation> </message> </context> <context> <name>QInstaller::GlobalSettingsOperation</name> <message> - <location filename="../../libs/installer/globalsettingsoperation.cpp" line="65"/> + <location filename="../../libs/installer/globalsettingsoperation.cpp" line="58"/> <source>Settings are not writable</source> <translation>Les préférences ne sont pas accessibles en écriture</translation> </message> <message> - <location filename="../../libs/installer/globalsettingsoperation.cpp" line="75"/> + <location filename="../../libs/installer/globalsettingsoperation.cpp" line="68"/> <source>Failed to write settings</source> <translation>Impossible de sauvegarder les préférences</translation> </message> <message> - <location filename="../../libs/installer/globalsettingsoperation.cpp" line="117"/> + <location filename="../../libs/installer/globalsettingsoperation.cpp" line="110"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/globalsettingsoperation.cpp" line="118"/> - <source>3 or 4</source> - <translation>3 ou 4</translation> + <location filename="../../libs/installer/globalsettingsoperation.cpp" line="111"/> + <source>3, 4 or 5</source> + <translation>3, 4 ou 5</translation> </message> </context> <context> <name>QInstaller::InstallIconsOperation</name> <message> - <location filename="../../libs/installer/installiconsoperation.cpp" line="140"/> + <location filename="../../libs/installer/installiconsoperation.cpp" line="115"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/installiconsoperation.cpp" line="141"/> + <location filename="../../libs/installer/installiconsoperation.cpp" line="116"/> <source>1 or 2</source> <translation>1 ou 2</translation> </message> <message> - <location filename="../../libs/installer/installiconsoperation.cpp" line="141"/> + <location filename="../../libs/installer/installiconsoperation.cpp" line="116"/> <source> (Sourcepath, [Vendorprefix])</source> <translation> (Sourcepath, [Vendorprefix])</translation> </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="125"/> + <source>Invalid Argument: source folder must not be empty.</source> + <translation>Argument invalide : le dossier source ne peut être vide.</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="174"/> + <source>Could not backup file %1: %2</source> + <translation>Impossible de faire une sauvegarde du fichier %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="187"/> + <source>Failed to overwrite %1: %2</source> + <translation>L'écrasement de %1 à échoué : %2</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="198"/> + <source>Failed to copy file %1: %2</source> + <translation>La copie du fichier %1 à échoué : %2</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="208"/> + <source>Could not create folder at %1: %2</source> + <translation>Impossible de créer le dossier %1 : %2</translation> + </message> </context> <context> <name>QInstaller::IntroductionPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="767"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="883"/> <source>Setup - %1</source> <translation>Installation - %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="772"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="891"/> <source>Welcome to the %1 Setup Wizard.</source> - <translation>Bienvenue dans l'Assitant d'Installation de %1.</translation> + <translation>Bienvenue dans l'Assitant d'Installation de : %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="896"/> + <source>Add or remove components</source> + <translation>Ajouter ou supprimer des modules</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="902"/> + <source>Update components</source> + <translation>Mettre à jour les modules</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="908"/> + <source>Remove all components</source> + <translation>Supprimer tous les modules</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="920"/> + <source>Retrieving information from remote installation sources...</source> + <translation>Récupération des informations nécessaires à partir d'une source distante...</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="972"/> + <source>At least one valid and enabled repository required for this action to succeed.</source> + <translation>Au moins un dépôt valide et actif est requis pour pouvoir continuer.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1007"/> + <source>No updates available.</source> + <translation>Aucune mise à jour n'est disponible.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1026"/> + <source> Only local package management available.</source> + <translation>La gestion des modules n'est disponible qu'en local.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1177"/> + <source>Quit</source> + <translation>Quitter</translation> </message> </context> <context> <name>QInstaller::LicenseAgreementPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="830"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1244"/> <source>License Agreement</source> <translation>Contrat de Licence</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="854"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1268"/> <source>Alt+A</source> <comment>agree license</comment> <translatorcomment>Accepter la licence</translatorcomment> <translation>Alt+A</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="946"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1353"/> <source>Please read the following license agreement. You must accept the terms contained in this agreement before continuing with the installation.</source> <translation>Veuillez lire le contrat de licence suivant. Vous devez en accepter les termes avant de poursuivre l'installation.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="948"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1355"/> <source>I accept the license.</source> <translation>J'accepte la licence.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="949"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1356"/> <source>I do not accept the license.</source> <translation>Je n'accepte pas la licence.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="951"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1358"/> <source>Please read the following license agreements. You must accept the terms contained in these agreements before continuing with the installation.</source> <translation>Veuillez lire les contrats de licence suivants. Vous devez en accepter les termes avant de poursuivre l'installation.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="953"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1360"/> <source>I accept the licenses.</source> <translation>J'accepte les licences.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="954"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1361"/> <source>I do not accept the licenses.</source> <translation>Je n'accepte pas les licences.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="867"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1281"/> <source>Alt+D</source> <comment>do not agree license</comment> <translatorcomment>Refuser les contrats de licence</translatorcomment> @@ -1445,22 +1975,22 @@ Erreur pendant le chargement %2</translation> <context> <name>QInstaller::LicenseOperation</name> <message> - <location filename="../../libs/installer/licenseoperation.cpp" line="67"/> + <location filename="../../libs/installer/licenseoperation.cpp" line="60"/> <source>No license files found to copy.</source> <translation>Aucun fichier de licence n'a trouvé à la copie.</translation> </message> <message> - <location filename="../../libs/installer/licenseoperation.cpp" line="74"/> + <location filename="../../libs/installer/licenseoperation.cpp" line="67"/> <source>Needed installer object in %1 operation is empty.</source> <translation>Objet installeur requis dans %1 l'opération est vide.</translation> </message> <message> - <location filename="../../libs/installer/licenseoperation.cpp" line="89"/> + <location filename="../../libs/installer/licenseoperation.cpp" line="82"/> <source>Can not write license file: %1.</source> <translation>Impossible d'écrire le fichier de licence : %1.</translation> </message> <message> - <location filename="../../libs/installer/licenseoperation.cpp" line="106"/> + <location filename="../../libs/installer/licenseoperation.cpp" line="99"/> <source>No license files found to delete.</source> <translation>Aucun fichier de licence n'a été trouvé à la suppression.</translation> </message> @@ -1468,115 +1998,176 @@ Erreur pendant le chargement %2</translation> <context> <name>QInstaller::LineReplaceOperation</name> <message> - <location filename="../../libs/installer/linereplaceoperation.cpp" line="69"/> + <location filename="../../libs/installer/linereplaceoperation.cpp" line="62"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/linereplaceoperation.cpp" line="70"/> + <location filename="../../libs/installer/linereplaceoperation.cpp" line="63"/> <source>exactly 3</source> <translation>exactement 3</translation> </message> + <message> + <location filename="../../libs/installer/linereplaceoperation.cpp" line="73"/> + <source>Failed to open '%1' for reading.</source> + <translation>Impossible d'ouvrir le fichier '%1' en lecture.</translation> + </message> + <message> + <location filename="../../libs/installer/linereplaceoperation.cpp" line="90"/> + <source>Failed to open '%1' for writing.</source> + <translation>Impossible d'ouvrir le fichier '%1' en écriture.</translation> + </message> </context> <context> - <name>QInstaller::MacReplaceInstallNamesOperation</name> + <name>QInstaller::MetadataJob</name> <message> - <location filename="../../libs/installer/macreplaceinstallnamesoperation.cpp" line="73"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> + <location filename="../../libs/installer/metadatajob.cpp" line="75"/> + <source>Missing package manager core engine.</source> + <translation>Le moteur du gestionnaire de paquets est absent.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="79"/> + <source>Preparing meta information download...</source> + <translation>Préparation du téléchargement des métadonnées...</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="112"/> + <source>Meta data download canceled.</source> + <translation>Le téléchargement des métadonnées a été annulé.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="137"/> + <source>Missing proxy credentials.</source> + <translation>Les identifiants du proxy sont absents.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="168"/> + <source>Authentication failed.</source> + <translation>L'authentification a échoué.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="179"/> + <location filename="../../libs/installer/metadatajob.cpp" line="261"/> + <source>Unknown exception during download.</source> + <translation>Une exception non spécifiée s'est produite pendant le téléchargement.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="190"/> + <source>Retrieving meta information from remote repository...</source> + <translation>Récupération des métadonnées à partir du dépôt distant...</translation> </message> <message> - <location filename="../../libs/installer/macreplaceinstallnamesoperation.cpp" line="74"/> - <source>at least 3</source> - <translation>au moins 3</translation> + <location filename="../../libs/installer/metadatajob.cpp" line="195"/> + <source>Failure to fetch repositories.</source> + <translation>Échec lors de la récupération de la liste des dépôts.</translation> </message> <message> - <location filename="../../libs/installer/macreplaceinstallnamesoperation.cpp" line="83"/> - <source>One of the given arguments is empty. Argument1=%1; Argument2=%2, Argument3=%3</source> - <translation>Un des arguments fourni est vide. Argument1 = %1 ; Argument2 = %2 ; Argument3 = %3</translation> + <location filename="../../libs/installer/metadatajob.cpp" line="212"/> + <source>Unknown exception during extracting.</source> + <translation>Une exception non spécifiée a été attrapée pendant l'extraction.</translation> </message> <message> - <location filename="../../libs/installer/macreplaceinstallnamesoperation.cpp" line="151"/> - <source>Can't invoke otool. Is Xcode installed?</source> - <translation>L'invocation d'otool n'est pas possible. Xcode est-il bien installé ?</translation> + <location filename="../../libs/installer/metadatajob.cpp" line="239"/> + <source>Extracting meta information...</source> + <translation>Extraction des métadonnées...</translation> </message> <message> - <location filename="../../libs/installer/macreplaceinstallnamesoperation.cpp" line="234"/> - <source>Can't start process %0.</source> - <translation>Impossible de démarrer le processus %0.</translation> + <location filename="../../libs/installer/metadatajob_p.h" line="85"/> + <source>Error while extracting '%1': %2</source> + <translation>Erreur lors de l'extraction de '%1' : %2</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob_p.h" line="88"/> + <source>Unknown exception caught while extracting %1.</source> + <translation>Une exception non spécifiée a été attrapée pendant l'extraction de %1.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob_p.h" line="92"/> + <source>Could not open %1 for reading. Error: %2</source> + <translation>Impossible d'ouvrir %1 en lecture : %2</translation> </message> </context> <context> <name>QInstaller::PackageManagerCore</name> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="416"/> - <source>Error writing Uninstaller</source> - <translation>Erreur lors de l'écriture du Désinstalleur</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="566"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="563"/> <source> Downloading packages...</source> <translation> Téléchargement des paquets...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="590"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="586"/> <source>Installation canceled by user</source> <translation>L'installation a été annulée par l'utilisateur</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="591"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="588"/> <source>All downloads finished.</source> <translation>Tous les téléchargements sont terminés.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2283"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2424"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="607"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="610"/> <source>Cancelling the Installer</source> <translation>Annulation de l'Installeur</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="650"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="365"/> + <source>Error writing Maintenance Tool</source> + <translation>Erreur lors de l'écriture de l'Outil de Maintenance</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="672"/> <source>Authentication Error</source> <translation>Erreur d'authentification</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="650"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="672"/> <source>Some components could not be removed completely because admin rights could not be acquired: %1.</source> <translation>Certains composants n'ont pu être supprimés totalement car les droits d'administrateur n'ont pu être obtenus : %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="655"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="677"/> <source>Unknown error.</source> <translation>Erreur non déterminée.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="655"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="677"/> <source>Some components could not be removed completely because an unknown error happened.</source> <translation>Certains composants n'ont pu être supprimés car une erreur indéterminée s'est produite.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="783"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="842"/> <source>Application not running in Package Manager mode!</source> <translation>L'application ne fonctionne pas en mode 'Gestion des Paquets' !</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="790"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="849"/> <source>No installed packages found.</source> <translation>Aucun paquet installé n'a été localisé.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="868"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="926"/> <source>Application running in Uninstaller mode!</source> <translation>L'application fonctionne en mode Désinstallation !</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="2315"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="977"/> + <source>There is an important update available, please run the updater first.</source> + <translation>Une mise à jour importante est disponible, veuillez l'exécuter en premier.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="1446"/> + <source>Error while elevating access rights.</source> + <translation>Erreur lors de l'élévation des privilèges.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2455"/> <source>invalid</source> <translation>invalide</translation> </message> @@ -1584,56 +2175,36 @@ Téléchargement des paquets...</translation> <context> <name>QInstaller::PackageManagerCorePrivate</name> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="387"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1516"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1542"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1708"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1785"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="406"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1531"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1557"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1732"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1801"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="506"/> - <source>Component(s) added as automatic dependencies</source> - <translation>Composant(s) ajouté(s) comme dépendances automatiques</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="548"/> - <source>Added as dependency for %1.</source> - <translation>Ajouté en tant que dépendance de %1.</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="557"/> - <source>Component(s) that have resolved Dependencies</source> - <translation>Composant(s) ayant des dépendances</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="566"/> - <source>Selected Component(s) without Dependencies</source> - <translation>Composant(s) sélectionné(s) ne possédant pas de dépendance</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="803"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="754"/> <source>Access error</source> <translation>Erreur d'accès</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="804"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="755"/> <source>Format error</source> <translation>Erreur de formatage</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="805"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="756"/> <source>Could not write installer configuration to %1: %2</source> <translation>Impossible d'écrire la configuration de l'installeur vers %1 : %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="921"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="872"/> <source>Stop Processes</source> <translation>Arrêter les processus</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="921"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="872"/> <source>These processes should be stopped to continue: %1</source> @@ -1642,261 +2213,257 @@ Téléchargement des paquets...</translation> %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="929"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1813"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1991"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="880"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1832"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2010"/> <source>Installation canceled by user</source> <translation>L'installation a été annulée par l'utilisateur</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1029"/> - <source>Writing uninstaller.</source> - <translation>Écriture du désinstalleur.</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1042"/> - <source>Uninstaller is not a bundle</source> - <translation>Le désinstalleur n'est pas un 'bundle'</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1058"/> - <source>Could not write uninstaller data to %1: %2</source> - <translation>Impossible d'écrire les données du désinstalleur vers %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1072"/> - <source>Could not write uninstaller to %1: %2</source> - <translation>Impossible d'écrire le désinstalleur vers %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1282"/> - <source>Found a binary data file, but we are the installer and we should read the binary resource from our very own binary!</source> - <translation>Un fichier de données au format binaire a été trouvé, mais en tant qu'installeur, je devrais être en mesure de lire les ressources binaires de mon propre binaire !</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1325"/> - <source>Could not write uninstaller binary data to %1: %2</source> - <translation>Impossible d'écrire les données du binaire de désinstallation vers %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1372"/> - <source>ProductName should be set</source> - <translation>'ProductName' devrait être valorisé</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1396"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1411"/> <source>Variable 'TargetDir' not set.</source> <translation>La variable 'TargetDir' n'est pas renseignée.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1434"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1671"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1449"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1695"/> <source>Preparing the installation...</source> <translation>Préparation de l'installation...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1443"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1459"/> <source>It is not possible to install from network location</source> <translation>Il n'est pas possible de procéder à l'installation à partir d'un emplacement réseau</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1485"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1487"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1500"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1502"/> <source>Creating local repository</source> <translation>Création du dépôt en local</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1522"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1688"/> - <source>Creating Uninstaller</source> - <translation>Création du Désinstalleur</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1532"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1547"/> <source> Installation finished!</source> <translation> Installation terminée !</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1548"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1563"/> <source> Installation aborted!</source> <translation> Installation annulée !</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1582"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1597"/> <source>It is not possible to run that operation from a network location</source> <translation>Il n'est pas possible d'effectuer cette opération à partir d'un emplacement réseau</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1677"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1701"/> <source>Removing deselected components...</source> <translation>Suppression des éléments désélectionnés...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1698"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1722"/> <source> Update finished!</source> <translation> Mise à jour terminée !</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1714"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1738"/> <source> Update aborted!</source> <translation> Mise à jour annulée !</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1777"/> - <source> -Uninstallation completed successfully!</source> - <translation> -La désinstallation s'est terminée avec succès !</translation> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="393"/> + <source>Unresolved dependencies</source> + <translation>Impossible de résoudre les dépendances</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1788"/> - <source> -Uninstallation aborted!</source> - <translation> -La désinstallation a été annulée !</translation> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="980"/> + <source>Writing maintenance tool.</source> + <translation>Écriture de l'Outil de Maintenance.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="986"/> + <source>Failed to seek in file %1: %2</source> + <translation>Impossible de rechercher dans le fichier %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="993"/> + <source>Maintenance tool is not a bundle</source> + <translation>L'Outil de Maintenance n'est pas un Bundle</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1007"/> + <source>Could not write maintenance tool data to %1: %2</source> + <translation>Impossible d'écrire les données de l'Outil de Maintenance vers %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1026"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1327"/> + <source>Could not remove data file '%1': %2</source> + <translation>Impossible de supprimer le fichier '%1' : %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1032"/> + <source>Could not write maintenance tool to %1: %2</source> + <translation>Impossible d'écrire l'Outil de Maintenance vers %1 : %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1332"/> + <source>Could not write maintenance tool binary data to %1: %2</source> + <translation>Impossible d'écrire les données de l'Outil de Maintenance vers %1 : %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1807"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1537"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1712"/> + <source>Creating Maintenance Tool</source> + <translation>Création de l'Outil de Maintenance</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1810"/> + <source>Uninstallation completed successfully.</source> + <translation>La désinstallation s'est terminée avec succès.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1810"/> + <source>Uninstallation aborted.</source> + <translation>La désinstallation a été annulée.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1826"/> <source> Installing component %1</source> <translation> Installation du composant %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1836"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2009"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1855"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2028"/> <source>Installer Error</source> <translation>Erreur dans l'Installeur</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1837"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1856"/> <source>Error during installation process (%1): %2</source> <translation>Erreur pendant le processus d'installation (%1) : %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1903"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1921"/> <source>Cannot prepare uninstall</source> <translation>Impossible de préparer la désinstallation</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1934"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1952"/> <source>Cannot start uninstall</source> <translation>Impossible de démarrer la désinstallation</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2010"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2029"/> <source>Error during uninstallation process: %1</source> <translation>Erreur pendant le processus de désinstallation : %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2042"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2057"/> <source>Unknown error</source> <translation>Erreur non déterminée</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2060"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2075"/> <source>Could not retrieve remote tree: %1.</source> <translation>Impossible de récupérer l'arborescence distante : %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2089"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2104"/> <source>Failure to read packages from: %1.</source> <translation>Impossible de lire les paquets à partir de : %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2115"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2129"/> <source>Could not retrieve meta information: %1</source> <translation>Impossible de récupérer les métadonnées : %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2170"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2181"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2186"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2197"/> <source>Could not add temporary update source information.</source> <translation>Impossible d'ajouter des information de source de mise à jour temporaire.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2194"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2212"/> <source>Could not find any update source information.</source> <translation>Impossible de trouver des informations de source de mise à jour.</translation> </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2282"/> + <source>Dependency cycle between components detected: '%1' and '%2'.</source> + <translation>Dépendance cyclique détectée pour les modules suivants : '%1' et '%2'.</translation> + </message> </context> <context> <name>QInstaller::PackageManagerGui</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="235"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="256"/> <source>%1 Setup</source> <translation>%1 Installateur</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="237"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="258"/> <source>Maintain %1</source> <translation>Maintenir %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="504"/> - <location filename="../../libs/installer/packagemanagergui.cpp" line="518"/> - <source>Question</source> - <translation>Question</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="505"/> - <source>Do you want to abort the %1 process?</source> - <translation>Souhaitez-vous annuler le processus %1 ?</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="505"/> - <source>uninstallation</source> - <translation>désinstallation</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="602"/> + <source>Do you want to cancel the installation process?</source> + <translation>Êtes-vous sûr de vouloir annuler cette installation ?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="506"/> - <source>installation</source> - <translation>installation</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="604"/> + <source>Do you want to cancel the uninstallation process?</source> + <translation>Êtes-vous sûr de vouloir annuler cette désinstallation ?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="510"/> - <source>installer</source> - <translation>installateur</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="606"/> + <source>Do you want to quit the installer application?</source> + <translation>Êtes-vous sûr de vouloir quitter cet assistant d'installation ?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="512"/> - <source>uninstaller</source> - <translation>désinstallateur</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="608"/> + <source>Do you want to quit the uninstaller application?</source> + <translation>Êtes-vous sûr de vouloir quitter cet assistant de désinstallation ?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="514"/> - <source>maintenance</source> - <translation>maintenance</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="610"/> + <source>Do you want to quit the maintenance application?</source> + <translation>Êtes-vous sûr de vouloir quitter cet outil de maintenance ?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="519"/> - <source>Do you want to quit the %1 application?</source> - <translation>Souhaitez-vous quitter l'application %1 ?</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="615"/> + <source>Question</source> + <translation>Question</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="560"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="657"/> <source>Settings</source> <translation>Paramètres</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="616"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="714"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="617"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="715"/> <source>It is not possible to install from network location. Please copy the installer to a local drive</source> <translation>Il n'est possible de procéder à l'installation à partir d'un emplacement réseau. @@ -1906,14 +2473,14 @@ Veuillez copier cet installateur sur un disque local</translation> <context> <name>QInstaller::PerformInstallationForm</name> <message> - <location filename="../../libs/installer/performinstallationform.cpp" line="95"/> - <location filename="../../libs/installer/performinstallationform.cpp" line="151"/> - <location filename="../../libs/installer/performinstallationform.cpp" line="168"/> + <location filename="../../libs/installer/performinstallationform.cpp" line="97"/> + <location filename="../../libs/installer/performinstallationform.cpp" line="158"/> + <location filename="../../libs/installer/performinstallationform.cpp" line="171"/> <source>&Show Details</source> <translation>&Voir le détail</translation> </message> <message> - <location filename="../../libs/installer/performinstallationform.cpp" line="151"/> + <location filename="../../libs/installer/performinstallationform.cpp" line="158"/> <source>&Hide Details</source> <translation>&Masquer le détail</translation> </message> @@ -1921,345 +2488,244 @@ Veuillez copier cet installateur sur un disque local</translation> <context> <name>QInstaller::PerformInstallationPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1733"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2254"/> <source>U&ninstall</source> <translation>&Désinstaller</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1734"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2255"/> <source>Uninstalling %1</source> <translation>Désinstallation de %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1738"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2259"/> <source>&Update</source> <translation>&Mise à jour</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1739"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2260"/> <source>Updating components of %1</source> <translation>Mise à jour du composant %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1743"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2264"/> <source>&Install</source> <translation>&Installation</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1744"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2265"/> <source>Installing %1</source> <translation>Installation de %1</translation> </message> </context> <context> - <name>QInstaller::QtPatchOperation</name> - <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="174"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> - </message> + <name>QInstaller::ProxyCredentialsDialog</name> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="175"/> - <source>exactly 3</source> - <translation>exactement 3</translation> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="14"/> + <source>Dialog</source> + <translation>Dialog</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="187"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>Objet installeur requis dans "%1" l'opération est vide.</translation> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="20"/> + <source>The proxy %1 requires a username and password.</source> + <translation>Le proxy %1 requiert une authentification par identifiant et mot de passe.</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="202"/> - <source>First argument should be 'linux', 'mac' or 'windows'. No other type is supported at this time.</source> - <translation>Le premier argument devrait être 'linux', 'mac' ou 'windows'. À l'heure actuelle, aucun autre type n'est supporté.</translation> - </message> - <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="209"/> - <source>Could not find the needed QmakeOutputInstallerKey(%1) value on the installer object. The ConsumeOutput operation on the valid qmake needs to be called first.</source> - <translation>Impossible de trouver QmakeOutputInstallerKey(%1) de cet objet 'installer'. L'opération ConsumeOutput d'un qmake valide doit être appelée en premier.</translation> - </message> - <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="228"/> - <source>QMake from the current Qt version -(%1)is not existing. Please file a bugreport with this dialog at https://bugreports.qt-project.org.</source> - <translation>QMake issu de la version Qt courante -(%1) n'existe pas. Veuillez signaler ce bug sur https://bugreports.qt-project.org.</translation> - </message> - <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="236"/> - <source>The output of -%1 -query -is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. -output: "%2"</source> - <translation>La sortie de -Requête %1 -ne peut être parsée. Veuillez signaler ce bug sur https://bugreports.qt-project.org. -Sortie : "%2"</translation> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="29"/> + <source>Username:</source> + <translation>Identifiant :</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="250"/> - <source>Qt patch error: new Qt dir(%1) -needs to be less than 255 characters.</source> - <translation>Erreur de patch Qt : nouveau répertoire Qt (%1) -doit être inférieur à 255 caractères.</translation> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="36"/> + <source>Username</source> + <translation>Identifiant</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="287"/> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="342"/> - <source>Qt patch error: Can not open %1.(%2)</source> - <translation>Erreur de patch Qt : impossible d'ouvrir %1. (%2)</translation> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="43"/> + <source>Password:</source> + <translation>Mot de passe :</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="411"/> - <source>The installer was not able to get the unpatched path from -%1.(maybe it is broken or removed) -It tried to patch the Qt binaries, but all other files in Qt are unpatched. -This could result in a broken Qt version. -Sometimes it helps to restart the installer with a switched off antivirus software.</source> - <translation>Cette installateur n'a pu trouver le chemin non-patché de -%1 (chemin erroné ou supprimé) -Il a essayé de patcher les binaires Qt, mais les autres fichiers de Qt restent non-patché. -Il est possible que la version de Qt ne fonctionne plus. -Si vous avez un antivirus, veuillez le désactiver temporairement : cela débloque parfois la situation.</translation> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="53"/> + <source>Password</source> + <translation>Mot de passe</translation> </message> </context> <context> <name>QInstaller::ReadyForInstallationPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1478"/> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1664"/> - <source>&Show Details</source> - <translation>&Voir le détail</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1511"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2029"/> <source>U&ninstall</source> <translation>&Désinstaller</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1512"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2030"/> <source>Ready to Uninstall</source> <translation>Prêt à désinstaller</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1513"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2031"/> <source>Setup is now ready to begin removing %1 from your computer.<br><font color="red">The program directory %2 will be deleted completely</font>, including all content in that directory!</source> <translation>L'installateur est maintenant prêt à supprimer %1 de votre ordinateur. <br><font color="red">Le répertoire du programme %2 va être complètement supprimé</font>, en incluant tout le contenu de ce dossier !</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1521"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2040"/> <source>U&pdate</source> <translation>&Mise à jour</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1522"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2041"/> <source>Ready to Update Packages</source> <translation>Prêt à mettre à jour les paquets</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1523"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2042"/> <source>Setup is now ready to begin updating your installation.</source> <translation>L'installateur est prêt à mettre à jour votre installation.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1526"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2045"/> <source>&Install</source> <translation>&Installation</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1527"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2046"/> <source>Ready to Install</source> <translation>Prêt à installer</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1528"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2047"/> <source>Setup is now ready to begin installing %1 on your computer.</source> <translation>L'installateur est maintenant prêt à effectuer la copie de %1 sur votre ordinateur.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1581"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2108"/> <source>Not enough disk space to store temporary files and the installation! Available space: %1, at least required %2.</source> <translation>Il n'y a pas assez d'espace disque pour stocker les fichiers temporaires ainsi que le programme ! Espace disponible : %1, nécessite au moins %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1588"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2117"/> <source>Not enough disk space to store all selected components! Available space: %1, at least required: %2.</source> <translation>Il n'y a pas assez d'espace disque pour stocker tous les composants sélectionnés ! Espace disponible : %1, nécessite au moins %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1595"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2125"/> <source>Not enough disk space to store temporary files! Available space: %1, at least required: %2.</source> <translation>Il n'y a pas assez d'espace disque pour stocker les fichiers temporaires ! Espace disponible : %1, nécessite au moins %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1603"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2134"/> <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 1% of the volume's space available afterwards. %1</source> <translation>Le volume que vous avez sélectionné pour l'installation semble avoir assez d'espace disponible, mais disposera de moins 1% d'espace libre ensuite. %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1608"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2139"/> <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 100 MB available afterwards. %1</source> <translation>Le volume que vous avez sélectionné pour l'installation semble avoir assez d'espace disponible, mais disposera de moins de 100 Mo d'espace libre ensuite. %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1622"/> - <source>Can not resolve all dependencies!</source> - <translation>Impossible de résoudre les dépendances !</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2145"/> + <source>Installation will use %1 of disk space.</source> + <translation>L'installation va occuper %1 d'espace disque.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1640"/> - <source>Components about to be removed.</source> - <translation>Composants sur le point d'être supprimés.</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2155"/> + <source>Cannot resolve all dependencies.</source> + <translation>Impossible de résoudre les dépendances.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1664"/> - <source>&Hide Details</source> - <translation>&Masquer le détail</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2171"/> + <source>Components about to be removed.</source> + <translation>Composants sur le point d'être supprimés.</translation> </message> </context> <context> - <name>QInstaller::RegisterDefaultDebuggerOperation</name> - <message> - <location filename="../../libs/installer/registerdefaultdebuggeroperation.cpp" line="137"/> - <source>Invalid arguments in %0: %1 arguments given, 2 expected.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, 2 attendus.</translation> - </message> - <message> - <location filename="../../libs/installer/registerdefaultdebuggeroperation.cpp" line="103"/> - <location filename="../../libs/installer/registerdefaultdebuggeroperation.cpp" line="145"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>Objet installeur requis dans "%1" l'opération est vide.</translation> - </message> + <name>QInstaller::RegisterFileTypeOperation</name> <message> - <location filename="../../libs/installer/registerdefaultdebuggeroperation.cpp" line="93"/> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="99"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/registerdefaultdebuggeroperation.cpp" line="94"/> - <source>exactly 2</source> - <translation>exactement 2</translation> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="100"/> + <source>2 to 5</source> + <translation>2 sur 5</translation> </message> <message> - <location filename="../../libs/installer/registerdefaultdebuggeroperation.cpp" line="108"/> - <source>There is no value set for %1 on the installer object.</source> - <translation>Il n'y a aucune valeur pour %1 dans l'objet installeur.</translation> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="152"/> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="215"/> + <source>Registering file types is only supported on Windows.</source> + <translation>L'association d'une ou plusieurs extensions n'est supporté que sous Windows.</translation> </message> <message> - <location filename="../../libs/installer/registerdefaultdebuggeroperation.cpp" line="122"/> - <source>Can't read from tool chains xml file(%1) correctly.</source> - <translation>Impossible de lire la chaîne de compilation xml (%1) correctement.</translation> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="164"/> + <source>Register File Type: Invalid arguments</source> + <translation>Engistrement des exensions par défaut : arguments invalides</translation> </message> </context> <context> - <name>QInstaller::RegisterFileTypeOperation</name> + <name>QInstaller::RemoteObject</name> <message> - <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="106"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> - </message> - <message> - <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="107"/> - <source>2 to 5</source> - <translation>2 sur 5</translation> + <location filename="../../libs/installer/remoteobject.h" line="99"/> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>Impossible de lire les données après envoi de la commande : %1. Octets attendus : %2, reçus : %3. Erreur : %4</translation> </message> +</context> +<context> + <name>QInstaller::RemoteServerConnection</name> <message> - <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="171"/> - <source>Register File Type: Invalid arguments</source> - <translation>Engistrement des exensions par défaut : arguments invalides</translation> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="186"/> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="300"/> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="391"/> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>Impossible de lire les données après envoi de la commande : %1. Octets attendus : %2, reçus : %3. Erreur : %4</translation> </message> </context> <context> - <name>QInstaller::RegisterQtInCreatorQNXOperation</name> + <name>QInstaller::ReplaceOperation</name> <message> - <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="104"/> + <location filename="../../libs/installer/replaceoperation.cpp" line="62"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="105"/> - <source>at least 5</source> - <translation>au moins 5</translation> - </message> - <message> - <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="112"/> - <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="193"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>Objet installeur requis dans "%1" l'opération est vide.</translation> + <location filename="../../libs/installer/replaceoperation.cpp" line="63"/> + <source>exactly 3</source> + <translation>exactement 3</translation> </message> <message> - <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="118"/> - <source>There is no value set for %1 on the installer object.</source> - <translation>Il n'y a aucune valeur pour %1 dans l'objet installeur.</translation> + <location filename="../../libs/installer/replaceoperation.cpp" line="73"/> + <source>Failed to open %1 for reading</source> + <translation>Impossible d'ouvrir le fichier %1 en lecture</translation> </message> <message> - <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="185"/> - <source>Invalid arguments in %0: %1 arguments given, minimum 4 expected.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, mininum 4 sont attendus.</translation> + <location filename="../../libs/installer/replaceoperation.cpp" line="83"/> + <source>Failed to open %1 for writing</source> + <translation>Impossible d'ouvrir le fichier %1 en écriture</translation> </message> </context> <context> - <name>QInstaller::RegisterToolChainOperation</name> - <message> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="75"/> - <source>at least 4</source> - <translation>au moins 4</translation> - </message> - <message> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="84"/> - <source>Needed installer object in '%1' operation is empty.</source> - <translation>Objet installeur requis dans "%1" l'opération est vide.</translation> - </message> - <message> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="89"/> - <source>There is no value set for '%1' on the installer object.</source> - <translation>Il n'y a aucune valeur pour %1 dans l'objet installeur.</translation> - </message> - <message> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="134"/> - <source>Invalid arguments in %0: %1 arguments given, minimum 4 expected.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, mininum 4 sont attendus.</translation> - </message> + <name>QInstaller::Resource</name> <message> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="142"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>Objet installeur requis dans "%1" l'opération est vide.</translation> + <location filename="../../libs/installer/binaryformat.cpp" line="173"/> + <source>Could not open Resource '%1' read-only.</source> + <translation>Le fichier de ressource '%1' ne peut être ouvert en lecture seule.</translation> </message> <message> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="114"/> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="176"/> - <source>Can't read from tool chains xml file(%1) correctly.</source> - <translation>Impossible de lire la chaîne de compilation xml (%1) correctement.</translation> - </message> - <message> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="74"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> - </message> - <message> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="121"/> - <location filename="../../libs/installer/registertoolchainoperation.cpp" line="183"/> - <source>Some arguments are not right in %1 operation.</source> - <translation>Certains arguments ne sont pas corrects dans l'opération %1.</translation> - </message> -</context> -<context> - <name>QInstaller::ReplaceOperation</name> - <message> - <location filename="../../libs/installer/replaceoperation.cpp" line="69"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> + <location filename="../../libs/installer/binaryformat.cpp" line="242"/> + <source>Read failed after %1 bytes: %2</source> + <translation>La lecture a échouée après %1 octets : %2</translation> </message> <message> - <location filename="../../libs/installer/replaceoperation.cpp" line="70"/> - <source>exactly 3</source> - <translation>exactement 3</translation> + <location filename="../../libs/installer/binaryformat.cpp" line="247"/> + <source>Write failed after %1 bytes: %2</source> + <translation>L'écriture à échoué après %1 octets : %2</translation> </message> </context> <context> <name>QInstaller::RestartPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1921"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2472"/> <source>Completing the %1 Setup Wizard</source> <translation>Finalisation de l'Assistant d'installation de %1</translation> </message> @@ -2267,227 +2733,105 @@ Si vous avez un antivirus, veuillez le désactiver temporairement : cela débloq <context> <name>QInstaller::ScriptEngine</name> <message> - <location filename="../../libs/installer/scriptengine.cpp" line="257"/> + <location filename="../../libs/installer/scriptengine.cpp" line="620"/> <source>Could not open the requested script file at %1: %2.</source> <translation>Impossible d'ouvrir le fichier de script requis à %1 : %2.</translation> </message> <message> - <location filename="../../libs/installer/scriptengine.cpp" line="274"/> - <source>Exception while loading the component script: '%1'</source> - <translation>Exception levée pendant le chargement du composant de script : '%1'</translation> - </message> - <message> - <location filename="../../libs/installer/scriptengine.cpp" line="278"/> - <source>Could not load the component script inside a script context: '%1'</source> - <translation>Impossible de charger le composant de script dans un contexte de script : '%1'</translation> - </message> - <message> - <location filename="../../libs/installer/scriptengine.cpp" line="288"/> - <source>Fatal error while evaluating a script.</source> - <translation>Erreur fatale lors de l'évualation d'un script.</translation> + <location filename="../../libs/installer/scriptengine.cpp" line="638"/> + <source>Exception while loading the component script '%1'. (%2)</source> + <translation>Exception levée pendant le chargement du composant de script : '%1' (%2)</translation> </message> </context> <context> <name>QInstaller::SelfRestartOperation</name> <message> - <location filename="../../libs/installer/selfrestartoperation.cpp" line="64"/> + <location filename="../../libs/installer/selfrestartoperation.cpp" line="57"/> <source>Installer object needed in '%1' operation is empty.</source> <translation>Objet installeur requis dans '%1' l'opération est vide.</translation> </message> <message> - <location filename="../../libs/installer/selfrestartoperation.cpp" line="70"/> + <location filename="../../libs/installer/selfrestartoperation.cpp" line="63"/> <source>Self Restart: Only valid within updater or packagemanager mode.</source> <translation>Rechargement automatique : valide uniquement dans les modes Mise à jour ou Gestionnaire de paquets.</translation> </message> <message> - <location filename="../../libs/installer/selfrestartoperation.cpp" line="76"/> + <location filename="../../libs/installer/selfrestartoperation.cpp" line="69"/> <source>Self Restart: Invalid arguments</source> <translation>Rechargement automatique : arguments invalides</translation> </message> </context> <context> - <name>QInstaller::SetDemosPathOnQtOperation</name> - <message> - <location filename="../../libs/installer/setdemospathonqtoperation.cpp" line="67"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> - </message> - <message> - <location filename="../../libs/installer/setdemospathonqtoperation.cpp" line="68"/> - <source>exactly 2</source> - <translation>exactement 2</translation> - </message> - <message> - <location filename="../../libs/installer/setdemospathonqtoperation.cpp" line="85"/> - <source>The output of -'%1 -query' -is not parseable. Please file a bugreport with this dialog at https://bugreports.qt-project.org. -output: %2</source> - <translation>La sortie de -Requête %1 -ne peut être parsée. Veuillez signaler ce bug sur https://bugreports.qt-project.org. -Sortie : "%2"</translation> - </message> - <message> - <location filename="../../libs/installer/setdemospathonqtoperation.cpp" line="99"/> - <source>Qt patch error: new Qt demo path '%1' -needs to be less than 255 characters.</source> - <translation>Erreur de patch Qt : nouveau répertoire Qt (%1) -doit être inférieur à 255 caractères.</translation> - </message> -</context> -<context> - <name>QInstaller::SetExamplesPathOnQtOperation</name> - <message> - <location filename="../../libs/installer/setexamplespathonqtoperation.cpp" line="67"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> - </message> - <message> - <location filename="../../libs/installer/setexamplespathonqtoperation.cpp" line="68"/> - <source>exactly 2</source> - <translation>exactement 2</translation> - </message> - <message> - <location filename="../../libs/installer/setexamplespathonqtoperation.cpp" line="85"/> - <source>The output of -'%1 -query' -is not parseable. Please file a bugreport with this dialog at https://bugreports.qt-project.org. -output: %2</source> - <translation>La sortie de -Requête %1 -ne peut être parsée. Veuillez signaler ce bug sur https://bugreports.qt-project.org. -Sortie : "%2"</translation> - </message> - <message> - <location filename="../../libs/installer/setexamplespathonqtoperation.cpp" line="99"/> - <source>Qt patch error: new Qt example path '%1' -needs to be less than 255 characters.</source> - <translation>Erreur de patch Qt : nouveau répertoire Qt (%1) -doit être inférieur à 255 caractères.</translation> - </message> -</context> -<context> - <name>QInstaller::SetImportsPathOnQtCoreOperation</name> - <message> - <location filename="../../libs/installer/setimportspathonqtcoreoperation.cpp" line="110"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> - </message> - <message> - <location filename="../../libs/installer/setimportspathonqtcoreoperation.cpp" line="111"/> - <source>exactly 2</source> - <translation>exactement 2</translation> - </message> - <message> - <location filename="../../libs/installer/setimportspathonqtcoreoperation.cpp" line="120"/> - <source>Qt patch error: new Qt imports path '%1' -needs to be less than 255 characters.</source> - <translation>Erreur de patch Qt : nouveau répertoire d'imports Qt (%1) -doit être inférieur à 255 caractères.</translation> - </message> -</context> -<context> - <name>QInstaller::SetPathOnQtCoreOperation</name> + <name>QInstaller::ServerAuthenticationDialog</name> <message> - <location filename="../../libs/installer/setpathonqtcoreoperation.cpp" line="114"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="14"/> + <source>Server Requires Authentication</source> + <translation>Le serveur requiert une authentification</translation> </message> <message> - <location filename="../../libs/installer/setpathonqtcoreoperation.cpp" line="115"/> - <source>exactly 3</source> - <translation>exactement 3</translation> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="20"/> + <source>You need to supply a username and password to access this site.</source> + <translation>Vous devez saisir un identifiant et un mot de passe pour accéder à ce site.</translation> </message> <message> - <location filename="../../libs/installer/setpathonqtcoreoperation.cpp" line="138"/> - <source>The second type/value needs to be one of: %1</source> - <translation>Le second type ou valeur doit appartenir à : %1</translation> - </message> -</context> -<context> - <name>QInstaller::SetPluginPathOnQtCoreOperation</name> - <message> - <location filename="../../libs/installer/setpluginpathonqtcoreoperation.cpp" line="109"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="30"/> + <source>Username:</source> + <translation>Identifiant :</translation> </message> <message> - <location filename="../../libs/installer/setpluginpathonqtcoreoperation.cpp" line="110"/> - <source>exactly 2</source> - <translation>exactement 2</translation> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="40"/> + <source>Password:</source> + <translation>Mot de passe :</translation> </message> <message> - <location filename="../../libs/installer/setpluginpathonqtcoreoperation.cpp" line="119"/> - <source>Qt patch error: new Qt plugin path '%1' -needs to be less than 255 characters.</source> - <translation>Erreur de patch Qt : nouveau répertoire Qt (%1) -doit être inférieur à 255 caractères.</translation> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="77"/> + <source>%1 at %2</source> + <translation>%1 à %2</translation> </message> </context> <context> - <name>QInstaller::SetQtCreatorValueOperation</name> + <name>QInstaller::SettingsOperation</name> <message> - <location filename="../../libs/installer/setqtcreatorvalueoperation.cpp" line="72"/> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> + <location filename="../../libs/installer/settingsoperation.cpp" line="72"/> + <source>Missing argument(s) '%1' calling '%2' with arguments '%3'.</source> + <translation>Argument(s) manquant(s) : '%1' appelle '%2' avec les arguments '%3'.</translation> </message> <message> - <location filename="../../libs/installer/setqtcreatorvalueoperation.cpp" line="73"/> - <source>exactly 4</source> - <translation>exactement 4</translation> - </message> - <message> - <location filename="../../libs/installer/setqtcreatorvalueoperation.cpp" line="73"/> - <source> (rootInstallPath, group, key, value)</source> - <translation> (rootInstallPath, groupe, clé, valeur)</translation> - </message> - <message> - <location filename="../../libs/installer/setqtcreatorvalueoperation.cpp" line="80"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>Objet installeur requis dans "%1" l'opération est vide.</translation> - </message> - <message> - <location filename="../../libs/installer/setqtcreatorvalueoperation.cpp" line="97"/> - <source>There is no value set for '%1' on the installer object.</source> - <translation>Il n'y a aucune valeur pour '%1' dans l'objet installeur.</translation> - </message> - <message> - <location filename="../../libs/installer/setqtcreatorvalueoperation.cpp" line="134"/> - <source>Needed installer object in '%1' operation is empty.</source> - <translation>Objet installeur requis dans "%1" l'opération est vide.</translation> + <location filename="../../libs/installer/settingsoperation.cpp" line="82"/> + <source>Current method argument calling '%1' with arguments '%2' is not supported. Please use set, remove, add_array_value or remove_array_value.</source> + <translation>Méthode actuelle appelant '%1' avec les arguments '%2' n'est pas supporté. Veuillez utiliser 'set', 'remove', 'add_array_value' ou 'remove_array_value'.</translation> </message> </context> <context> <name>QInstaller::SimpleMoveFileOperation</name> <message> - <location filename="../../libs/installer/simplemovefileoperation.cpp" line="62"/> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="55"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Arguments invalides dans %0 : %1 arguments fournis, %2 attendus %3.</translation> </message> <message> - <location filename="../../libs/installer/simplemovefileoperation.cpp" line="63"/> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="56"/> <source>exactly 2</source> <translation>exactement 2</translation> </message> <message> - <location filename="../../libs/installer/simplemovefileoperation.cpp" line="72"/> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="65"/> <source>None of the arguments can be empty: source '%1', target '%2'.</source> <translation>Aucun des arguments fournis ne peut être vide : source '%1', destination '%2'.</translation> </message> <message> - <location filename="../../libs/installer/simplemovefileoperation.cpp" line="83"/> - <source>Can not move source '%1' to target '%2', because target exists and is not removable.</source> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="76"/> + <source>Cannot move source '%1' to target '%2', because target exists and is not removable.</source> <translation>Impossible de déplacer la source '%1' vers la cible '%2', car la destination existe et ne peut être supprimée.</translation> </message> <message> - <location filename="../../libs/installer/simplemovefileoperation.cpp" line="92"/> - <source>Can not move source '%1' to target '%2': %3</source> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="85"/> + <source>Cannot move source '%1' to target '%2': %3</source> <translation>Impossible de déplacer la source '%1' vers la cible '%2' : %3</translation> </message> <message> - <location filename="../../libs/installer/simplemovefileoperation.cpp" line="97"/> - <location filename="../../libs/installer/simplemovefileoperation.cpp" line="107"/> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="90"/> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="100"/> <source>Move '%1' to '%2'.</source> <translation>Déplacement de '%1' vers '%2'.</translation> </message> @@ -2495,12 +2839,12 @@ doit être inférieur à 255 caractères.</translation> <context> <name>QInstaller::StartMenuDirectoryPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1376"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1928"/> <source>Start Menu shortcuts</source> <translation>Raccourcis du Menu Démarrer</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1377"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1929"/> <source>Select the Start Menu in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.</source> <translation>Sélectionnez l'endroit dans le Menu Démarrer où vous souhaitez placer un raccourci. Vous pouvez également saisir un nom ou créer un nouveau dossier.</translation> </message> @@ -2508,574 +2852,197 @@ doit être inférieur à 255 caractères.</translation> <context> <name>QInstaller::TargetDirectoryPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1257"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1682"/> <source>Installation Folder</source> <translation>Dossier d'installation</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1264"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1689"/> <source>Please specify the folder where %1 will be installed.</source> <translation>Veuillez indiquer le dossier où %1 sera installé.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1277"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1702"/> <source>Alt+R</source> <comment>browse file system to choose a file</comment> <translatorcomment>Naviguer dans l'explorateur de fichier pour sélectionner un fichier</translatorcomment> <translation>Alt+R</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1278"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1703"/> <source>B&rowse...</source> <translation>&Parcourir...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1314"/> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1328"/> - <source>Error</source> - <translation>Erreur</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1314"/> - <source>The install directory cannot be empty, please specify a valid folder.</source> - <translation>Le dossier d'installation ne peut être vide, veuillez indiquer un dossier valide.</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1328"/> - <source>As the install directory is completely deleted on uninstall, installing in %1 is forbidden.</source> - <translation>Étant donné que le dossier d'installation est complement supprimé lors de la désinstallation, il est interdit d'installer dans %1.</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1338"/> - <source>Warning</source> - <translation>Attention</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1338"/> - <source>You have selected an existing, non-empty folder for installation. Note that it will be completely wiped on uninstallation of this application. It is not advisable to install into this folder as installation might fail. Do you want to continue?</source> - <translation>Vous avez sélectionné un dossier existant et non-vide pour cette installation. Veuillez prendre note qu'il sera complètement supprimé lors de la désinstallation de cette application. Il est déconseillé d'installer dans ce dossier dans le cas où l'installation échouerait. Êtes-vous sûr de vouloir continuer ?</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1361"/> - <source>Select Installation Folder</source> - <translation>Sélectionnez le dossier d'installation</translation> - </message> -</context> -<context> - <name>QInstallerCreator::Archive</name> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="317"/> - <location filename="../../libs/installer/binaryformat.cpp" line="319"/> - <source>Could not create %1: %2</source> - <translation>Impossible de créer %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="429"/> - <source>Could not open archive file %1 for reading.</source> - <translation>Impossible d'ouvrir l'archive %1 en lecture.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="448"/> - <source>Could not create archive from %1: Not a file.</source> - <translation>Impossible de créer l'archive %1 : ce n'est pas un fichier.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="472"/> - <source>Error while packing directory at %1</source> - <translation>Erreur lors la compression du répertoire suivant %1</translation> - </message> -</context> -<context> - <name>QObject</name> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="230"/> - <source>Searched whole file, no marker found</source> - <translation>Aucun marqueur n'a été trouvé dans ce fichier</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="232"/> - <source>Could not seek to %1 in file %2: %3</source> - <translation>Impossible de trouver %1 dans le fichier %2 : %3</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="242"/> - <source>No marker found, stopped after %1.</source> - <translation>Aucun marqueur n'a été trouvé, arrêt après %1.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="248"/> - <source>No marker found, unknown exception caught.</source> - <translation>Aucun marqueur n'a été trouvé, une exception inconnue a été attrapée.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="496"/> - <source>Cannot create zipped file for path %1: %2</source> - <translation>Impossible de créer un fichier zip pour le chemin %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="757"/> - <source>Could not seek to in-binary resource. (offset: %1, length: %2)</source> - <translation>Impossible de rechercher dans les ressources binaires. (offset : %1, longueur : %2)</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="763"/> - <source>Could not register in-binary resource.</source> - <translation>Impossible de valider la ressource binaire.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="935"/> - <location filename="../../libs/installer/binaryformat.cpp" line="1124"/> - <source>Could not open binary %1: %2</source> - <translation>Impossible d'ouvrir le binaire %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="980"/> - <source>Could not seek to binary layout section.</source> - <translation>Impossible de trouver la partie binaire.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="1005"/> - <source>Could not seek to metadata index.</source> - <translation>Impossible de rechercher dans l'index des métadonnées.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="1026"/> - <source>Could not seek to operation list.</source> - <translation>Impossible de rechercher dans la liste des opérations.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="1041"/> - <source>Could not seek to component index information.</source> - <translation>Impossible de rechercher dans le composant d'information sur les index.</translation> - </message> - <message> - <location filename="../../libs/installer/binaryformat.cpp" line="1045"/> - <source>Could not seek to component index.</source> - <translation>Impossible de rechercher dans le composant d'index.</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="181"/> - <source>Cannot open file %1 for reading: %2</source> - <translation>Impossible d'ouvrir le fichier %1 en lecture : %2</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="188"/> - <location filename="../../libs/installer/fileutils.cpp" line="195"/> - <source>Cannot open file %1 for writing: %2</source> - <translation>Impossible d'ouvrir le fichier %1 en écriture : %2</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="204"/> - <source>Write failed after %1 bytes: %2</source> - <translation>L'écriture à échoué après %1 octets : %2</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="225"/> - <source>Read failed after %1 bytes: %2</source> - <translation>La lecture a échouée après %1 octets : %2</translation> - </message> - <message> - <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="115"/> - <location filename="../../libs/installer/fileutils.cpp" line="254"/> - <source>Could not remove file %1: %2</source> - <translation>Impossible de supprimer le fichier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="296"/> - <source>Could not remove folder %1: %2</source> - <translation>Impossible de supprimer le dossier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="370"/> - <location filename="../../libs/installer/fileutils.cpp" line="394"/> - <source>Could not create folder %1</source> - <translation>Impossible de créer le dossier %1</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="382"/> - <source>Could not copy file from %1 to %2: %3</source> - <translation>Impossible de copier le fichier de %1 vers %2 : %3</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="409"/> - <source>Could not move file from %1 to %2: %3</source> - <translation>Impossible de déplacer le fichier de %1 vers %2 : %3</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="420"/> - <location filename="../../libs/installer/fileutils.cpp" line="427"/> - <source>Could not create folder %1: %2</source> - <translation>Impossible de créer le dossier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="435"/> - <source>Could not open temporary file: %1</source> - <translation>Impossible d'ouvrir le fichier temporaire : %1</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="452"/> - <source>Could not open temporary file for template %1: %2</source> - <translation>Impossible d'ouvrir le fichier temporaire pour le modèle %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/fileutils.cpp" line="462"/> - <source>Could not create temporary folder for template %1: %2</source> - <translation>Impossible d'ouvrir le dossier temporaire pour le modèle %1 : %2</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="47"/> - <source>Could not create lock file %1: %2</source> - <translation>Impossible de créer un verrou du fichier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="57"/> - <source>Could not write PID to lock file %1: %2</source> - <translation>Impossible d'écrire le PID pour le verrou du fichier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="65"/> - <source>Could not lock lock file %1: %2</source> - <translation>Impossible de verrouiller le fichier %1 : %2</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1776"/> + <source>The folder you selected already exists and contains an installation. Choose a different target for installation.</source> + <translation>Le dossier que vous avez sélectionné existe déjà et contient une installation précédente.Veuillez choisir une cible différente pour l'installation.</translation> </message> <message> - <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="77"/> - <source>Could not unlock lock file %1: %2</source> - <translation>Impossible de déverrouiller le fichier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="171"/> - <source>Path exists but is not a folder: %1</source> - <translation>Le chemin existe mais n'est pas un dossier : %1</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="187"/> - <source>Could not create folder: %1</source> - <translation>Impossible de créer le dossier : %1</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="216"/> - <source>Could not create temporary file</source> - <translation>Impossible de créer le fichier temporaire</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="234"/> - <source>Could not retrieve property %1 for item %2</source> - <translation>Impossible de récupérer la propriété %1 pour l'élément %2</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="262"/> - <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> - <translation>Propriété %1 pour l'élément %2 n'est pas de type VT_FILETIME mais %3</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="281"/> - <source>Could not convert file time to local time</source> - <translation>Impossible de convertir l'heure du fichier vers l'heure locale</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="285"/> - <source>Could not convert local file time to system time</source> - <translation>Impossible de convertir l'heure du fichier vers l'heure du système</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="386"/> - <source>No device set for output stream</source> - <translation>Aucun dispositif n'est prêt pour le flux de sortie</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="638"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1329"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1528"/> - <source>Could not load codecs</source> - <translation>Impossible de charger les codecs</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="641"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1334"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1533"/> - <source>Could not retrieve default format</source> - <translation>Impossible de récupérer le format par défaut</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1781"/> + <source>You have selected an existing, non-empty folder for installation. +Note that it will be completely wiped on uninstallation of this application. +It is not advisable to install into this folder as installation might fail. +Do you want to continue?</source> + <translation>Vous avez sélectionné un dossier existant et non-vide pour cette installation. +Veuillez prendre note qu'il sera complètement supprimé lors de la désinstallation de cette application. +Il est déconseillé d'installer dans ce dossier dans le cas où l'installation échouerait. +Êtes-vous sûr de vouloir continuer ?</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="645"/> - <source>Could not open archive</source> - <translation>Impossible d'ouvrir l'archive</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1785"/> + <source>You have selected an existing file or symlink, please choose a different target for installation.</source> + <translation>Vous avez sélectionné un fichier ou lien symbolique existant, veuillez choisir une cible différente pour l'installation.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="647"/> - <source>No CArc found</source> - <translation>Aucun CArc n'a été trouvé</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1820"/> + <source>The installation path cannot be empty, please specify a valid folder.</source> + <translation>Le chemin d'installation ne peut être vide, veuillez indiquer un dossier valide.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="712"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1428"/> - <source>Could not retrieve number of items in archive</source> - <translation>Impossible de récupérer le nombre d'éléments dans l'archive</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1824"/> + <source>The installation path cannot be relative, please specify an absolute path.</source> + <translation>Le chemin d'installation ne peut être relatif, veuillez indiquer un chemin absolu.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="718"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="809"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="876"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1437"/> - <source>Could not retrieve path of archive item %1</source> - <translation>Impossible de récupérer le chemin de l'élément %1</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1830"/> + <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> + <translation>Le chemin ou le dossier d'installation contient des caractères non ASCII. Ceci n'est pas supporté à l'heure actuelle ! Veuillez choisir un chemin différent ou un autre dossier d'installation.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="740"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="757"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1399"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1452"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1552"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1575"/> - <source>Unknown exception caught (%1)</source> - <translation>Une exception de type inconnue a été attrapée (%1)</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1839"/> + <source>As the install directory is completely deleted, installing in %1 is forbidden.</source> + <translation>Étant donné que le dossier d'installation est complement supprimé, il est interdit d'installer dans %1.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="757"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1575"/> - <source>Failed</source> - <translation>Échec</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1847"/> + <source>The path you have entered is too long, please make sure to specify a valid path.</source> + <translation>Le chemin que vous avez entré est trop long, veuillez vous assurer d'entrer un chemin valide.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="837"/> - <source>Could not remove already existing symlink. %1</source> - <translation>Impossible de supprimer le lien symbolique existant. %1</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1862"/> + <source>The path you have entered is not valid, please make sure to specify a valid target.</source> + <translation>Le chemin que vous avez entré est incorrect, veuillez vous assurer de choisir une cible valide.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="845"/> - <source>Could not open file: %1 (%2)</source> - <translation>Impossible d'ouvrir le fichier %1 (%2)</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1876"/> + <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> + <translation>Le chemin que vous avez entré est incorrect, veuillez vous assurer de choisir un lecteur valide.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="899"/> - <source>Could not create symlink at '%1'. Another one is already existing.</source> - <translation>Impossible de créer le lien symbolique à '%1'. Un autre existe déjà .</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1883"/> + <source>The installation path must not end with '.', please specify a valid folder.</source> + <translation>Le chemin d'installation ne peut pas contenir '.', veuillez entrer un dossier valide.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="905"/> - <source>Could not read symlink target from file '%1'.</source> - <translation>Impossible de récupérer la cible du lien symbolique du fichier '%1'.</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1898"/> + <source>The installation path must not contain '%1', please specify a valid folder.</source> + <translation>Le chemin d'installation ne peut pas contenir %1, veuillez entrer un dossier valide.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="915"/> - <source>Could not create symlink at %1. %2</source> - <translation>Impossible de créer le lien symbolique à %1. %2</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1916"/> + <source>Error</source> + <translation>Erreur</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1282"/> - <source>internal code: %1</source> - <translation>code interne : %1</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1909"/> + <source>Warning</source> + <translation>Attention</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1303"/> - <source>not enough memory</source> - <translation>pas assez de mémoire</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1805"/> + <source>Select Installation Folder</source> + <translation>Sélectionnez le dossier d'installation</translation> </message> +</context> +<context> + <name>QInstaller::TestRepository</name> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1309"/> - <source>Error: %1</source> - <translation>Erreur : %1</translation> + <location filename="../../libs/installer/testrepository.cpp" line="79"/> + <source>Empty repository URL.</source> + <translation>L'URL du dépôt est vide.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1378"/> - <source>Could not create archive %1. %2</source> - <translation>Impossible de créer l'archive %1. %2</translation> + <location filename="../../libs/installer/testrepository.cpp" line="85"/> + <source>URL scheme not supported: %1 (%2).</source> + <translation>Format d'URL non supporté : %1 (%2).</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1571"/> - <source>Error while extracting '%1': %2</source> - <translation>Erreur lors de l'extraction de '%1' : %2</translation> + <location filename="../../libs/installer/testrepository.cpp" line="112"/> + <source>Got a timeout while testing: '%1'</source> + <translation>Délai d'attente dépassé pendant le test de : '%1'</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1419"/> - <source>CArc index %1 out of bounds [0, %2]</source> - <translation>Index CArc %1 hors limites [0, %2]</translation> + <location filename="../../libs/installer/testrepository.cpp" line="132"/> + <source>Could not parse Updates.xml! Error: %1.</source> + <translation>Impossible d'analyser 'Updates.xml'. Erreur : %1.</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1431"/> - <source>Item index %1 out of bounds [0, %2]</source> - <translation>Index de l'élément %1 hors limites [0, %2]</translation> + <location filename="../../libs/installer/testrepository.cpp" line="137"/> + <source>Updates.xml could not be opened for reading!</source> + <translation>Impossible d'ouvrir 'Updates.xml' en lecture !</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1471"/> - <source>Could not create output file for writing: %1</source> - <translation>Impossible de créer le fichier de sortie : %1</translation> + <location filename="../../libs/installer/testrepository.cpp" line="140"/> + <source>Updates.xml could not be found on server!</source> + <translation>Impossible d'ouvrir 'Updates.xml' sur le serveur !</translation> </message> +</context> +<context> + <name>QObject</name> <message> - <location filename="../../libs/installer/adminauthorization_x11.cpp" line="90"/> - <location filename="../../libs/installer/adminauthorization_x11.cpp" line="95"/> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="71"/> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="76"/> <source>Authorization required</source> <translation>Authentification requise</translation> </message> <message> - <location filename="../../libs/installer/adminauthorization_x11.cpp" line="91"/> - <location filename="../../libs/installer/adminauthorization_x11.cpp" line="96"/> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="72"/> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="77"/> <source>Enter your password to authorize for sudo:</source> <translation>Entrez votre mot de passe pour authentifier 'sudo' :</translation> </message> <message> - <location filename="../../libs/installer/adminauthorization_x11.cpp" line="111"/> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="88"/> <source>Error acquiring admin rights</source> <translation>Erreur lors de l'acquisition des droits admin</translation> </message> +</context> +<context> + <name>RemoteClient</name> <message> - <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="138"/> - <source>Could not backup file %1</source> - <translation>Impossible de faire une sauvegarde du fichier %1</translation> - </message> - <message> - <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="188"/> - <source>Could not delete file %1</source> - <translation>Impossible de supprimer le fichier %1</translation> - </message> - <message> - <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="199"/> - <source>Could not restore backup file into %1</source> - <translation>Impossible de charger la sauvegarde du fichier %1</translation> - </message> - <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="223"/> - <location filename="../../libs/installer/installiconsoperation.cpp" line="214"/> - <source>Failed to overwrite %1: %2</source> - <translation>L'écrasement de %1 à échoué : %2</translation> - </message> - <message> - <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="98"/> - <source>Registry path %1 is not writable</source> - <translation>Le chemin du registre %1 n'est pas accessible en écriture</translation> - </message> - <message> - <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="110"/> - <source>Could not write to registry path %1</source> - <translation>Impossible d'écrire dans le registre le chemin %1</translation> - </message> - <message> - <location filename="../../libs/installer/installiconsoperation.cpp" line="150"/> - <source>Invalid Argument: source folder must not be empty.</source> - <translation>Argument invalide : le dossier sourcce ne peut être vide.</translation> - </message> - <message> - <location filename="../../libs/installer/installiconsoperation.cpp" line="201"/> - <source>Could not backup file %1: %2</source> - <translation>Impossible de faire une sauvegarde du fichier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/installiconsoperation.cpp" line="225"/> - <source>Failed to copy file %1: %2</source> - <translation>La copie du fichier %1 à échoué : %2</translation> - </message> - <message> - <location filename="../../libs/installer/installiconsoperation.cpp" line="235"/> - <source>Could not create folder at %1: %2</source> - <translation>Impossible de créer le dossier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/scriptengine.cpp" line="89"/> - <source>Invalid arguments: %1 arguments given, %2 to %3 expected.</source> - <translation>Arguments invalides : %1 arguments fournis, %2 à %3 attendus.</translation> - </message> - <message> - <location filename="../../libs/installer/scriptengine.cpp" line="93"/> - <source>Invalid arguments: %1 arguments given, %2 expected.</source> - <translation>Arguments invalides : %1 arguments fournis, %2 attendus.</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1350"/> - <source>Error while elevating access rights.</source> - <translation>Erreur lors de l'élévation des privilèges.</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1035"/> - <source>Failed to seek in file %1: %2</source> - <translation>Impossible de trouver dans le fichier %1 : %2</translation> - </message> - <message> - <location filename="../../libs/installer/replaceoperation.cpp" line="80"/> - <source>Failed to open %1 for reading</source> - <translation>Impossible d'ouvrir le fichier %1 en lecture</translation> - </message> - <message> - <location filename="../../libs/installer/replaceoperation.cpp" line="90"/> - <source>Failed to open %1 for writing</source> - <translation>Impossible d'ouvrir le fichier %1 en écriture</translation> - </message> - <message> - <location filename="../installerbase_p.cpp" line="432"/> - <source>Failed to seek in file %1. Reason: %2.</source> - <translation>Impossible de trouver dans le fichier %1. Motif : %2.</translation> - </message> - <message> - <location filename="../../libs/installer/createlinkoperation.cpp" line="79"/> - <source>Could not create link from %1 to %2.</source> - <translation>Impossible de créer le lien symbolique de %1 vers %2.</translation> - </message> - <message> - <location filename="../../libs/installer/createlinkoperation.cpp" line="99"/> - <source>Could not remove link from %1 to %2.</source> - <translation>Impossible de supprimer le lien de %1 vers %2.</translation> - </message> - <message> - <location filename="../../libs/installer/fsengineclient.cpp" line="798"/> - <source>Authorization Error</source> - <translation>Autorisation refusée</translation> - </message> - <message> - <location filename="../../libs/installer/fsengineclient.cpp" line="798"/> - <source>Couldn't get authorization.</source> + <location filename="../../libs/installer/remoteclient_p.h" line="145"/> + <source>Could not get authorization.</source> <translation>Impossible d'obtenir les autorisations nécessaires.</translation> </message> <message> - <location filename="../../libs/installer/fsengineclient.cpp" line="799"/> - <source>Couldn't get authorization that is needed for continuing the installation. -Either abort the installation or use the fallback solution by running + <location filename="../../libs/installer/remoteclient_p.h" line="146"/> + <source>Could not get authorization that is needed for continuing the installation. + Either abort the installation or use the fallback solution by running + %1 -as root and then clicking ok.</source> + +as root and then clicking OK.</source> <translation>Impossible d'obtenir les autorisations nécessaires pour continuer cette installation. Vous avez la possibilité d'annuler cette installation ou de trouver une solution de repli en lançant + %1 + en tant que root et en cliquant sur OK.</translation> </message> +</context> +<context> + <name>ResourceCollectionManager</name> <message> - <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="159"/> - <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="222"/> - <source>Registering file types is only supported on Windows.</source> - <translation>L'association d'une ou plusieurs extensions n'est supporté que sous Windows.</translation> - </message> - <message> - <location filename="../../libs/installer/linereplaceoperation.cpp" line="80"/> - <source>Failed to open '%1' for reading.</source> - <translation>Impossible d'ouvrir le fichier '%1' en lecture.</translation> - </message> - <message> - <location filename="../../libs/installer/linereplaceoperation.cpp" line="97"/> - <source>Failed to open '%1' for writing.</source> - <translation>Impossible d'ouvrir le fichier '%1' en écriture.</translation> - </message> - <message> - <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="68"/> - <source>Number of arguments does not match: one is required</source> - <translation>Le nombre d'arguments ne correspond pas : un seul est requis</translation> - </message> - <message> - <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="75"/> - <source>Could not get package manager core.</source> - <translation>Impossible de récupérer le noyau du gestionnaire de paquets.</translation> - </message> - <message> - <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="90"/> - <source>This process should be stopped before continuing: %1</source> - <translation>Le processus suivant devrait être stoppé avant de continuer : %1</translation> - </message> - <message> - <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="94"/> - <source>These processes should be stopped before continuing: %1</source> - <translation>Les processus suivant devraient être stoppés avant de continuer : %1</translation> + <location filename="../../libs/installer/binaryformat.cpp" line="401"/> + <source>Could not open resource %1: %2</source> + <translation>Impossible d'ouvrir la ressource %1 : %2</translation> </message> </context> <context> <name>Settings</name> <message> - <location filename="../../libs/installer/settings.cpp" line="196"/> + <location filename="../../libs/installer/settings.cpp" line="239"/> <source>Could not open settings file %1 for reading: %2</source> <translation>Impossible d'ouvrir le fichier de préférences %1 en lecture : %2</translation> </message> @@ -3108,247 +3075,144 @@ en tant que root et en cliquant sur OK.</translation> <translation>Configuration manuelle du serveur mandataire</translation> </message> <message> - <location filename="../settingsdialog.ui" line="79"/> + <location filename="../settingsdialog.ui" line="66"/> <source>HTTP proxy:</source> <translation>Proxy HTTP :</translation> </message> <message> - <location filename="../settingsdialog.ui" line="96"/> - <location filename="../settingsdialog.ui" line="222"/> + <location filename="../settingsdialog.ui" line="83"/> + <location filename="../settingsdialog.ui" line="138"/> <source>Port:</source> <translation>Port :</translation> </message> <message> - <location filename="../settingsdialog.ui" line="118"/> - <source>HTTP proxy requires authentication</source> - <translation>Le proxy HTTP requiert une authentification</translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="143"/> - <location filename="../settingsdialog.ui" line="269"/> - <source>Username:</source> - <translation>Identifiant :</translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="160"/> - <location filename="../settingsdialog.ui" line="286"/> - <source>Password:</source> - <translation>Mot de passe :</translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="205"/> + <location filename="../settingsdialog.ui" line="121"/> <source>FTP proxy:</source> <translation>Proxy FTP :</translation> </message> <message> - <location filename="../settingsdialog.ui" line="244"/> - <source>FTP proxy requires authentication</source> - <translation>Le proxy FTP requiert une authentification</translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="325"/> + <location filename="../settingsdialog.ui" line="190"/> <source>Repositories</source> <translation>Dépôts</translation> </message> <message> - <location filename="../settingsdialog.ui" line="331"/> + <location filename="../settingsdialog.ui" line="196"/> <source>Add Username and Password for authentication if needed.</source> <translation>Si nécessaire, ajouter l'identifiant et le mot de passe pour l'authentification.</translation> </message> <message> - <location filename="../settingsdialog.ui" line="347"/> + <location filename="../settingsdialog.ui" line="212"/> <source>Use temporary repositories only</source> <translation>Utiliser des dépôts temporaires uniquement</translation> </message> <message> - <location filename="../settingsdialog.ui" line="356"/> + <location filename="../settingsdialog.ui" line="221"/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="../settingsdialog.ui" line="363"/> + <location filename="../settingsdialog.ui" line="228"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../settingsdialog.ui" line="370"/> + <location filename="../settingsdialog.ui" line="235"/> <source>Test</source> <translation>Test</translation> </message> <message> - <location filename="../settingsdialog.ui" line="390"/> - <location filename="../settingsdialog.cpp" line="490"/> + <location filename="../settingsdialog.ui" line="255"/> + <location filename="../settingsdialog.cpp" line="357"/> <source>Show Passwords</source> <translation>Montrer les mots de passe</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="261"/> + <location filename="../settingsdialog.cpp" line="134"/> <source>Check this to use repository during fetch.</source> <translation>Cocher pour utiliser les dépôts pendant la récupération.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="263"/> + <location filename="../settingsdialog.cpp" line="136"/> <source>Add the username to authenticate on the server.</source> <translation>Ajouter l'identifiant pour l'authentification sur le serveur.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="265"/> + <location filename="../settingsdialog.cpp" line="138"/> <source>Add the password to authenticate on the server.</source> <translation>Ajouter le mot de passe pour l'authentification sur le serveur.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="267"/> + <location filename="../settingsdialog.cpp" line="140"/> <source>The servers URL that contains a valid repository.</source> <translation>Liste des URL des serveurs contenant des dépôts valides.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="471"/> + <location filename="../settingsdialog.cpp" line="338"/> <source>There was an error testing this repository.</source> <translation>Une erreur s'est produite pendant le test de ce dépôt.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="472"/> + <location filename="../settingsdialog.cpp" line="339"/> <source>Do you want to disable the tested repository?</source> <translation>Êtes-vous sûr de vouloir désactiver le dépôt testé ?</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="490"/> + <location filename="../settingsdialog.cpp" line="357"/> <source>Hide Passwords</source> <translation>Masquer les mots de passe</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="535"/> + <location filename="../settingsdialog.cpp" line="402"/> <source>Use</source> <translation>Utiliser</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="535"/> + <location filename="../settingsdialog.cpp" line="402"/> <source>Username</source> <translation>Identifiant</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="535"/> + <location filename="../settingsdialog.cpp" line="402"/> <source>Password</source> <translation>Mot de passe</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="536"/> + <location filename="../settingsdialog.cpp" line="403"/> <source>Repository</source> <translation>Dépôt</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="537"/> + <location filename="../settingsdialog.cpp" line="404"/> <source>Default repositories</source> <translation>Dépôts par défaut</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="538"/> + <location filename="../settingsdialog.cpp" line="405"/> <source>Temporary repositories</source> <translation>Dépôts temporaires</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="539"/> + <location filename="../settingsdialog.cpp" line="406"/> <source>User defined repositories</source> <translation>Dépôts définis par l'utilisateur</translation> </message> </context> <context> - <name>TargetDirectoryPageImpl</name> - <message> - <location filename="../installerbasecommons.cpp" line="382"/> - <source>The installation path cannot be empty, please specify a valid folder.</source> - <translation>Le chemin d'installation ne peut être vide, veuillez indiquer un dossier valide.</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="387"/> - <source>The installation path cannot be relative, please specify an absolute path.</source> - <translation>Le chemin d'installation ne peut être relatif, veuillez indiquer un chemin absolu.</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="443"/> - <source>Warning</source> - <translation>Attention</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="453"/> - <source>Error</source> - <translation>Erreur</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="423"/> - <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> - <translation>Le chemin ou le dossier d'installation contient des caractères non ASCII. Ceci n'est pas supporté à l'heure actuelle ! Veuillez choisir un chemin différent ou un autre dossier d'installation.</translation> - </message> + <name>UpdateOperation</name> <message> - <location filename="../installerbasecommons.cpp" line="395"/> - <source>The path you have entered is too long, please make sure to specify a valid path.</source> - <translation>Le chemin que vous avez entré est trop long, veuillez vous assurer d'entrer un chemin valide.</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="401"/> - <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> - <translation>Le chemin que vous avez entré est incorrect, veuillez vous assurer de choisir un lecteur valide.</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="415"/> - <source>The installation path must not contain %1, please specify a valid folder.</source> - <translation>Le chemin d'installation ne peut pas contenir %1, veuillez entrer un dossier valide.</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="478"/> - <source>As the install directory is completely deleted installing in %1 is forbidden.</source> - <translation>Étant donné que le dossier d'installation est complement supprimé, il est interdit d'installer dans %1.</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="493"/> - <source>The folder you selected exists already and contains an installation. -Do you want to overwrite it?</source> - <translation>Le dossier que vous avez sélectionné existe déjà et contient une installation précédente. -Souhaitez-vous écrire par dessus ?</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="498"/> - <source>You have selected an existing, non-empty folder for installation. -Note that it will be completely wiped on uninstallation of this application. -It is not advisable to install into this folder as installation might fail. -Do you want to continue?</source> - <translation>Vous avez sélectionné un dossier existant et non-vide pour cette installation. -Veuillez prendre note qu'il sera complètement supprimé lors de la désinstallation de cette application. -Il est déconseillé d'installer dans ce dossier dans le cas où l'installation échouerait. -Êtes-vous sûr de vouloir continuer ?</translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="502"/> - <source>You have selected an existing file or symlink, please choose a different target for installation.</source> - <translation>Vous avez sélectionné un fichier ou lien symbolique existant, veuillez choisir une cible différente pour l'installation.</translation> - </message> -</context> -<context> - <name>TestRepository</name> - <message> - <location filename="../settingsdialog.cpp" line="98"/> - <source>Empty repository URL.</source> - <translation>URL du dépôt vide.</translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="104"/> - <source>URL scheme not supported: %1 (%2).</source> - <translation>Format d'URL non supporté : %1 (%2).</translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="146"/> - <source>Could not parse Updates.xml! Error: %1.</source> - <translation>Impossible d'analyser 'Updates.xml'. Erreur : %1.</translation> + <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="83"/> + <source>Registry path %1 is not writable</source> + <translation>Le chemin du registre %1 n'est pas accessible en écriture</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="151"/> - <source>Updates.xml could not be opened for reading!</source> - <translation>Impossible d'ouvrir 'Updates.xml' en lecture !</translation> + <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="95"/> + <source>Could not write to registry path %1</source> + <translation>Impossible d'écrire dans le registre le chemin %1</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="154"/> - <source>Updates.xml could not be found on server!</source> - <translation>Impossible d'ouvrir 'Updates.xml' sur le serveur !</translation> + <location filename="../../libs/kdtools/kdupdaterupdateoperation.cpp" line="294"/> + <source>Renaming %1 into %2 failed with %3.</source> + <translation>Échec du renommage de %1 vers %2, raison : %3.</translation> </message> </context> </TS> diff --git a/src/sdk/translations/ja.ts b/src/sdk/translations/ja.ts index 1b89e069c..3f14998b6 100644..100755 --- a/src/sdk/translations/ja.ts +++ b/src/sdk/translations/ja.ts @@ -2,13 +2,6 @@ <!DOCTYPE TS> <TS version="2.1" language="ja_JP"> <context> - <name>Component</name> - <message> - <source>Could not open archive %1: %2</source> - <translation>アーカイブ %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> -</context> -<context> <name>Dialog</name> <message> <source>Http authentication required</source> @@ -39,25 +32,6 @@ </message> </context> <context> - <name>KDSaveFile</name> - <message> - <source>Append mode not supported.</source> - <translation>追記モードã«å¯¾å¿œã—ã¦ã„ã¾ã›ã‚“。</translation> - </message> - <message> - <source>Read-only access not supported.</source> - <translation>èªã¿è¾¼ã¿å°‚用ã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not backup existing file %1: %2</source> - <translation>æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ« %1 ã¸ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>TODO</source> - <translation>TODO</translation> - </message> -</context> -<context> <name>KDUpdater::AppendFileOperation</name> <message> <source>Cannot backup file %1: %2</source> @@ -419,10 +393,6 @@ <translation>æ›´æ–°å…ƒã‹ã‚‰ Updates.xml をダウンãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Could not download updates from %1 ('%2')</source> - <translation>%1('%2)ã‹ã‚‰æ›´æ–°ã‚’ダウンãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> <source>Updates.xml file(s) downloaded from update sources.</source> <translation>æ›´æ–°å…ƒã‹ã‚‰ Updates.xml ファイルをダウンãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸã€‚</translation> </message> @@ -669,29 +639,6 @@ </message> </context> <context> - <name>QInstaller::AddQtCreatorArrayValueOperation</name> - <message> - <source>exactly 4</source> - <translation>4個</translation> - </message> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ã«ç„¡åŠ¹ãªå¼•æ•°: %1個ã®å¼•æ•°ãŒæ¸¡ã•ã‚Œã¾ã—ãŸãŒã€å¿…è¦ãªã®ã¯%2ã§ã™%3。</translation> - </message> - <message> - <source> (group, arrayname, key, value)</source> - <translation>(グループ, é…列å, ã‚ー, 値)</translation> - </message> - <message> - <source>Needed installer object in %1 operation is empty.</source> - <translation>%1 ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ä½œæˆã«å¿…è¦ãªæ“作ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>There is no value set for %1 on the installer object.</source> - <translation>インストーラ㮠%1 用ã«å€¤ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> - </message> -</context> -<context> <name>QInstaller::Component</name> <message> <source>Could not open the requested translation file '%1'.</source> @@ -706,10 +653,6 @@ <translation>è¦æ±‚ã•ã‚ŒãŸ UI ファイル '%1' ã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %2</translation> </message> <message> - <source>An error has occurred while reading the UI file.</source> - <translation>UI ファイルã®èªã¿è¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> - </message> - <message> <source>Could not open the requested license file '%1'. Error: %2</source> <translation>è¦æ±‚ã•ã‚ŒãŸãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãƒ•ã‚¡ã‚¤ãƒ« '%1' ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %2</translation> </message> @@ -726,10 +669,6 @@ <translation>æ›´æ–°æƒ…å ±: </translation> </message> <message> - <source>Cannot resolve isAutoDependOn in %1</source> - <translation>%1 ã® isAutoDependOn を解決ã§ãã¾ã›ã‚“</translation> - </message> - <message> <source>Cannot resolve isDefault in %1</source> <translation>%1 ã® isDefault を解決ã§ãã¾ã›ã‚“</translation> </message> @@ -760,6 +699,26 @@ <source>Release Date</source> <translation>リリース日</translation> </message> + <message> + <source>Component is marked for installation.</source> + <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å¯¾è±¡ã§ã™ã€‚</translation> + </message> + <message> + <source>Component is marked for uninstallation.</source> + <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã¯ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å¯¾è±¡ã§ã™ã€‚</translation> + </message> + <message> + <source>Component is installed.</source> + <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ¸ˆã¿ã§ã™ã€‚</translation> + </message> + <message> + <source>Component is not installed.</source> + <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã¯æœªã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ã™ã€‚</translation> + </message> + <message> + <source>Action</source> + <translation>アクション</translation> + </message> </context> <context> <name>QInstaller::ComponentSelectionPage</name> @@ -1051,14 +1010,6 @@ Error while loading %2</source> %2 ã®èªã¿è¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ</translation> </message> <message> - <source>Downloading archive hash for component: %1</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ãƒãƒƒã‚·ãƒ¥ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸: %1</translation> - </message> - <message> - <source>Downloading archive for component: %1</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸: %1</translation> - </message> - <message> <source>Scheme not supported: %1 (%2)</source> <translation>ã“ã®ã‚¹ã‚ームã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã¾ã›ã‚“: %1 (%2)</translation> </message> @@ -1163,92 +1114,6 @@ Error while loading %2</source> </message> </context> <context> - <name>QInstaller::GetRepositoryMetaInfoJob</name> - <message> - <source>Empty repository URL.</source> - <translation>リãƒã‚¸ãƒˆãƒªã® URL ãŒç©ºã§ã™ã€‚</translation> - </message> - <message> - <source>Retrieving component meta information...</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã®ãƒ¡ã‚¿æƒ…å ±ã‚’å–å¾—ä¸...</translation> - </message> - <message> - <source>Invalid repository URL: %1</source> - <translation>無効ãªãƒªãƒã‚¸ãƒˆãƒª URL: %1</translation> - </message> - <message> - <source>URL scheme not supported: %1 (%2)</source> - <translation>ã“ã® URL スã‚ームã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã¾ã›ã‚“: %1 (%2)</translation> - </message> - <message> - <source>Could not move Updates.xml to target location. Error: %1</source> - <translation>Updates.xml をターゲットパスã¸ç§»å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %1</translation> - </message> - <message> - <source>Could not open Updates.xml for reading. Error: %1</source> - <translation>èªã¿è¾¼ã¿ç”¨ã« Updates.xml ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %1</translation> - </message> - <message> - <source>Could not fetch a valid version of Updates.xml from repository: %1. Error: %2</source> - <translation>リãƒã‚¸ãƒˆãƒª %1 ã‹ã‚‰æœ‰åŠ¹ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Updates.xml ã‚’å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %2</translation> - </message> - <message> - <source>Download Error</source> - <translation>ダウンãƒãƒ¼ãƒ‰ã‚¨ãƒ©ãƒ¼</translation> - </message> - <message> - <source>Parsing component meta information...</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã®ãƒ¡ã‚¿æƒ…å ±ã‚’ãƒ‘ãƒ¼ã‚¹ä¸...</translation> - </message> - <message> - <source>Repository updates received.</source> - <translation>リãƒã‚¸ãƒˆãƒªã®æ›´æ–°ã‚’å–å¾—ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Finished updating component meta information.</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã®ãƒ¡ã‚¿æƒ…å ±ã®æ›´æ–°ãŒå®Œäº†ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not fetch Updates.xml from repository: %1. Error: %2</source> - <translation>リãƒã‚¸ãƒˆãƒª %1 ã‹ã‚‰ Updates.xml ã‚’å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %2</translation> - </message> - <message> - <source>Retrieving component information from remote repository...</source> - <translation>リモートã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã®æƒ…å ±ã‚’å–å¾—ä¸...</translation> - </message> - <message> - <source>Could not open meta info archive: %1. Error: %2</source> - <translation>ãƒ¡ã‚¿æƒ…å ±ã‚¢ãƒ¼ã‚«ã‚¤ãƒ– %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %2</translation> - </message> - <message> - <source>The hash of one component does not match the expected one.</source> - <translation>ã‚るコンãƒãƒ¼ãƒãƒ³ãƒˆã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒæ—¢å®šã®å€¤ã¨åˆè‡´ã—ã¾ã›ã‚“。</translation> - </message> - <message> - <source>Bad hash.</source> - <translation>ãƒãƒƒã‚·ãƒ¥å€¤ãŒä¸€è‡´ã—ã¾ã›ã‚“。</translation> - </message> - <message> - <source>Could not download meta information for component: %1. Error: %2</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆ %1 用ã®ãƒ¡ã‚¿æƒ…å ±ã‚’ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %2</translation> - </message> -</context> -<context> - <name>QInstaller::GetRepositoryMetaInfoJob::ZipRunnable</name> - <message> - <source>Error while extracting '%1': %2</source> - <translation>'%1' ã®å±•é–‹ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %2</translation> - </message> - <message> - <source>Unknown exception caught while extracting %1.</source> - <translation>%1 ã®å±•é–‹ä¸ã«æœªçŸ¥ã®ä¾‹å¤–ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not open %1 for reading. Error: %2</source> - <translation>èªã¿è¾¼ã¿ç”¨ã« %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %2</translation> - </message> -</context> -<context> <name>QInstaller::GlobalSettingsOperation</name> <message> <source>Settings are not writable</source> @@ -1263,10 +1128,6 @@ Error while loading %2</source> <translation>%0 ã«ç„¡åŠ¹ãªå¼•æ•°: %1個ã®å¼•æ•°ãŒæ¸¡ã•ã‚Œã¾ã—ãŸãŒã€å¿…è¦ãªã®ã¯%2ã§ã™%3。</translation> </message> <message> - <source>3 or 4</source> - <translation>3ã‚ã‚‹ã„ã¯4個</translation> - </message> - <message> <source>3, 4 or 5</source> <translation>3ã€4ã‚ã‚‹ã„ã¯5個</translation> </message> @@ -1429,35 +1290,8 @@ Error while loading %2</source> </message> </context> <context> - <name>QInstaller::MacReplaceInstallNamesOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ã«ç„¡åŠ¹ãªå¼•æ•°: %1個ã®å¼•æ•°ãŒæ¸¡ã•ã‚Œã¾ã—ãŸãŒã€å¿…è¦ãªã®ã¯%2ã§ã™%3。</translation> - </message> - <message> - <source>at least 3</source> - <translation>å°‘ãªãã¨ã‚‚3個</translation> - </message> - <message> - <source>One of the given arguments is empty. Argument1=%1; Argument2=%2, Argument3=%3</source> - <translation>与ãˆã‚‰ã‚ŒãŸå¼•æ•°ã®ã†ã¡ã€å°‘ãªãã¨ã‚‚一ã¤ãŒç©ºã§ã™ã€‚引数1=%1, 引数2=%2, 引数3=%3</translation> - </message> - <message> - <source>Cannot invoke otool. Is Xcode installed?</source> - <translation>otool ã‚’èµ·å‹•ã§ãã¾ã›ã‚“。Xcode ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã‹?</translation> - </message> - <message> - <source>Cannot start process %0.</source> - <translation>プãƒã‚»ã‚¹ %0 ã‚’èµ·å‹•ã§ãã¾ã›ã‚“。</translation> - </message> -</context> -<context> <name>QInstaller::PackageManagerCore</name> <message> - <source>Error writing Uninstaller</source> - <translation>アンインストーラ書ãè¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼</translation> - </message> - <message> <source> Downloading packages...</source> <translation> @@ -1531,22 +1365,6 @@ Downloading packages...</source> <translation>エラー</translation> </message> <message> - <source>Component(s) added as automatic dependencies</source> - <translation>自動的ãªä¾å˜é–¢ä¿‚ã®è§£æ±ºã«ã‚ˆã‚Šè¿½åŠ ã•ã‚ŒãŸã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆ</translation> - </message> - <message> - <source>Added as dependency for %1.</source> - <translation>%1 ãŒä¾å˜ã—ã¦ã„ã‚‹ãŸã‚ã«è¿½åŠ ã•ã‚Œã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Component(s) that have resolved Dependencies</source> - <translation>ä¾å˜é–¢ä¿‚を解決ã—ãŸã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆ</translation> - </message> - <message> - <source>Selected Component(s) without Dependencies</source> - <translation>é¸æŠžã•ã‚ŒãŸã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã¯ä¾å˜é–¢ä¿‚ãŒã‚ã‚Šã¾ã›ã‚“</translation> - </message> - <message> <source>Access error</source> <translation>アクセスエラー</translation> </message> @@ -1575,34 +1393,6 @@ Downloading packages...</source> <translation>ユーザã«ã‚ˆã£ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒã‚ャンセルã•ã‚Œã¾ã—ãŸ</translation> </message> <message> - <source>Writing uninstaller.</source> - <translation>アンインストーラを書ã込んã§ã„ã¾ã™ã€‚</translation> - </message> - <message> - <source>Uninstaller is not a bundle</source> - <translation>アンインストーラãŒãƒãƒ³ãƒ‰ãƒ«æ§‹é€ ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> - </message> - <message> - <source>Could not write uninstaller data to %1: %2</source> - <translation>アンインストーラã®ãƒ‡ãƒ¼ã‚¿ã‚’ %1 ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not write uninstaller to %1: %2</source> - <translation>アンインストーラを %1 ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Found a binary data file, but we are the installer and we should read the binary resource from our very own binary!</source> - <translation>ãƒã‚¤ãƒŠãƒªãƒ‡ãƒ¼ã‚¿ãƒ•ã‚¡ã‚¤ãƒ«ã‚’発見ã—ã¾ã—ãŸã€‚ã—ã‹ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã¯ãã®å†…部データã‹ã‚‰ãƒã‚¤ãƒŠãƒªãƒªã‚½ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã‚€ã¹ãã§ã™!</translation> - </message> - <message> - <source>Could not write uninstaller binary data to %1: %2</source> - <translation>アンインストーラã®ãƒã‚¤ãƒŠãƒªãƒ‡ãƒ¼ã‚¿ã‚’ %1 ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>ProductName should be set</source> - <translation>ProductName ã‚’è¨å®šã—ã¦ãã ã•ã„</translation> - </message> - <message> <source>Variable 'TargetDir' not set.</source> <translation>'TargetDir' 変数ãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> @@ -1619,10 +1409,6 @@ Downloading packages...</source> <translation>ãƒãƒ¼ã‚«ãƒ«ã®ãƒªãƒã‚¸ãƒˆãƒªã‚’作æˆã—ã¦ã„ã¾ã™</translation> </message> <message> - <source>Creating Uninstaller</source> - <translation>アンインストーラを作æˆã—ã¦ã„ã¾ã™</translation> - </message> - <message> <source> Installation finished!</source> <translation> @@ -1656,18 +1442,6 @@ Update aborted!</source> </message> <message> <source> -Uninstallation completed successfully!</source> - <translation> -アンインストールã«æˆåŠŸã—ã¾ã—ãŸ!</translation> - </message> - <message> - <source> -Uninstallation aborted!</source> - <translation> -アンインストールãŒä¸æ–ã•ã‚Œã¾ã—ãŸ!</translation> - </message> - <message> - <source> Installing component %1</source> <translation> コンãƒãƒ¼ãƒãƒ³ãƒˆã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ä¸: %1</translation> @@ -1782,34 +1556,6 @@ Installing component %1</source> <translation>確èª</translation> </message> <message> - <source>Do you want to abort the %1 process?</source> - <translation>プãƒã‚»ã‚¹ %1 ã‚’ä¸æ–ã—ã¾ã™ã‹?</translation> - </message> - <message> - <source>uninstallation</source> - <translation>アンインストール</translation> - </message> - <message> - <source>installation</source> - <translation>インストール</translation> - </message> - <message> - <source>installer</source> - <translation>インストーラ</translation> - </message> - <message> - <source>uninstaller</source> - <translation>アンインストーラ</translation> - </message> - <message> - <source>maintenance</source> - <translation>メンテナンス</translation> - </message> - <message> - <source>Do you want to quit the %1 application?</source> - <translation>アプリケーション %1 を終了ã—ã¾ã™ã‹?</translation> - </message> - <message> <source>Settings</source> <translation>è¨å®š</translation> </message> @@ -1883,72 +1629,8 @@ Please copy the installer to a local drive</source> </message> </context> <context> - <name>QInstaller::QtPatchOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ã«ç„¡åŠ¹ãªå¼•æ•°: %1個ã®å¼•æ•°ãŒæ¸¡ã•ã‚Œã¾ã—ãŸãŒã€å¿…è¦ãªã®ã¯%2ã§ã™%3。</translation> - </message> - <message> - <source>3 or 4</source> - <translation>3ã‚ã‚‹ã„ã¯4個</translation> - </message> - <message> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>"%1" ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ä½œæˆã«å¿…è¦ãªæ“作ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>First argument should be 'linux', 'mac' or 'windows'. No other type is supported at this time.</source> - <translation>最åˆã®å¼•æ•°ã¯ 'linux', 'mac', 'windows' ã®ã„ãšã‚Œã‹ã‚’指定ã—ã¦ãã ã•ã„。ãれ以外ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。</translation> - </message> - <message> - <source>Could not find the needed QmakeOutputInstallerKey(%1) value on the installer object. The ConsumeOutput operation on the valid qmake needs to be called first.</source> - <translation>インストーラã«å¿…è¦ãª QmakeOutputInstallerKey(%1) ã®å€¤ã‚’見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚é©åˆ‡ãª qmake 㧠ConsumeOutput æ“作を最åˆã«å®Ÿè¡Œã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚</translation> - </message> - <message> - <source>QMake from the current Qt version -(%1)is not existing. Please file a bugreport with this dialog at https://bugreports.qt-project.org.</source> - <translation>ç¾åœ¨ã® Qt ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³(%1)ã® QMake ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。ã“ã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‹ã‚‰ https://bugreports.qt-project.org ã¸ãƒã‚°å ±å‘Šã‚’ã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>The output of -%1 -query -is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. -output: "%2"</source> - <translation>以下ã®å‡ºåŠ›ãŒãƒ‘ースã§ãã¾ã›ã‚“。 -%1 -query -ã“ã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‹ã‚‰ https://bugreports.qt-project.org ã¸ãƒã‚°å ±å‘Šã‚’ã—ã¦ãã ã•ã„。 -出力: "%2"</translation> - </message> - <message> - <source>Qt patch error: new Qt dir(%1) -needs to be less than 255 characters.</source> - <translation>Qt パッãƒã‚¨ãƒ©ãƒ¼: æ–°ã—ã„ Qt ã®ãƒ‘ス(%1) -ã¯255æ–‡å—以下ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚</translation> - </message> - <message> - <source>Qt patch error: Can not open %1.(%2)</source> - <translation>Qt パッãƒã‚¨ãƒ©ãƒ¼: %1 ã‚’é–‹ã‘ã¾ã›ã‚“。(%2)</translation> - </message> - <message> - <source>The installer was not able to get the unpatched path from -%1.(maybe it is broken or removed) -It tried to patch the Qt binaries, but all other files in Qt are unpatched. -This could result in a broken Qt version. -Sometimes it helps to restart the installer with a switched off antivirus software.</source> - <translation>インストーラã¯ãƒ‘ッãƒæœªé©ç”¨æ™‚ã®ãƒ‘スを %1 ã‹ã‚‰å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ -(ãŠãらãファイルãŒå£Šã‚Œã¦ã„ã‚‹ã‹å‰Šé™¤ã•ã‚Œã¦ã„ã¾ã™) -Qt ã®ãƒã‚¤ãƒŠãƒªã«ãƒ‘ッãƒã‚’é©ç”¨ã—よã†ã¨ã—ã¾ã—ãŸãŒã€Qt ã®ä»–ã®ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ãƒ‘ッãƒã¯é©ç”¨ã•ã‚Œã¦ã„ã¾ã›ã‚“。 -ã“ã®ãŸã‚ã€ã“ã® Qt ã¯æ£å¸¸ãªçŠ¶æ…‹ã«ç„¡ã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ -アンãƒã‚¦ã‚£ãƒ«ã‚¹ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚’オフã«ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’å†èµ·å‹•ã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦æ”¹å–„ã•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。</translation> - </message> -</context> -<context> <name>QInstaller::ReadyForInstallationPage</name> <message> - <source>&Show Details</source> - <translation>詳細を表示ã™ã‚‹(&S)</translation> - </message> - <message> <source>U&ninstall</source> <translation>アンインストール(&N)</translation> </message> @@ -2005,18 +1687,10 @@ Qt ã®ãƒã‚¤ãƒŠãƒªã«ãƒ‘ッãƒã‚’é©ç”¨ã—よã†ã¨ã—ã¾ã—ãŸãŒã€Qt ã®ä»–ã <translation>指定ã•ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã®ç©ºã容é‡ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å¯èƒ½ãªãƒ¬ãƒ™ãƒ«ã ã¨æ€ã‚ã‚Œã¾ã™ãŒã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å¾Œã®ç©ºã容é‡ã¯ 100 MB 以下ã¨ãªã‚‹è¦‹è¾¼ã¿ã§ã™:。 %1</translation> </message> <message> - <source>Can not resolve all dependencies!</source> - <translation>ã™ã¹ã¦ã®ä¾å˜é–¢ä¿‚を解決ã§ãã¾ã›ã‚“ï¼</translation> - </message> - <message> <source>Components about to be removed.</source> <translation>削除ã•ã‚Œã‚‹ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã€‚</translation> </message> <message> - <source>&Hide Details</source> - <translation>è©³ç´°ã‚’éš ã™(&H)</translation> - </message> - <message> <source>Installation will use %1 of disk space.</source> <translation>%1 ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ã‚’使用ã—ã¾ã™ã€‚</translation> </message> @@ -2077,18 +1751,6 @@ Qt ã®ãƒã‚¤ãƒŠãƒªã«ãƒ‘ッãƒã‚’é©ç”¨ã—よã†ã¨ã—ã¾ã—ãŸãŒã€Qt ã®ä»–ã <translation>è¦æ±‚ã•ã‚ŒãŸã‚¹ã‚¯ãƒªãƒ—トファイル %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> </message> <message> - <source>Exception while loading the component script: '%1'</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚¹ã‚¯ãƒªãƒ—トã®ãƒãƒ¼ãƒ‰ä¸ã«ä¾‹å¤–ãŒç™ºç”Ÿã—ã¾ã—ãŸ: '%1'</translation> - </message> - <message> - <source>Could not load the component script inside a script context: '%1'</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚¹ã‚¯ãƒªãƒ—トã®ã‚³ãƒ³ãƒ†ã‚ストãŒæ£ã—ããƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸ: '%1'</translation> - </message> - <message> - <source>Fatal error while evaluating a script.</source> - <translation>スクリプトã®è©•ä¾¡ä¸ã«è‡´å‘½çš„ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> - </message> - <message> <source>Exception while loading the component script '%1'. (%2)</source> <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚¹ã‚¯ãƒªãƒ—ト '%1' ã®ãƒãƒ¼ãƒ‰ä¸ã«ä¾‹å¤–ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚(%2)</translation> </message> @@ -2109,33 +1771,6 @@ Qt ã®ãƒã‚¤ãƒŠãƒªã«ãƒ‘ッãƒã‚’é©ç”¨ã—よã†ã¨ã—ã¾ã—ãŸãŒã€Qt ã®ä»–ã </message> </context> <context> - <name>QInstaller::SetQtCreatorValueOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ã«ç„¡åŠ¹ãªå¼•æ•°: %1個ã®å¼•æ•°ãŒæ¸¡ã•ã‚Œã¾ã—ãŸãŒã€å¿…è¦ãªã®ã¯%2ã§ã™%3。</translation> - </message> - <message> - <source>exactly 4</source> - <translation>4個</translation> - </message> - <message> - <source> (rootInstallPath, group, key, value)</source> - <translation> (ルートインストールパス, グループ, ã‚ー, 値)</translation> - </message> - <message> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>"%1" ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ä½œæˆã«å¿…è¦ãªæ“作ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>There is no value set for '%1' on the installer object.</source> - <translation>インストーラ㮠%1 用ã«å€¤ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> - </message> - <message> - <source>Needed installer object in '%1' operation is empty.</source> - <translation>'%1' ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ä½œæˆã«å¿…è¦ãªæ“作ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> - </message> -</context> -<context> <name>QInstaller::SettingsOperation</name> <message> <source>Missing argument(s) '%1' calling '%2' with arguments '%3'.</source> @@ -2161,14 +1796,6 @@ Qt ã®ãƒã‚¤ãƒŠãƒªã«ãƒ‘ッãƒã‚’é©ç”¨ã—よã†ã¨ã—ã¾ã—ãŸãŒã€Qt ã®ä»–ã <translation>ã©ã¡ã‚‰ã®å¼•æ•°ã‚‚空ã«ã¯ã§ãã¾ã›ã‚“: ソース '%1', ターゲット: '%2'</translation> </message> <message> - <source>Can not move source '%1' to target '%2', because target exists and is not removable.</source> - <translation>ソース '%1' をターゲット '%2' ã«ç§»å‹•ã§ãã¾ã›ã‚“。ターゲットãŒå˜åœ¨ã—ã¦ãŠã‚Šã€ã‹ã¤å‰Šé™¤ã§ãã¾ã›ã‚“。</translation> - </message> - <message> - <source>Can not move source '%1' to target '%2': %3</source> - <translation>ソース '%1' をターゲット '%2' ã«ç§»å‹•ã§ãã¾ã›ã‚“: %3</translation> - </message> - <message> <source>Move '%1' to '%2'.</source> <translation>'%1' ã‚’ '%2' ã¸ç§»å‹•ã€‚</translation> </message> @@ -2216,22 +1843,10 @@ Qt ã®ãƒã‚¤ãƒŠãƒªã«ãƒ‘ッãƒã‚’é©ç”¨ã—よã†ã¨ã—ã¾ã—ãŸãŒã€Qt ã®ä»–ã <translation>エラー</translation> </message> <message> - <source>The install directory cannot be empty, please specify a valid folder.</source> - <translation>インストールディレクトリãŒç©ºã«ã§ãã¾ã›ã‚“。有効ãªãƒ•ã‚©ãƒ«ãƒ€ã‚’指定ã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>As the install directory is completely deleted on uninstall, installing in %1 is forbidden.</source> - <translation>インストールディレクトリã¯ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ™‚ã«å®Œå…¨ã«å‰Šé™¤ã•ã‚Œã‚‹ãŸã‚ã€%1 ã¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯è¨±å¯ã§ãã¾ã›ã‚“。</translation> - </message> - <message> <source>Warning</source> <translation>è¦å‘Š</translation> </message> <message> - <source>You have selected an existing, non-empty folder for installation. Note that it will be completely wiped on uninstallation of this application. It is not advisable to install into this folder as installation might fail. Do you want to continue?</source> - <translation>インストール先ã«æ—¢å˜ã®ç©ºã§ã¯ãªã„フォルダãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã¯ã‚¢ãƒ—リケーションã®ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ™‚ã«å®Œå…¨ã«æ¶ˆåŽ»ã•ã‚Œã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。インストールã«å¤±æ•—ã™ã‚‹å¯èƒ½æ€§ã‚‚ã‚ã‚‹ãŸã‚ã€ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯æŽ¨å¥¨ã•ã‚Œã¾ã›ã‚“。インストールを継続ã—ã¾ã™ã‹?</translation> - </message> - <message> <source>Select Installation Folder</source> <translation>インストール先フォルダã®é¸æŠž</translation> </message> @@ -2318,247 +1933,8 @@ Do you want to continue?</source> </message> </context> <context> - <name>QInstallerCreator::Archive</name> - <message> - <source>Could not create %1: %2</source> - <translation>%1 を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not open archive file %1 for reading.</source> - <translation>èªã¿è¾¼ã¿ç”¨ã«ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ファイル %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not create archive from %1: Not a file.</source> - <translation>%1 ã‹ã‚‰ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: ファイルã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>Error while packing directory at %1</source> - <translation>%1 ã§ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ãƒ‘ックä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ</translation> - </message> -</context> -<context> <name>QObject</name> <message> - <source>No marker found, stopped after %1.</source> - <translation>マーカーãŒè¦‹ã¤ã‹ã‚‰ãªã‹ã£ãŸãŸã‚ã€%1 ã§åœæ¢ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Cannot create zipped file for path %1: %2</source> - <translation>%1 ã« ZIP ファイルを作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not seek to in-binary resource. (offset: %1, length: %2)</source> - <translation>ãƒã‚¤ãƒŠãƒªãƒªã‚½ãƒ¼ã‚¹ã‚’シークã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ (オフセット: %1, é•·ã•: %2)</translation> - </message> - <message> - <source>Could not register in-binary resource.</source> - <translation>ãƒã‚¤ãƒŠãƒªãƒªã‚½ãƒ¼ã‚¹ã«ç™»éŒ²ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not open binary %1: %2</source> - <translation>ãƒã‚¤ãƒŠãƒª %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not seek to binary layout section.</source> - <translation>ãƒã‚¤ãƒŠãƒªãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆã‚»ã‚¯ã‚·ãƒ§ãƒ³ã¸ã‚·ãƒ¼ã‚¯ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not seek to metadata index.</source> - <translation>メタデータインデックスã¸ã‚·ãƒ¼ã‚¯ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not seek to operation list.</source> - <translation>オペレーションリストã¸ã‚·ãƒ¼ã‚¯ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not seek to component index information.</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹æƒ…å ±ã¸ã‚·ãƒ¼ã‚¯ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not seek to component index.</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã¸ã‚·ãƒ¼ã‚¯ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Cannot open file %1 for reading: %2</source> - <translation>èªã¿è¾¼ã¿ç”¨ã«ãƒ•ã‚¡ã‚¤ãƒ« %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Cannot open file %1 for writing: %2</source> - <translation>書ãè¾¼ã¿ç”¨ã«ãƒ•ã‚¡ã‚¤ãƒ« %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Write failed after %1 bytes: %2</source> - <translation>%1 ãƒã‚¤ãƒˆã®æ›¸ãè¾¼ã¿å¾Œã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %2</translation> - </message> - <message> - <source>Read failed after %1 bytes: %2</source> - <translation>%1 ãƒã‚¤ãƒˆã®èªã¿è¾¼ã¿å¾Œã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not remove file %1: %2</source> - <translation>ファイル %1 を削除ã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not remove folder %1: %2</source> - <translation>フォルダ %1 を削除ã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not create folder %1</source> - <translation>フォルダ %1 を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not copy file from %1 to %2: %3</source> - <translation>ファイル %1 ã‚’ %2 ã«ã‚³ãƒ”ーã§ãã¾ã›ã‚“ã§ã—ãŸã€‚エラー: %3</translation> - </message> - <message> - <source>Could not move file from %1 to %2: %3</source> - <translation>ファイル %1 ã‚’ %2 ã¸ç§»å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸ: %3</translation> - </message> - <message> - <source>Could not create folder %1: %2</source> - <translation>フォルダ %1 を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not open temporary file: %1</source> - <translation>一時ファイル %1 ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not open temporary file for template %1: %2</source> - <translation>テンプレート %1 用ã®ä¸€æ™‚ファイルを開ã‘ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not create lock file %1: %2</source> - <translation>ãƒãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ« %1 を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not write PID to lock file %1: %2</source> - <translation>ãƒãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ« %1 ã« PID を書ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not lock lock file %1: %2</source> - <translation>ãƒãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ« %1 ã‚’ãƒãƒƒã‚¯ã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not unlock lock file %1: %2</source> - <translation>ãƒãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ« %1 をアンãƒãƒƒã‚¯ã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Path exists but is not a folder: %1</source> - <translation>パスãŒå˜åœ¨ã—ã¦ã„ã¾ã™ãŒã€ãƒ•ã‚©ãƒ«ãƒ€ã§ã¯ã‚ã‚Šã¾ã›ã‚“: %1</translation> - </message> - <message> - <source>Could not create folder: %1</source> - <translation>フォルダを作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %1</translation> - </message> - <message> - <source>Could not create temporary file</source> - <translation>一時ファイルを作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not retrieve property %1 for item %2</source> - <translation>アイテム%2 ã‹ã‚‰ãƒ—ãƒãƒ‘ティ %1 ã‚’å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> - <translation>アイテム%2 ã®ãƒ—ãƒãƒ‘ティ %1 ã®åž‹ãŒ VT_FILETIME ã§ã¯ãªã %3 ã«ãªã£ã¦ã„ã¾ã™</translation> - </message> - <message> - <source>Could not convert file time to local time</source> - <translation>ファイルã®æ™‚刻をãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ã«å¤‰æ›ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not convert local file time to system time</source> - <translation>ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®æ™‚刻をシステムã®æ™‚刻ã¸å¤‰æ›ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>No device set for output stream</source> - <translation>ストリームを出力ã™ã‚‹ãƒ‡ãƒã‚¤ã‚¹ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“</translation> - </message> - <message> - <source>Could not load codecs</source> - <translation>コーデックをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not retrieve default format</source> - <translation>デフォルトフォーマットをå–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not open archive</source> - <translation>アーカイブを開ã‘ã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>No CArc found</source> - <translation>CArc ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> - </message> - <message> - <source>Could not retrieve number of items in archive</source> - <translation>アーカイブ内ã®ã‚¢ã‚¤ãƒ†ãƒ æ•°ãŒå–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not retrieve path of archive item %1</source> - <translation>アーカイブアイテム%1 ã®ãƒ‘スãŒå–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Unknown exception caught (%1)</source> - <translation>未知ã®ä¾‹å¤–ãŒç™ºç”Ÿã—ã¾ã—㟠(%1)</translation> - </message> - <message> - <source>Failed</source> - <translation>失敗</translation> - </message> - <message> - <source>Could not remove already existing symlink. %1</source> - <translation>ã™ã§ã«å˜åœ¨ã™ã‚‹ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã¯å‰Šé™¤ã§ãã¾ã›ã‚“: %1</translation> - </message> - <message> - <source>Could not open file: %1 (%2)</source> - <translation>ファイルãŒé–‹ã‘ã¾ã›ã‚“: %1 (%2)</translation> - </message> - <message> - <source>Could not create symlink at '%1'. Another one is already existing.</source> - <translation>'%1' ã«ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ä»–ã®ãƒªãƒ³ã‚¯ãŒã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>Could not read symlink target from file '%1'.</source> - <translation>シンボリックリンクã®å‚照先ã®ãƒ•ã‚¡ã‚¤ãƒ« '%1' ã‚’èªã¿è¾¼ã¿ç”¨ã«é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not create symlink at %1. %2</source> - <translation>%1 ã«ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>internal code: %1</source> - <translation>内部コード: %1</translation> - </message> - <message> - <source>not enough memory</source> - <translation>メモリãŒä¸è¶³ã—ã¦ã„ã¾ã™</translation> - </message> - <message> - <source>Error: %1</source> - <translation>エラー: %1</translation> - </message> - <message> - <source>Could not create archive %1. %2</source> - <translation>アーカイブ %1 ãŒä½œæˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Error while extracting '%1': %2</source> - <translation>'%1' ã®å±•é–‹ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %2</translation> - </message> - <message> - <source>CArc index %1 out of bounds [0, %2]</source> - <translation>CArc ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ %1 ãŒç¯„囲外ã§ã™ [0, %2]</translation> - </message> - <message> - <source>Item index %1 out of bounds [0, %2]</source> - <translation>アイテムã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ %1 ãŒç¯„囲外ã§ã™ [0, %2]</translation> - </message> - <message> - <source>Could not create output file for writing: %1</source> - <translation>書ãè¾¼ã¿ç”¨ã«å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %1</translation> - </message> - <message> <source>Authorization required</source> <translation>èªè¨¼è¦æ±‚</translation> </message> @@ -2570,136 +1946,6 @@ Do you want to continue?</source> <source>Error acquiring admin rights</source> <translation>管ç†è€…権é™ã®å–å¾—ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ</translation> </message> - <message> - <source>Could not backup file %1</source> - <translation>ファイル %1 ã‚’ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not delete file %1</source> - <translation>ファイル %1 を削除ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Could not restore backup file into %1</source> - <translation>ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ファイルを %1 ã¸å¾©å…ƒã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Failed to overwrite %1: %2</source> - <translation>%1 ã«ä¸Šæ›¸ãã§ãã¾ã›ã‚“: %2</translation> - </message> - <message> - <source>Registry path %1 is not writable</source> - <translation>レジストリã®ãƒ‘ス %1 ã«æ›¸ãè¾¼ã¿ã§ãã¾ã›ã‚“</translation> - </message> - <message> - <source>Could not write to registry path %1</source> - <translation>レジストリã®ãƒ‘ス %1 ã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>Invalid Argument: source folder must not be empty.</source> - <translation>無効ãªå¼•æ•°: ソースフォルダãŒç©ºã§ã¯ã„ã‘ã¾ã›ã‚“。</translation> - </message> - <message> - <source>Could not backup file %1: %2</source> - <translation>ファイル %1 ã‚’ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Failed to copy file %1: %2</source> - <translation>ファイル %1 ã¸ã®ã‚³ãƒ”ーã«å¤±æ•—ã—ã¾ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not create folder at %1: %2</source> - <translation>%1 ã«ãƒ•ã‚©ãƒ«ãƒ€ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Invalid arguments: %1 arguments given, %2 to %3 expected.</source> - <translation>無効ãªå¼•æ•°: %1個ã®å¼•æ•°ãŒæ¸¡ã•ã‚Œã¾ã—ãŸãŒã€å¿…è¦ãªã®ã¯%2ã‹ã‚‰%3個以内ã§ã™ã€‚</translation> - </message> - <message> - <source>Invalid arguments: %1 arguments given, %2 expected.</source> - <translation>無効ãªå¼•æ•°: %1個ã®å¼•æ•°ãŒæ¸¡ã•ã‚Œã¾ã—ãŸãŒã€å¿…è¦ãªã®ã¯%2個ã§ã™ã€‚</translation> - </message> - <message> - <source>Error while elevating access rights.</source> - <translation>アクセス権é™ã®æ˜‡æ ¼ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Failed to seek in file %1: %2</source> - <translation>ファイル %1 ã®ã‚·ãƒ¼ã‚¯ã«å¤±æ•—ã—ã¾ã—ãŸ: %2</translation> - </message> - <message> - <source>Failed to open %1 for reading</source> - <translation>èªã¿è¾¼ã¿ç”¨ã« %1 ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸ</translation> - </message> - <message> - <source>Failed to open %1 for writing</source> - <translation>書ãè¾¼ã¿ç”¨ã« %1 ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸ</translation> - </message> - <message> - <source>Could not create link from %1 to %2.</source> - <translation>%1 ã‹ã‚‰ %2 ã¸ã®ãƒªãƒ³ã‚¯ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not remove link from %1 to %2.</source> - <translation>%1 ã‹ã‚‰ %2 ã¸ã®ãƒªãƒ³ã‚¯ã‚’削除ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Authorization Error</source> - <translation>èªè¨¼ã‚¨ãƒ©ãƒ¼</translation> - </message> - <message> - <source>Registering file types is only supported on Windows.</source> - <translation>ファイル形å¼ã®ç™»éŒ²ã¯ Windows ã§ã®ã¿ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚</translation> - </message> - <message> - <source>Failed to open '%1' for reading.</source> - <translation>èªã¿è¾¼ã¿ç”¨ã« '%1' ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Failed to open '%1' for writing.</source> - <translation>書ãè¾¼ã¿ç”¨ã« '%1' ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Number of arguments does not match: one is required</source> - <translation>引数ã®æ•°ãŒä¸€è‡´ã—ã¾ã›ã‚“: 一ã¤ã®ã¿æŒ‡å®šã—ã¦ãã ã•ã„</translation> - </message> - <message> - <source>Could not get package manager core.</source> - <translation>パッケージマãƒãƒ¼ã‚¸ãƒ£ã®ã‚³ã‚¢ã‚’å–å¾—ã§ãã¾ã›ã‚“。</translation> - </message> - <message> - <source>This process should be stopped before continuing: %1</source> - <translation>続行ã™ã‚‹ã«ã¯ã“ã®ãƒ—ãƒã‚»ã‚¹ã‚’終了ã—ã¦ãã ã•ã„: %1</translation> - </message> - <message> - <source>These processes should be stopped before continuing: %1</source> - <translation>続行ã™ã‚‹ã«ã¯ã“れらã®ãƒ—ãƒã‚»ã‚¹ã‚’終了ã—ã¦ãã ã•ã„: %1</translation> - </message> - <message> - <source>Could not create temporary directory at %1: %2</source> - <translation>テンプレート用ã®ä¸€æ™‚ディレクトリを %1 ã«ä½œæˆã§ãã¾ã›ã‚“ã§ã—ãŸ: %2</translation> - </message> - <message> - <source>Could not create temporary directory at %1: unknown error</source> - <translation>テンプレート用ã®ä¸€æ™‚フォルダを %1 ã«ä½œæˆã§ãã¾ã›ã‚“ã§ã—ãŸ: 未知ã®ã‚¨ãƒ©ãƒ¼</translation> - </message> - <message> - <source>Could not get authorization.</source> - <translation>èªè¨¼ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not get authorization that is needed for continuing the installation. -Either abort the installation or use the fallback solution by running -%1 -as root and then clicking ok.</source> - <translation>インストールã®ç¶™ç¶šã«å¿…è¦ãªèªè¨¼ã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ -インストールを「ä¸æ¢ã€ã™ã‚‹ã‹ã€åˆ¥ã®æ‰‹æ®µã¨ã—㦠root 㧠-%1 -を実行ã—ãŸå¾Œã«ã€ŒOKã€ã‚’クリックã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Failed to seek in file %1. Reason: %2.</source> - <translation>ファイル %1 ã®ã‚·ãƒ¼ã‚¯ã«å¤±æ•—ã—ã¾ã—ãŸ: %2</translation> - </message> </context> <context> <name>Settings</name> @@ -2739,26 +1985,10 @@ as root and then clicking ok.</source> <translation>ãƒãƒ¼ãƒˆ:</translation> </message> <message> - <source>HTTP proxy requires authentication</source> - <translation>HTTP プãƒã‚ã‚·ã§èªè¨¼ãŒå¿…è¦</translation> - </message> - <message> - <source>Username:</source> - <translation>ユーザå:</translation> - </message> - <message> - <source>Password:</source> - <translation>パスワード:</translation> - </message> - <message> <source>FTP proxy:</source> <translation>FTP プãƒã‚ã‚·:</translation> </message> <message> - <source>FTP proxy requires authentication</source> - <translation>FTP プãƒã‚ã‚·ã§èªè¨¼ãŒå¿…è¦</translation> - </message> - <message> <source>Repositories</source> <translation>リãƒã‚¸ãƒˆãƒª</translation> </message> @@ -2844,98 +2074,6 @@ as root and then clicking ok.</source> </message> </context> <context> - <name>IntroductionPageImpl</name> - <message> - <source>Package manager</source> - <translation>パッケージマãƒãƒ¼ã‚¸ãƒ£</translation> - </message> - <message> - <source>Update components</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã®æ›´æ–°</translation> - </message> - <message> - <source>Remove all components</source> - <translation>ã™ã¹ã¦ã®ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã®å‰Šé™¤</translation> - </message> - <message> - <source>Retrieving information from remote installation sources...</source> - <translation>リモートã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ƒã‹ã‚‰æƒ…å ±ã‚’å–å¾—ã—ã¦ã„ã¾ã™...</translation> - </message> - <message> - <source>At least one valid and enabled repository required for this action to succeed.</source> - <translation>ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã®å®Ÿè¡Œã«ã¯ã²ã¨ã¤ä»¥ä¸Šã®æœ‰åŠ¹ãªãƒªãƒã‚¸ãƒˆãƒªãŒå¿…è¦ã§ã™ã€‚</translation> - </message> - <message> - <source>No updates available.</source> - <translation>æ–°ã—ã„æ›´æ–°ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source> Only local package management available.</source> - <translation> ãƒãƒ¼ã‚«ãƒ«ã®ãƒ‘ッケージ管ç†ã®ã¿åˆ©ç”¨ã§ãã¾ã™ã€‚</translation> - </message> - <message> - <source>Quit</source> - <translation>終了</translation> - </message> -</context> -<context> - <name>TargetDirectoryPageImpl</name> - <message> - <source>The installation path cannot be empty, please specify a valid folder.</source> - <translation>インストール先ã®ãƒ‘スã¯ç©ºã«ã§ãã¾ã›ã‚“。有効ãªãƒ•ã‚©ãƒ«ãƒ€ã‚’指定ã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>The installation path cannot be relative, please specify an absolute path.</source> - <translation>インストール先ã®ãƒ‘スã«ç›¸å¯¾ãƒ‘スã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。絶対パスã§æŒ‡å®šã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>The path you have entered is too long, please make sure to specify a valid path.</source> - <translation>入力ã—ãŸãƒ‘スãŒé•·ã™ãŽã¾ã™ã€‚有効ãªãƒ‘スã‹ã©ã†ã‹ç¢ºèªã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> - <translation>入力ã—ãŸãƒ‘スã¯ç„¡åŠ¹ã§ã™ã€‚有効ãªãƒ‰ãƒ©ã‚¤ãƒ–ã‹ã©ã†ã‹ç¢ºèªã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>The installation path must not contain %1, please specify a valid folder.</source> - <translation>インストール先ã®ãƒ‘ス㫠%1 ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。有効ãªãƒ•ã‚©ãƒ«ãƒ€ã‚’指定ã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> - <translation>インストール先ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚ã‚‹ã„ã¯ãã‚Œã¾ã§ã®ãƒ‘スã«éž ASCII æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚ãã®ã‚ˆã†ãªãƒ‘スã¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。別ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚ã‚‹ã„ã¯ãƒ‘スをé¸æŠžã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Warning</source> - <translation>è¦å‘Š</translation> - </message> - <message> - <source>Error</source> - <translation>エラー</translation> - </message> - <message> - <source>As the install directory is completely deleted installing in %1 is forbidden.</source> - <translation>インストールã—ãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ™‚ã«å®Œå…¨ã«å‰Šé™¤ã•ã‚Œã‚‹ãŸã‚ã€%1 ã¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯è¨±å¯ã§ãã¾ã›ã‚“。</translation> - </message> - <message> - <source>The folder you selected already exists and contains an installation. Choose a different target for installation.</source> - <translation>é¸æŠžã•ã‚ŒãŸãƒ•ã‚©ãƒ«ãƒ€ã¯æ—¢ã«å˜åœ¨ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ¸ˆã¿ã§ã™ã€‚ä»–ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã‚’é¸æŠžã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>You have selected an existing, non-empty folder for installation. -Note that it will be completely wiped on uninstallation of this application. -It is not advisable to install into this folder as installation might fail. -Do you want to continue?</source> - <translation>æ—¢å˜ã®ç©ºã§ã¯ãªã„フォルダをインストール先ã«é¸æŠžã—ã¾ã—ãŸã€‚ -ã“ã®ã‚¢ãƒ—リケーションをアンインストールã™ã‚‹æ™‚ã«ã¯ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã™ã¹ã¦ãŒæ¶ˆåŽ»ã•ã‚Œã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。 -ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯å¤±æ•—ã™ã‚‹å¯èƒ½æ€§ã‚‚ã‚り推奨ã•ã‚Œã¾ã›ã‚“。 -インストールを継続ã—ã¾ã™ã‹?</translation> - </message> - <message> - <source>You have selected an existing file or symlink, please choose a different target for installation.</source> - <translation>æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚ã‚‹ã„ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã‚’é¸æŠžã—ã¾ã—ãŸã€‚ä»–ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã‚’é¸æŠžã—ã¦ãã ã•ã„。</translation> - </message> -</context> -<context> <name>QInstaller::ProxyCredentialsDialog</name> <message> <source>Dialog</source> @@ -3476,15 +2614,15 @@ as root and then clicking OK.</source> <context> <name>QInstaller::RemoteObject</name> <message> - <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %3</source> - <translation>コマンドをé€ä¿¡ã—ãŸå¾Œã€ã™ã¹ã¦ã®ãƒ‡ãƒ¼ã‚¿ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %1。想定ãƒã‚¤ãƒˆæ•°: %2 ã€å—ä¿¡ãƒã‚¤ãƒˆæ•°: %3。エラー: %3</translation> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>コマンドをé€ä¿¡ã—ãŸå¾Œã€ã™ã¹ã¦ã®ãƒ‡ãƒ¼ã‚¿ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %1。想定ãƒã‚¤ãƒˆæ•°: %2 ã€å—ä¿¡ãƒã‚¤ãƒˆæ•°: %3。エラー: %4</translation> </message> </context> <context> <name>QInstaller::RemoteServerConnection</name> <message> - <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %3</source> - <translation>コマンドをé€ä¿¡ã—ãŸå¾Œã€ã™ã¹ã¦ã®ãƒ‡ãƒ¼ã‚¿ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %1。想定ãƒã‚¤ãƒˆæ•°: %2 ã€å—ä¿¡ãƒã‚¤ãƒˆæ•°: %3。エラー: %3</translation> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>コマンドをé€ä¿¡ã—ãŸå¾Œã€ã™ã¹ã¦ã®ãƒ‡ãƒ¼ã‚¿ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %1。想定ãƒã‚¤ãƒˆæ•°: %2 ã€å—ä¿¡ãƒã‚¤ãƒˆæ•°: %3。エラー: %4</translation> </message> </context> <context> diff --git a/src/sdk/translations/pl.ts b/src/sdk/translations/pl.ts new file mode 100644 index 000000000..9c792a9c5 --- /dev/null +++ b/src/sdk/translations/pl.ts @@ -0,0 +1,3220 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="pl_PL" sourcelanguage="en_US"> +<context> + <name>AuthenticationRequiredException</name> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="283"/> + <source>%1 at %2</source> + <translation>%1 w %2</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="300"/> + <source>Proxy requires authentication.</source> + <translation>Proxy wymaga autoryzacji.</translation> + </message> +</context> +<context> + <name>BinaryContent</name> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="207"/> + <source>Could not seek to %1 to read the operation data.</source> + <translation>Nie można przesunąć wskaźnika pozycji pliku do %1 w celu odczytania danych operacji.</translation> + </message> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="225"/> + <source>Could not seek to %1 to read the resource collection block.</source> + <translation>Nie można przesunąć wskaźnika pozycji pliku do %1 w celu odczytania bloku kolekcji zasobów.</translation> + </message> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="263"/> + <source>Could not open meta resource. Error: %1</source> + <translation>Nie można otworzyć metazasobów. BÅ‚Ä…d: %1</translation> + </message> +</context> +<context> + <name>BinaryLayout</name> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="121"/> + <source>Could not seek to %1 to read the embedded meta data count.</source> + <translation>Nie można przesunąć wskaźnika pozycji pliku do %1 w celu odczytania iloÅ›ci danych wbudowanych.</translation> + </message> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="132"/> + <source>Could not seek to %1 to read the resource collection segment.</source> + <translation>Nie można przesunąć wskaźnika pozycji pliku do %1 w celu odczytania segmentu z kolekcjÄ… zasobów.</translation> + </message> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="145"/> + <source>Unexpected mismatch of meta resources. Read %1, expected: %2.</source> + <translation>Nieoczekiwane dane metazasobów. Przeczytano %1, oczekiwano %2.</translation> + </message> +</context> +<context> + <name>Dialog</name> + <message> + <location filename="../../libs/kdtools/authenticationdialog.ui" line="13"/> + <source>Http authentication required</source> + <translation>Wymagana autoryzacja HTTP</translation> + </message> + <message> + <location filename="../../libs/kdtools/authenticationdialog.ui" line="19"/> + <source>You need to supply a Username and Password to access this site.</source> + <translation>Należy podać nazwÄ™ użytkownia i hasÅ‚o aby uzystać dostÄ™p do tej strony.</translation> + </message> + <message> + <location filename="../../libs/kdtools/authenticationdialog.ui" line="29"/> + <source>Username:</source> + <translation>Nazwa użytkownika:</translation> + </message> + <message> + <location filename="../../libs/kdtools/authenticationdialog.ui" line="39"/> + <source>Password:</source> + <translation>HasÅ‚o:</translation> + </message> + <message> + <location filename="../../libs/kdtools/authenticationdialog.ui" line="76"/> + <source>%1 at %2</source> + <translation>%1 w %2</translation> + </message> +</context> +<context> + <name>DirectoryGuard</name> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="163"/> + <source>Path exists but is not a folder: %1</source> + <translation>IsniejÄ…ca Å›cieżka %1 nie jest katalogiem</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="180"/> + <source>Could not create folder: %1</source> + <translation>Nie można utworzyć katalogu: %1</translation> + </message> +</context> +<context> + <name>ExtractCallbackImpl</name> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="815"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="884"/> + <source>Could not retrieve path of archive item %1</source> + <translation>Nie można odczytać Å›cieżki elementu archiwum %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="844"/> + <source>Could not remove already existing symlink. %1</source> + <translation>Nie można usunÄ…c istniejÄ…cego dowiÄ…zania symbolicznego %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="852"/> + <source>Could not open file: %1 (%2)</source> + <translation>Nie można otworzyć pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="907"/> + <source>Could not create symlink at '%1'. Another one is already existing.</source> + <translation>Nie można utworzyć dowiÄ…zania symbolicznego "%1". Istnieje już dowiÄ…zanie do innego pliku.</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="914"/> + <source>Could not read symlink target from file '%1'.</source> + <translation>Nie można odczytać docelowego pliku "%1" wynikajÄ…cego z dowiÄ…zania.</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="924"/> + <source>Could not create symlink at %1. %2</source> + <translation>Nie można utworzyć dowiÄ…zania symbolicznego "%1": %2</translation> + </message> +</context> +<context> + <name>InstallerCalculator</name> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="76"/> + <source>Components added as automatic dependencies:</source> + <translation>Komponenty dodane w wyniku automatycznych zależnoÅ›ci:</translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="79"/> + <source>Components added as dependency for '%1':</source> + <translation>Komponenty dodane w wyniku zależnoÅ›ci dla "%1":</translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="82"/> + <source>Components that have resolved dependencies:</source> + <translation>Komponenty z rozwiÄ…zanymi zależnoÅ›ciami:</translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="85"/> + <source>Selected components without dependencies:</source> + <translation>Wybrane komponenty bez zależnoÅ›ci:</translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="111"/> + <source>Recursion detected, component '%1' already added with reason: '%2'</source> + <translation>Wykryto cyklicznÄ… zależność, komponent "%1" zostaÅ‚ uprzednio dodany z powodu: "%2"</translation> + </message> + <message> + <location filename="../../libs/installer/installercalculator.cpp" line="173"/> + <source>Cannot find missing dependency '%1' for '%2'.</source> + <translation>Nie można odnaleźć zależnego komponentu "%1" dla komponentu "%2".</translation> + </message> +</context> +<context> + <name>KDJob</name> + <message> + <location filename="../../libs/kdtools/kdjob.cpp" line="188"/> + <source>Canceled</source> + <translation>Anulowano</translation> + </message> +</context> +<context> + <name>KDLockFile</name> + <message> + <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="53"/> + <location filename="../../libs/kdtools/kdlockfile_win.cpp" line="55"/> + <source>Could not create lock file '%1': %2</source> + <translation>Nie można zablokować pliku "%1": %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="64"/> + <location filename="../../libs/kdtools/kdlockfile_win.cpp" line="63"/> + <source>Could not write PID to lock file '%1': %2</source> + <translation>Nie można zapisać PID w celu zablokowania pliku "%1": %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="73"/> + <location filename="../../libs/kdtools/kdlockfile_win.cpp" line="70"/> + <source>Could not obtain the lock for file '%1': %2</source> + <translation>Nie można uzyskać wyÅ‚Ä…cznoÅ›ci dostÄ™pu do pliku "%1": %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdlockfile_unix.cpp" line="88"/> + <location filename="../../libs/kdtools/kdlockfile_win.cpp" line="85"/> + <source>Could not release the lock for file '%1': %2</source> + <translation>Nie można odblokować pliku "%1": %2</translation> + </message> +</context> +<context> + <name>KDUpdater::AppendFileOperation</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="610"/> + <source>Cannot backup file %1: %2</source> + <translation>Nie można utworzyć kopii zapasowej pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="622"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="623"/> + <source>exactly 2</source> + <translation>dokÅ‚adnie 2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="649"/> + <source>Could not open file '%1' for writing: %2</source> + <translation>Nie można otworzyć pliku "%1" do zapisu: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="668"/> + <source>Cannot find backup file for %1.</source> + <translation>Nie można odnaleźć kopii zapasowej pliku %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="674"/> + <source>Could not restore backup file for %1.</source> + <translation>Nie można przywrócić kopii zapasowej pliku %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="685"/> + <source>Could not restore backup file for %1: %2</source> + <translation>Nie można przywrócić kopii zapasowej pliku %1: %2</translation> + </message> +</context> +<context> + <name>KDUpdater::CopyOperation</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="142"/> + <source>Could not backup file %1.</source> + <translation>Nie można utworzyć kopii zapasowej pliku %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="151"/> + <source>Invalid arguments: %1 arguments given, 2 expected.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty: ilość przekazanych argumentów %1, oczekiwano 2.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="161"/> + <source>Could not copy a non-existent file: %1</source> + <translation>Nie można skopiować nieistniejÄ…cego pliku: %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="170"/> + <source>Could not remove destination file %1: %2</source> + <translation>Nie można usunąć pliku docelowego %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="178"/> + <source>Could not copy %1 to %2: %3</source> + <translation>Nie można skopiować pliku z %1 do %2: %3</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="195"/> + <source>Could not delete file %1: %2</source> + <translation>Nie można usunąć pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="208"/> + <source>Could not restore backup file into %1: %2</source> + <translation>Nie można przywrócić kopii zapasowej pliku %1: %2</translation> + </message> +</context> +<context> + <name>KDUpdater::DeleteOperation</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="369"/> + <source>Cannot create backup of %1: %2</source> + <translation>Nie można utworzyć kopii zapasowej pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="378"/> + <source>Invalid arguments: %1 arguments given, 1 expected.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty: ilość przekazanych argumentów %1, oczekiwano 1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="393"/> + <source>Cannot restore backup file for %1: %2</source> + <translation>Nie można przywrócić kopii zapasowej pliku %1: %2</translation> + </message> +</context> +<context> + <name>KDUpdater::FileDownloader</name> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="188"/> + <source>Download finished.</source> + <translation>ZakoÅ„czono pobieranie.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="191"/> + <source>Cryptographic hashes do not match.</source> + <translation>WartoÅ›ci haszu kryptograficznego nie zgadzajÄ… siÄ™.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="198"/> + <source>Download canceled.</source> + <translation>Anulowano pobieranie.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="305"/> + <source>%1 of %2</source> + <translation>%1 z %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="308"/> + <source>%1 downloaded.</source> + <translation>Pobrano %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="311"/> + <source>(%1/sec)</source> + <translation>(%1/sek.)</translation> + </message> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="322"/> + <source>%n day(s), </source> + <translation> + <numerusform>%n dzieÅ„, </numerusform> + <numerusform>%n dni, </numerusform> + <numerusform>%n dni, </numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="326"/> + <source>%n hour(s), </source> + <translation> + <numerusform>%n godzina, </numerusform> + <numerusform>%n godziny, </numerusform> + <numerusform>%n godzin, </numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="330"/> + <source>%n minute(s)</source> + <translation> + <numerusform>%n minuta</numerusform> + <numerusform>%n minuty</numerusform> + <numerusform>%n minut</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="335"/> + <source>%n second(s)</source> + <translation> + <numerusform>%n sekunda</numerusform> + <numerusform>%n sekundy</numerusform> + <numerusform>%n sekund</numerusform> + </translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="337"/> + <source> - %1%2%3%4 remaining.</source> + <translation> - pozostaÅ‚o %1%2%3%4.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="339"/> + <source> - unknown time remaining.</source> + <translation> - nieznany czas trwania.</translation> + </message> +</context> +<context> + <name>KDUpdater::HttpDownloader</name> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="870"/> + <source>Cannot download %1: Writing to file '%2' failed: %3</source> + <translation>Nie można pobrać %1: bÅ‚Ä…d zapisu do %2: %3</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1006"/> + <source>Cannot download %1: Could not create %2: %3</source> + <translation>Nie można pobrać %1: bÅ‚Ä…d tworzenia %2: %3</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1025"/> + <source>%1 at %2</source> + <translation>%1 w %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1041"/> + <source>Authentication request canceled.</source> + <translation>Anulowano żądanie autoryzacji.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1076"/> + <source>Secure Connection Failed</source> + <translation>BÅ‚Ä…d bezpiecznego poÅ‚Ä…czenia</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1077"/> + <source>There was an error during connection to: %1.</source> + <translation>WystÄ…piÅ‚ bÅ‚Ä…d w trakcie Å‚Ä…czenia z: %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1078"/> + <source>This could be a problem with the server's configuration, or it could be someone trying to impersonate the server.</source> + <translation>Może to być problem konfiguracji serwera lub osoba trzecia podszywa siÄ™ pod serwer.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1080"/> + <source>If you have connected to this server successfully in the past or trust this server, the error may be temporary and you can try again.</source> + <translation>JeÅ›li poprzednio możliwe byÅ‚o poÅ‚Ä…czenie siÄ™ z serwerem lub jeÅ›li jest to zaufany serwer, może to być jedynie tymczasowy bÅ‚Ä…d i można ponowić próbÄ™.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1084"/> + <source>Try again</source> + <translation>Spróbuj ponownie</translation> + </message> +</context> +<context> + <name>KDUpdater::LocalFileDownloader</name> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="503"/> + <source>Cannot open source file '%1' for reading.</source> + <translation>Nie można otworzyć pliku źródÅ‚owego "%1" do odczytu.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="519"/> + <source>Cannot open destination file '%1' for writing.</source> + <translation>Nie można otworzyć docelowego pliku "%1" do zapisu.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="576"/> + <source>Writing to %1 failed: %2</source> + <translation>BÅ‚Ä…d zapisu do "%1": %2</translation> + </message> +</context> +<context> + <name>KDUpdater::MkdirOperation</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="465"/> + <source>Invalid arguments: %1 arguments given, 1 expected.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty: ilość przekazanych argumentów %1, oczekiwano 1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="473"/> + <source>Could not create folder %1: Unknown error.</source> + <translation>Nie można utworzyć katalogu %1: Nieznany bÅ‚Ä…d.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="505"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="507"/> + <source>Cannot remove directory %1: %2</source> + <translation>Nie można usunąć katalogu %1: %2</translation> + </message> +</context> +<context> + <name>KDUpdater::MoveOperation</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="269"/> + <source>Could not backup file %1.</source> + <translation>Nie można utworzyć kopii zapasowej pliku %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="279"/> + <source>Invalid arguments: %1 arguments given, 2 expected.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty: ilość przekazanych argumentów %1, oczekiwano 2.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="290"/> + <source>Could not remove destination file %1: %2</source> + <translation>Nie można usunÄ…c pliku docelowego %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="299"/> + <source>Could not copy %1 to %2: %3</source> + <translation>Nie można skopiować pliku z %1 do %2: %3</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="312"/> + <source>Cannot copy %1 to %2: %3</source> + <translation>Nie można skopiować %1 do %2: %3</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="318"/> + <source>Cannot remove file %1.</source> + <translation>Nie można usunąć pliku %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="331"/> + <source>Cannot restore backup file for %1: %2</source> + <translation>Nie można przywrócić kopii zapasowej pliku %1: %2</translation> + </message> +</context> +<context> + <name>KDUpdater::PackagesInfo</name> + <message> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="103"/> + <source>%1 contains invalid content: %2</source> + <translation>Niepoprawna zawartość %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="269"/> + <source>The file %1 does not exist.</source> + <translation>Plik %1 nie istnieje.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="277"/> + <source>Could not open %1.</source> + <translation>Nie można otworzyć %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="289"/> + <source>Parse error in %1 at %2, %3: %4</source> + <translation>BÅ‚Ä…d parsowania %1 w linii %2, w kolumnie %3: %4</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="302"/> + <source>Root element %1 unexpected, should be 'Packages'.</source> + <translation>Nieoczekiwany główny element %1, oczekiwano <Packages>.</translation> + </message> +</context> +<context> + <name>KDUpdater::PrependFileOperation</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="720"/> + <source>Cannot backup file %1: %2</source> + <translation>Nie można utworzyć kopii zapasowej pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="733"/> + <source>Invalid arguments: %1 arguments given, 2 expected.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty: ilość przekazanych argumentów %1, oczekiwano 2.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="742"/> + <source>Could not open file %1 for reading: %2</source> + <translation>Nie można otworzyć pliku %1 do odczytu: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="760"/> + <source>Could not open file %1 for writing: %2</source> + <translation>Nie można otworzyć pliku %1 do zapisu: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="778"/> + <source>Cannot find backup file for %1.</source> + <translation>Nie można odnaleźć kopii zapasowej pliku %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="783"/> + <source>Cannot restore backup file for %1.</source> + <translation>Nie można przywrócić kopii zapasowej pliku %1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="794"/> + <source>Cannot restore backup file for %1: %2</source> + <translation>Nie można przywrócić kopii zapasowej pliku %1: %2</translation> + </message> +</context> +<context> + <name>KDUpdater::ResourceFileDownloader</name> + <message> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="722"/> + <source>Could not read resource file "%1". Reason:</source> + <translation>Nie można odczytać pliku z zasobami "%1". Powód:</translation> + </message> +</context> +<context> + <name>KDUpdater::RmdirOperation</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="544"/> + <source>Invalid arguments: %1 arguments given, 1 expected.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty: ilość przekazanych argumentów %1, oczekiwano 1.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="551"/> + <source>Could not remove folder %1: The folder does not exist.</source> + <translation>Nie można usunąć katalogu %1: Katalog nie istnieje.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="560"/> + <source>Could not remove folder %1: %2</source> + <translation>Nie można usunąć katalogu %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="574"/> + <source>Cannot recreate directory %1: %2</source> + <translation>Nie można ponownie utworzyć katalogu %1: %2</translation> + </message> +</context> +<context> + <name>KDUpdater::Task</name> + <message> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="192"/> + <source>%1 started</source> + <translation>RozpoczÄ™to %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="205"/> + <source>%1 cannot be stopped</source> + <translation>Nie można zatrzymać %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="223"/> + <source>Cannot stop task %1</source> + <translation>Nie można zatrzymać zadania %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="242"/> + <source>%1 cannot be paused</source> + <translation>Nie można wstrzymać %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="260"/> + <source>Cannot pause task %1</source> + <translation>Nie można wstrzymać zadania %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="288"/> + <source>Cannot resume task %1</source> + <translation>Nie można wznowić zadania %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdatertask.cpp" line="344"/> + <source>%1 done</source> + <translation>ZakoÅ„czono %1</translation> + </message> +</context> +<context> + <name>KDUpdater::UpdateFinder</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="182"/> + <source>Could not access the package information of this application.</source> + <translation>Brak dostÄ™pu do informacji o pakiecie dla tej aplikacji.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="193"/> + <source>Could not access the update sources information of this application.</source> + <translation>Brak dostÄ™pu do informacji o źródÅ‚ach aktualizacji dla tej aplikacji.</translation> + </message> + <message numerus="yes"> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="216"/> + <source>%n update(s) found.</source> + <translation> + <numerusform>Znaleziono %n uaktualnienie.</numerusform> + <numerusform>Znaleziono %n uaktualnienia.</numerusform> + <numerusform>Znaleziono %n uaktualnieÅ„.</numerusform> + </translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="301"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="546"/> + <source>Downloading Updates.xml from update sources.</source> + <translation>Pobieranie Updates.xml ze źródeÅ‚ uaktualnieÅ„.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="309"/> + <source>Could not download update source %1 from ('%2')</source> + <translation>Nie można pobrać źródÅ‚a uaktualnienia %1 z ("%2")</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="332"/> + <source>Updates.xml file(s) downloaded from update sources.</source> + <translation>Plikii Updates.xml pobrane ze źródeÅ‚ uaktualnieÅ„.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="365"/> + <source>Computing applicable updates.</source> + <translation>SporzÄ…dzanie listy aktualizacji.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="369"/> + <source>Application updates computed.</source> + <translation>SporzÄ…dzono listÄ™ aktualizacji.</translation> + </message> +</context> +<context> + <name>KDUpdater::UpdateSourcesInfo</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="143"/> + <source>%1 contains invalid content: %2</source> + <translation>Niepoprawna zawartość %1: %2</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="302"/> + <source>Could not read "%1"</source> + <translation>Nie można odczytać "%1"</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="313"/> + <source>XML Parse error in %1 at %2, %3: %4</source> + <translation>BÅ‚Ä…d parsowania XML w pliku %1, w linii %2, w kolumnie %3: %4</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="322"/> + <source>Root element %1 unexpected, should be "UpdateSources"</source> + <translation>Nieoczekiwany główny element %1, oczekiwano <UpdateSources></translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="362"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="373"/> + <source>Could not save changes to "%1": %2</source> + <translation>Nie można zachować zmian w "%1": %2</translation> + </message> +</context> +<context> + <name>KDUpdater::UpdatesInfoData</name> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="55"/> + <source>Updates.xml contains invalid content: %1</source> + <translation>Niepoprawna zawartość Updates.xml: %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="63"/> + <source>Could not read "%1"</source> + <translation>Nie można odczytać "%1"</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="72"/> + <source>Parse error in %1 at %2, %3: %4</source> + <translation>BÅ‚Ä…d parsowania %1 w linii %2, w kolumnie %3: %4</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="79"/> + <source>Root element %1 unexpected, should be "Updates".</source> + <translation>Nieoczekiwany główny element %1, oczekiwano <Updates>.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="100"/> + <source>ApplicationName element is missing.</source> + <translation>Brak elementu <ApplicationName>.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="105"/> + <source>ApplicationVersion element is missing.</source> + <translation>Brak elementu <ApplicationVersion>.</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="160"/> + <source>PackageUpdate element without Name</source> + <translation>Brak <Name> w elemencie <PackageUpdate></translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="164"/> + <source>PackageUpdate element without Version</source> + <translation>Brak <Version> w elemencie <PackageUpdate></translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="168"/> + <source>PackageUpdate element without ReleaseDate</source> + <translation>Brak <ReleaseDate> w elemencie <PackageUpdate></translation> + </message> +</context> +<context> + <name>Lib7z</name> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="717"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1438"/> + <source>Could not retrieve number of items in archive</source> + <translation>Nie można odczytać liczby elementów w archiwum</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="724"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1449"/> + <source>Could not retrieve path of archive item %1</source> + <translation>Nie można odczytać Å›cieżki elementu archiwum %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="746"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1409"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1465"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1567"/> + <source>Unknown exception caught (%1)</source> + <translation>ZÅ‚apano nieznany wyjÄ…tek (%1)</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1289"/> + <source>internal code: %1</source> + <translation>kod wewnÄ™trzny: %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1310"/> + <source>not enough memory</source> + <translation>brak pamiÄ™ci</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1316"/> + <source>Error: %1</source> + <translation>BÅ‚Ä…d: %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1336"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1542"/> + <source>Could not load codecs</source> + <translation>Nie można zaÅ‚adować kodeków</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1341"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1547"/> + <source>Could not retrieve default format</source> + <translation>Nie można odczytać domyÅ›lnego formatu</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1387"/> + <source>Could not create archive %1. %2</source> + <translation>Nie można utworzyć archiwum %1. %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1429"/> + <source>CArc index %1 out of bounds [0, %2]</source> + <translation>Indeks CArc %1 poza zakresem [0, %2]</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1443"/> + <source>Item index %1 out of bounds [0, %2]</source> + <translation>Indeks elementu %1 poza zakresem [0, %2]</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1484"/> + <source>Could not create output file for writing: %1</source> + <translation>Nie można otworzyć pliku wyjÅ›ciowego do zapisu: %1</translation> + </message> +</context> +<context> + <name>Lib7z::ExtractItemJob</name> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1577"/> + <source>Could not list archive: QIODevice not set or already destroyed.</source> + <translation>Nie można uzyskać listy zawartoÅ›ci archiwum: nie ustawiono QIODevice lub zostaÅ‚ on już zlikwidowany.</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1586"/> + <source>Error while extracting '%1': %2</source> + <translation>BÅ‚Ä…d rozpakowywania "%1": %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1589"/> + <source>Unknown exception caught (%1)</source> + <translation>ZÅ‚apano nieznany wyjÄ…tek (%1)</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1589"/> + <source>Failed</source> + <translation>Nie powiodÅ‚o siÄ™</translation> + </message> +</context> +<context> + <name>Lib7z::ListArchiveJob</name> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="756"/> + <source>Could not list archive: QIODevice already destroyed.</source> + <translation>Nie można uzyskać listy zawartoÅ›ci archiwum: QIODevice zostaÅ‚ już zlikwidowany.</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="763"/> + <source>Unknown exception caught (%1)</source> + <translation>ZÅ‚apano nieznany wyjÄ…tek (%1)</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="763"/> + <source>Failed</source> + <translation>Nie powiodÅ‚o siÄ™</translation> + </message> +</context> +<context> + <name>OpenArchiveInfo</name> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="639"/> + <source>Could not load codecs</source> + <translation>Nie można zaÅ‚adować kodeków</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="643"/> + <source>Could not retrieve default format</source> + <translation>Nie można odczytać domyÅ›lnego formatu</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="648"/> + <source>Could not open archive</source> + <translation>Nie można otworzyć archiwum</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="652"/> + <source>No CArc found</source> + <translation>Brak CArc</translation> + </message> +</context> +<context> + <name>QIODeviceSequentialOutStream</name> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="386"/> + <source>No device set for output stream</source> + <translation>Nie ustawiono urzÄ…dzenia dla strumienia wyjÅ›ciowego</translation> + </message> +</context> +<context> + <name>QInstaller</name> + <message> + <location filename="../../libs/installer/binarycontent.cpp" line="103"/> + <source>No marker found, stopped after %1.</source> + <translation>Nie odnaleziono znacznika, zatrzymano po %1.</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="110"/> + <source>Cannot open file %1 for reading: %2</source> + <translation>Nie można otworzyć pliku %1 do odczytu: %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="119"/> + <location filename="../../libs/installer/fileio.cpp" line="128"/> + <source>Cannot open file %1 for writing: %2</source> + <translation>Nie można otworzyć pliku %1 do zapisu: %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="141"/> + <source>Read failed after %1 bytes: %2</source> + <translation>BÅ‚Ä…d odczytu po %1 bajtach: %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="163"/> + <source>Copy failed. Error: %1</source> + <translation>BÅ‚Ä…d kopiowania: %1</translation> + </message> + <message> + <location filename="../../libs/installer/fileio.cpp" line="181"/> + <source>Write failed after %1 bytes: %2</source> + <translation>BÅ‚Ä…d zapisu po %1 bajtach: %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="138"/> + <source>bytes</source> + <translation>bajtów</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="139"/> + <source>KiB</source> + <translation>KiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="140"/> + <source>MiB</source> + <translation>MiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="141"/> + <source>GiB</source> + <translation>GiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="142"/> + <source>TiB</source> + <translation>TiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="143"/> + <source>PiB</source> + <translation>PiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="144"/> + <source>EiB</source> + <translation>EiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="145"/> + <source>ZiB</source> + <translation>ZiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="146"/> + <source>YiB</source> + <translation>YiB</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="184"/> + <source>Could not remove file %1: %2</source> + <translation>Nie można usunąć pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="225"/> + <source>Could not remove folder %1: %2</source> + <translation>Nie można usunąć katalogu %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="296"/> + <location filename="../../libs/installer/fileutils.cpp" line="322"/> + <source>Could not create folder %1</source> + <translation>Nie można utworzyć katalogu %1</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="309"/> + <source>Could not copy file from %1 to %2: %3</source> + <translation>Nie można skopiować pliku z %1 do %2: %3</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="338"/> + <source>Could not move file from %1 to %2: %3</source> + <translation>Nie można przenieść pliku z %1 do %2: %3</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="350"/> + <location filename="../../libs/installer/fileutils.cpp" line="359"/> + <source>Could not create folder %1: %2</source> + <translation>Nie można utworzyć katalogu %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="369"/> + <source>Could not open temporary file: %1</source> + <translation>Nie można otworzyć pliku tymczasowego: %1</translation> + </message> + <message> + <location filename="../../libs/installer/fileutils.cpp" line="388"/> + <source>Could not open temporary file for template %1: %2</source> + <translation>Nie można otworzyć pliku tymczasowego dla szablonu %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="210"/> + <source>Could not create temporary file</source> + <translation>Nie można utworzyć pliku tymczasowego</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="230"/> + <source>Could not retrieve property %1 for item %2</source> + <translation>Nie można pobrać wÅ‚aÅ›ciwoÅ›ci %1 z elementu %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="259"/> + <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> + <translation>WÅ‚aÅ›ciwość %1 elementu %2 nie jest typu VT_FILETIME, tylko %3</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="279"/> + <source>Could not convert file time to local time</source> + <translation>Nie można skonwertować czasu zapisu pliku do czasu lokalnego</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="284"/> + <source>Could not convert local file time to system time</source> + <translation>Nie można skonwertować lokalnego czasu do czasu systemowego</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="755"/> + <source>Corrupt installation</source> + <translation>Instalacja uszkodzona</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="756"/> + <source>Your installation seems to be corrupted. Please consider re-installing from scratch.</source> + <translation>Instalacja wyglÄ…da na uszkodzonÄ…. Zaleca siÄ™ ponownÄ… instalacjÄ™.</translation> + </message> + <message> + <location filename="../../libs/installer/utils.cpp" line="393"/> + <source>The specified module could not be found.</source> + <translation>Nie można odnaleźc podanego moduÅ‚u.</translation> + </message> +</context> +<context> + <name>QInstaller::Component</name> + <message> + <location filename="../../libs/installer/component.cpp" line="432"/> + <source>Components cannot have children in updater mode.</source> + <translation>Komponenty nie mogÄ… posiadać dzieci w trybie aktualizacji.</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="558"/> + <source>Could not open the requested translation file '%1'.</source> + <translation>Nie można otworzyć wymaganego pliku z tÅ‚umaczeniami "%1".</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="577"/> + <source>Could not open the requested UI file '%1'. Error: %2</source> + <translation>Nie można otworzyć wymaganego pliku UI "%1". BÅ‚Ä…d: %2</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="586"/> + <source>Could not load the requested UI file '%1'. Error: %2</source> + <translation>Nie można zaÅ‚adować wymaganego pliku UI "%1". BÅ‚Ä…d: %2</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="621"/> + <source>Could not open the requested license file '%1'. Error: %2</source> + <translation>Nie można otworzyć wymaganego pliku z licencjÄ… "%1". BÅ‚Ä…d: %2</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="1001"/> + <source>Error</source> + <translation>BÅ‚Ä…d</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="1001"/> + <source>Error: Operation %1 does not exist</source> + <translation>BÅ‚Ä…d: operacja %1 nie istnieje</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="1247"/> + <source>Cannot resolve isDefault in %1</source> + <translation>Nie można rozwiÄ…zać "isDefault" w %1</translation> + </message> + <message> + <location filename="../../libs/installer/component.cpp" line="1421"/> + <source>Update Info: </source> + <translation>Informacja o aktualizacji: </translation> + </message> +</context> +<context> + <name>QInstaller::ComponentModel</name> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="210"/> + <source>Component is marked for installation.</source> + <translation>Komponent wybrany do zainstalowania.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="212"/> + <source>Component is marked for uninstallation.</source> + <translation>Komponent wybrany do dezinstalacji.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="214"/> + <source>Component is installed.</source> + <translation>Komponent zainstalowany.</translation> + </message> + <message> + <location filename="../../libs/installer/componentmodel.cpp" line="216"/> + <source>Component is not installed.</source> + <translation>Komponent niezainstalowany.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2499"/> + <source>Component Name</source> + <translation>Nazwa komponentu</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2501"/> + <source>Action</source> + <translation>Akcja</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2503"/> + <source>Installed Version</source> + <translation>Zainstalowana wersja</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2505"/> + <source>New Version</source> + <translation>Nowa wersja</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2507"/> + <source>Release Date</source> + <translation>Data wydania</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2509"/> + <source>Size</source> + <translation>Rozmiar</translation> + </message> +</context> +<context> + <name>QInstaller::ComponentSelectionPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1421"/> + <source>Alt+A</source> + <comment>select default components</comment> + <translation>Alt+A</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1423"/> + <source>Def&ault</source> + <translation>D&omyÅ›lne</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1427"/> + <source>Alt+R</source> + <comment>reset to already installed components</comment> + <translation>Alt+R</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1429"/> + <source>&Reset</source> + <translation>Z&resetuj</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1438"/> + <source>Alt+S</source> + <comment>select all components</comment> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1440"/> + <source>&Select All</source> + <translation>Zaznacz w&szystkie</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1446"/> + <source>Alt+D</source> + <comment>deselect all components</comment> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1448"/> + <source>&Deselect All</source> + <translation>O&dznacz wszystkie</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1522"/> + <source>This component will occupy approximately %1 on your hard disk drive.</source> + <translation>Ten komponent zajmie okoÅ‚o %1 miejsca na twardym dysku.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1591"/> + <source>Select Components</source> + <translation>Zaznacz komponenty</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1602"/> + <source>Please select the components you want to update.</source> + <translation>Zaznacz komponenty do uaktualnienia.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1603"/> + <source>Please select the components you want to install.</source> + <translation>Zaznacz komponenty do zainstalowania.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1604"/> + <source>Please select the components you want to uninstall.</source> + <translation>Zaznacz komponenty do dezinstalacji.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1605"/> + <source>Select the components to install. Deselect installed components to uninstall them.</source> + <translation>Zaznacz komponenty do instalacji. Odznacz zainstalowane komponenty do dezinstalacji.</translation> + </message> +</context> +<context> + <name>QInstaller::ConsumeOutputOperation</name> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="64"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="65"/> + <source>at least 2</source> + <translation>przynajmniej 2</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="73"/> + <source>Needed installer object in %1 operation is empty.</source> + <translation>Wymagany obiekt instalacji %1 jest pusty.</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="80"/> + <source>Can not save the output of %1 to an empty installer key value.</source> + <translation>Nie można zapisać wyniku %1 do pustej wartoÅ›ci klucza installera.</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="94"/> + <source>File '%1' does not exist or is not an executable binary.</source> + <translation>Plik "%1" nie istnieje lub nie jest plikiem wykonywalnym.</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="115"/> + <source>Running '%1' resulted in a crash.</source> + <translation>Uruchomienie "%1" zakoÅ„czone bÅ‚Ä™dem.</translation> + </message> +</context> +<context> + <name>QInstaller::CopyDirectoryOperation</name> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="69"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="70"/> + <source>2 or 3</source> + <translation>2 lub 3</translation> + </message> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="70"/> + <source> (<source> <target> [forceOverwrite])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="83"/> + <source>Invalid argument in %0: Third argument needs to be forceOverwrite, if specified</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: Jeżeli trzeci argument jest podany, może to być tylko "forceOverwrite"</translation> + </message> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="93"/> + <source>Invalid arguments in %0: Directories are invalid: %1 %2</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: katalogi sÄ… niewÅ‚aÅ›ciwe: %1, %2</translation> + </message> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="126"/> + <source>Could not create %0</source> + <translation>Nie można utworzyć %0</translation> + </message> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="133"/> + <source>Failed to overwrite %1</source> + <translation>Nie można nadpisać %1</translation> + </message> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="139"/> + <source>Could not copy %0 to %1, error was: %3</source> + <translation>Nie można skopiować pliku z %0 do %1: %3</translation> + </message> + <message> + <location filename="../../libs/installer/copydirectoryoperation.cpp" line="160"/> + <source>Could not remove %0</source> + <translation>Nie można usunąć %0</translation> + </message> +</context> +<context> + <name>QInstaller::CopyFileTask</name> + <message> + <location filename="../../libs/installer/copyfiletask.cpp" line="63"/> + <source>Invalid task item count.</source> + <translation>Niepoprawna ilość zadaÅ„.</translation> + </message> + <message> + <location filename="../../libs/installer/copyfiletask.cpp" line="72"/> + <source>Could not open source '%1' for read. Error: %2.</source> + <translation>Nie można otworzyć źródÅ‚a "%1" do odczytu. BÅ‚Ä…d: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/copyfiletask.cpp" line="88"/> + <source>Could not open target '%1' for write. Error: %2.</source> + <translation>Nie można otworzyć "%1" do zapisu. BÅ‚Ä…d: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/copyfiletask.cpp" line="105"/> + <source>Writing to target '%1' failed. Error: %2.</source> + <translation>BÅ‚Ä…d zapisu pliku docelowego "%1": %2.</translation> + </message> +</context> +<context> + <name>QInstaller::CreateDesktopEntryOperation</name> + <message> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="125"/> + <source>Could not backup file %1: %2</source> + <translation>Nie można utworzyć kopii zapasowej pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="133"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="134"/> + <source>exactly 2</source> + <translation>dokÅ‚adnie 2</translation> + </message> + <message> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="144"/> + <source>Failed to overwrite %1</source> + <translation>Nie można nadpisać %1</translation> + </message> + <message> + <location filename="../../libs/installer/createdesktopentryoperation.cpp" line="150"/> + <source>Could not write Desktop Entry at %1</source> + <translation>Nie można zapisać Desktop Entry w %1</translation> + </message> +</context> +<context> + <name>QInstaller::CreateLinkOperation</name> + <message> + <location filename="../../libs/installer/createlinkoperation.cpp" line="57"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/createlinkoperation.cpp" line="58"/> + <source>exactly 2</source> + <translation>dokÅ‚adnie 2</translation> + </message> + <message> + <location filename="../../libs/installer/createlinkoperation.cpp" line="68"/> + <source>Could not create link from %1 to %2.</source> + <translation>Nie można utworzyć dowiÄ…zania z %1 do %2.</translation> + </message> + <message> + <location filename="../../libs/installer/createlinkoperation.cpp" line="88"/> + <source>Could not remove link from %1 to %2.</source> + <translation>Nie można usunąć dowiÄ…zania z %1 do %2.</translation> + </message> +</context> +<context> + <name>QInstaller::CreateLocalRepositoryOperation</name> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="91"/> + <source>Could not set file permissions %1!</source> + <translation>Nie można ustawić praw dostÄ™pu %1.</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="112"/> + <source>Could not remove file %1: %2</source> + <translation>Nie można usunąć pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="130"/> + <source>Could not move file %1 to %2. Error: %3</source> + <translation>Nie można przenieść pliku z %1 do %2: %3</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="159"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="160"/> + <source>exactly 2</source> + <translation>dokÅ‚adnie 2</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="172"/> + <source>Installer needs to be an offline version: %1.</source> + <translation>Instalator musi być w wersji offline: %1.</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="215"/> + <source>Could not open file: %1</source> + <translation>Nie można otworzyć pliku %1</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="221"/> + <source>Could not read: %1. Error: %2</source> + <translation>BÅ‚Ä…d odczytu %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="251"/> + <source>Could not open file: %1. Error: %2</source> + <translation>Nie można otworzyć pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="269"/> + <source>Could not create target dir: %1.</source> + <translation>Nie można utworzyć katalogu docelowego %1.</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="322"/> + <source>Unknown exception caught: %1.</source> + <translation>ZÅ‚apano nieznany wyjÄ…tek: %1.</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="338"/> + <source>Removing file: %0</source> + <translation>Usuwanie pliku %0</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="341"/> + <source>Could not remove %0.</source> + <translation>Nie można usunąć %0.</translation> + </message> + <message> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="360"/> + <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="364"/> + <source>Cannot remove directory %1: %2</source> + <translation>Nie można usunąć katalogu %1: %2</translation> + </message> +</context> +<context> + <name>QInstaller::CreateShortcutOperation</name> + <message> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="190"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="191"/> + <source>2 or 3</source> + <translation>2 lub 3</translation> + </message> + <message> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="192"/> + <source> (optional: 'workingDirectory=...', 'iconPath=...', 'iconId=...')</source> + <translation> (opcjonalnie: 'workingDirectory=...', 'iconPath=...', 'iconId=...')</translation> + </message> + <message> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="208"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="212"/> + <source>Could not create folder %1: %2.</source> + <translation>Nie można utworzyć katalogu %1: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="222"/> + <source>Failed to overwrite %1: %2</source> + <translation>Nie można nadpisać %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="230"/> + <source>Could not create link %1: %2</source> + <translation>Nie można utworzyć dowiÄ…zania %1: %2</translation> + </message> +</context> +<context> + <name>QInstaller::DownloadArchivesJob</name> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="110"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="156"/> + <source>Canceled</source> + <translation>Anulowano</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="146"/> + <source>Downloading hash signature failed.</source> + <translation>Nie można pobrać sygnatury hash.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="219"/> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="254"/> + <source>Download Error</source> + <translation>BÅ‚Ä…d pobierania</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="219"/> + <source>Hash verification while downloading failed. This is a temporary error, please retry.</source> + <translation>Weryfikacja hasha podczas pobierania nie powiodÅ‚a siÄ™. Jest to tymczasowy bÅ‚Ä…d, spróbuj ponownie.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="224"/> + <source>Could not verify Hash</source> + <translation>Nie można zweryfikować hasha</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="254"/> + <source>Could not download archive: %1 : %2</source> + <translation>Nie można pobrać archiwum %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="266"/> + <source>Could not fetch archives: %1 +Error while loading %2</source> + <translation>Nie można pobrać archiwów: %1 +BÅ‚Ä…d podczas Å‚adowania %2</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="305"/> + <source>Downloading archive '%1' for component: %2</source> + <translation>Pobieranie archiwum "%1" dla komponentu %2</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="308"/> + <source>Scheme not supported: %1 (%2)</source> + <translation>NieobsÅ‚ugiwany schemat %1 (%2)</translation> + </message> + <message> + <location filename="../../libs/installer/downloadarchivesjob.cpp" line="311"/> + <source>Could not find component for: %1.</source> + <translation>Brak komponentu dla %1.</translation> + </message> +</context> +<context> + <name>QInstaller::Downloader</name> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="126"/> + <source>Target '%1' not open for write. Error: %2.</source> + <extracomment>%2 is a sentence describing the error.</extracomment> + <translation>Nie można otworzyć pliku docelowego "%1" do odczytu. BÅ‚Ä…d: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="145"/> + <source>Writing to target '%1' failed. Error: %2.</source> + <extracomment>%2 is a sentence describing the error.</extracomment> + <translation>BÅ‚Ä…d zapisu pliku docelowego "%1": %2.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="194"/> + <source>Redirect loop detected '%1'.</source> + <translation>Wykryto zapÄ™tlenie "%1".</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="211"/> + <source>Checksum mismatch detected '%1'.</source> + <translation>Wykryto niezgodność sumy kontrolnej "%1".</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="245"/> + <source>Network error while downloading '%1': %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>BÅ‚Ä…d sieci podczas pobierania "%1": %2.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="250"/> + <source>Unknown network error while downloading: %1.</source> + <extracomment>%1 is a sentence describing the error</extracomment> + <translation>Nieznany bÅ‚Ä…d sieci podczas pobierania: %1.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="315"/> + <source>Pause and resume not supported by network transfers.</source> + <translation>Wstrzymanie i wznowienie nie sÄ… obsÅ‚ugiwane przez transfery sieciowe.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="325"/> + <source>Invalid source '%1'. Error: %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>Niepoprawne źródÅ‚o "%1". BÅ‚Ä…d: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="342"/> + <source>Target file '%1' already exists but is not a file.</source> + <translation>Åšcieżka docelowa "%1" już istnieje, lecz nie jest ona plikiem.</translation> + </message> + <message> + <location filename="../../libs/installer/downloadfiletask.cpp" line="350"/> + <source>Could not open target '%1' for write. Error: %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>Nie można otworzyć pliku docelowego "%1" do zapisu. BÅ‚Ä…d: %2.</translation> + </message> +</context> +<context> + <name>QInstaller::ElevatedExecuteOperation</name> + <message> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="85"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="86"/> + <source>at least 1</source> + <translation>przynajmniej 1</translation> + </message> + <message> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="148"/> + <source>Execution failed: Could not start detached: "%1"</source> + <translation>BÅ‚Ä…d wykonywania. Nie można odrÄ™bnie uruchomić "%1"</translation> + </message> + <message> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="200"/> + <source>Execution failed: Could not start: "%1"(%2)</source> + <translation>BÅ‚Ä…d wykonywania. Nie można uruchomić "%1": %2</translation> + </message> + <message> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="216"/> + <source>Execution failed(Crash): "%1"</source> + <translation>BÅ‚Ä…d wykonywania "%1"</translation> + </message> + <message> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="223"/> + <source>Execution failed(Unexpected exit code: %1): "%2"</source> + <translation>BÅ‚Ä…d wykonywania "%2" (nieoczekiwany kod wyjÅ›ciowy: %1)</translation> + </message> +</context> +<context> + <name>QInstaller::EnvironmentVariableOperation</name> + <message> + <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="127"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="128"/> + <source>2 to 4</source> + <translation>od 2 do 4</translation> + </message> +</context> +<context> + <name>QInstaller::ExtractArchiveOperation</name> + <message> + <location filename="../../libs/installer/extractarchiveoperation.cpp" line="60"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/extractarchiveoperation.cpp" line="61"/> + <source>exactly 2</source> + <translation>dokÅ‚adnie 2</translation> + </message> +</context> +<context> + <name>QInstaller::ExtractArchiveOperation::Runnable</name> + <message> + <location filename="../../libs/installer/extractarchiveoperation_p.h" line="187"/> + <source>Could not open %1 for reading: %2.</source> + <translation>Nie można otworzyć pliku %1 do odczytu: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/extractarchiveoperation_p.h" line="195"/> + <source>Error while extracting '%1': %2</source> + <translation>BÅ‚Ä…d rozpakowywania "%1": %2</translation> + </message> + <message> + <location filename="../../libs/installer/extractarchiveoperation_p.h" line="197"/> + <source>Unknown exception caught while extracting %1.</source> + <translation>ZÅ‚apano nieznany wyjÄ…tek podczas rozpakowywania %1.</translation> + </message> +</context> +<context> + <name>QInstaller::FakeStopProcessForUpdateOperation</name> + <message> + <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="61"/> + <source>Number of arguments does not match: one is required</source> + <translation>Nieoczekiwana liczba argumentów, wymagany jest tylko jeden</translation> + </message> + <message> + <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="68"/> + <source>Could not get package manager core.</source> + <translation>Brak dostÄ™pu do "package manager core".</translation> + </message> + <message> + <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="83"/> + <source>This process should be stopped before continuing: %1</source> + <translation>Proces "%1" powinien zostać zatrzymany przed kontynuowaniem</translation> + </message> + <message> + <location filename="../../libs/installer/fakestopprocessforupdateoperation.cpp" line="87"/> + <source>These processes should be stopped before continuing: %1</source> + <translation>Procesy "%1" powinny zostać zatrzymane przed kontynuowaniem</translation> + </message> +</context> +<context> + <name>QInstaller::FileTaskObserver</name> + <message> + <location filename="../../libs/installer/observer.cpp" line="71"/> + <source>%1 of %2</source> + <translation>%1 z %2</translation> + </message> + <message> + <location filename="../../libs/installer/observer.cpp" line="74"/> + <source>%1 received.</source> + <translation>Otrzymano %1.</translation> + </message> + <message> + <location filename="../../libs/installer/observer.cpp" line="79"/> + <source>(%1/sec)</source> + <translation>(%1/sek.)</translation> + </message> + <message numerus="yes"> + <location filename="../../libs/installer/observer.cpp" line="90"/> + <source>%n day(s), </source> + <translation> + <numerusform>%n dzieÅ„, </numerusform> + <numerusform>%n dni, </numerusform> + <numerusform>%n dni, </numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../../libs/installer/observer.cpp" line="94"/> + <source>%n hour(s), </source> + <translation> + <numerusform>%n godzina, </numerusform> + <numerusform>%n godziny, </numerusform> + <numerusform>%n godzin, </numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../../libs/installer/observer.cpp" line="98"/> + <source>%n minute(s)</source> + <translation> + <numerusform>%n minuta</numerusform> + <numerusform>%n minuty</numerusform> + <numerusform>%n minut</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../../libs/installer/observer.cpp" line="103"/> + <source>%n second(s)</source> + <translation> + <numerusform>%n sekunda</numerusform> + <numerusform>%n sekundy</numerusform> + <numerusform>%n sekund</numerusform> + </translation> + </message> + <message> + <location filename="../../libs/installer/observer.cpp" line="105"/> + <source> - %1%2%3%4 remaining.</source> + <translation> - pozostaÅ‚o %1%2%3%4.</translation> + </message> + <message> + <location filename="../../libs/installer/observer.cpp" line="107"/> + <source> - unknown time remaining.</source> + <translation> - nieznany czas trwania.</translation> + </message> +</context> +<context> + <name>QInstaller::FinishedPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2336"/> + <source>Completing the %1 Wizard</source> + <translation>ZakoÅ„czenie kreatora %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2343"/> + <source>Click Done to exit the %1 Wizard.</source> + <translation>NaciÅ›nij "Zrobione" aby opuÅ›cić kreatora %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2345"/> + <source>Click Finish to exit the %1 Wizard.</source> + <translation>NaciÅ›nij "ZakoÅ„cz" aby opuÅ›cić kreatora %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2384"/> + <source>Restart</source> + <translation>Zrestartuj</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2414"/> + <source>Run %1 now.</source> + <translation>Uruchom %1 teraz.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2419"/> + <source>The %1 Wizard failed.</source> + <translation>BÅ‚Ä…d kreatora %1.</translation> + </message> +</context> +<context> + <name>QInstaller::GlobalSettingsOperation</name> + <message> + <location filename="../../libs/installer/globalsettingsoperation.cpp" line="58"/> + <source>Settings are not writable</source> + <translation>Nie można zapisać ustawieÅ„</translation> + </message> + <message> + <location filename="../../libs/installer/globalsettingsoperation.cpp" line="68"/> + <source>Failed to write settings</source> + <translation>BÅ‚Ä…d zapisu ustawieÅ„</translation> + </message> + <message> + <location filename="../../libs/installer/globalsettingsoperation.cpp" line="110"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/globalsettingsoperation.cpp" line="111"/> + <source>3, 4 or 5</source> + <translation>3, 4 lub 5</translation> + </message> +</context> +<context> + <name>QInstaller::InstallIconsOperation</name> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="115"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="116"/> + <source>1 or 2</source> + <translation>1 lub 2</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="116"/> + <source> (Sourcepath, [Vendorprefix])</source> + <translation> (Sourcepath, [Vendorprefix])</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="125"/> + <source>Invalid Argument: source folder must not be empty.</source> + <translation>Niepoprawny argument: nazwa katalogu źródÅ‚owego nie może być pusta.</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="174"/> + <source>Could not backup file %1: %2</source> + <translation>Nie można utworzyć kopii zapasowej pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="187"/> + <source>Failed to overwrite %1: %2</source> + <translation>Nie można nadpisać %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="198"/> + <source>Failed to copy file %1: %2</source> + <translation>Nie można nadpisać %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/installiconsoperation.cpp" line="208"/> + <source>Could not create folder at %1: %2</source> + <translation>Nie można utworzyć katalogu %1: %2</translation> + </message> +</context> +<context> + <name>QInstaller::IntroductionPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="884"/> + <source>Setup - %1</source> + <translation>Ustawienia - %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="892"/> + <source>Welcome to the %1 Setup Wizard.</source> + <translation>Kreator ustawieÅ„ %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="897"/> + <source>Add or remove components</source> + <translation>Dodaj lub usuÅ„ komponenty</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="903"/> + <source>Update components</source> + <translation>Uaktualnij komponenty</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="909"/> + <source>Remove all components</source> + <translation>UsuÅ„ wszystkie komponenty</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="921"/> + <source>Retrieving information from remote installation sources...</source> + <translation>Otrzymywanie informacji ze zdalnych źródeÅ‚ instalacji...</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="973"/> + <source>At least one valid and enabled repository required for this action to succeed.</source> + <translation>Wymagane jest przynajmniej jedno poprawne i dostÄ™pne repozytorium.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1008"/> + <source>No updates available.</source> + <translation>Brak dostÄ™pnych uaktualnieÅ„.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1027"/> + <source> Only local package management available.</source> + <translation>Możliwe jest tylko lokalne zarzÄ…dzanie pakietami.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1178"/> + <source>Quit</source> + <translation>ZakoÅ„cz</translation> + </message> +</context> +<context> + <name>QInstaller::LicenseAgreementPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1245"/> + <source>License Agreement</source> + <translation>Umowa licencyjna</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1269"/> + <source>Alt+A</source> + <comment>agree license</comment> + <translation>Alt+A</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1282"/> + <source>Alt+D</source> + <comment>do not agree license</comment> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1354"/> + <source>Please read the following license agreement. You must accept the terms contained in this agreement before continuing with the installation.</source> + <translation>ProszÄ™ dokÅ‚adnie przeczytać poniższe warunki licencji. Instalacja, bez akceptacji licencji, nie jest możliwa.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1356"/> + <source>I accept the license.</source> + <translation>AkceptujÄ™ licencjÄ™.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1357"/> + <source>I do not accept the license.</source> + <translation>Nie akceptujÄ™ licencji.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1359"/> + <source>Please read the following license agreements. You must accept the terms contained in these agreements before continuing with the installation.</source> + <translation>ProszÄ™ dokÅ‚adnie przeczytać poniższe warunki licencji. Instalacja, bez akceptacji licencji, nie jest możliwa.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1361"/> + <source>I accept the licenses.</source> + <translation>AkceptujÄ™ licencje.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1362"/> + <source>I do not accept the licenses.</source> + <translation>Nie akceptujÄ™ licencji.</translation> + </message> +</context> +<context> + <name>QInstaller::LicenseOperation</name> + <message> + <location filename="../../libs/installer/licenseoperation.cpp" line="60"/> + <source>No license files found to copy.</source> + <translation>Brak plików z licencjÄ… do skopiowania.</translation> + </message> + <message> + <location filename="../../libs/installer/licenseoperation.cpp" line="67"/> + <source>Needed installer object in %1 operation is empty.</source> + <translation>Wymagany obiekt instalacji %1 jest pusty.</translation> + </message> + <message> + <location filename="../../libs/installer/licenseoperation.cpp" line="82"/> + <source>Can not write license file: %1.</source> + <translation>Nie można zapisać pliku z licencjÄ… %1.</translation> + </message> + <message> + <location filename="../../libs/installer/licenseoperation.cpp" line="99"/> + <source>No license files found to delete.</source> + <translation>Brak plików z licencjÄ… do usuniÄ™cia.</translation> + </message> +</context> +<context> + <name>QInstaller::LineReplaceOperation</name> + <message> + <location filename="../../libs/installer/linereplaceoperation.cpp" line="62"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/linereplaceoperation.cpp" line="63"/> + <source>exactly 3</source> + <translation>dokÅ‚adnie 3</translation> + </message> + <message> + <location filename="../../libs/installer/linereplaceoperation.cpp" line="73"/> + <source>Failed to open '%1' for reading.</source> + <translation>Nie można otworzyć %1 do odczytu.</translation> + </message> + <message> + <location filename="../../libs/installer/linereplaceoperation.cpp" line="90"/> + <source>Failed to open '%1' for writing.</source> + <translation>Nie można otworzyć %1 do zapisu.</translation> + </message> +</context> +<context> + <name>QInstaller::MetadataJob</name> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="75"/> + <source>Missing package manager core engine.</source> + <translation>Brak silnika "package manager core".</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="79"/> + <source>Preparing meta information download...</source> + <translation>Przygotowywanie pobrania metainformacji...</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="112"/> + <source>Meta data download canceled.</source> + <translation>Anulowano pobieranie metadanych.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="137"/> + <source>Missing proxy credentials.</source> + <translation>Brak list uwierzytelniajÄ…cych dla proxy.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="168"/> + <source>Authentication failed.</source> + <translation>BÅ‚Ä…d autoryzacji.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="179"/> + <location filename="../../libs/installer/metadatajob.cpp" line="261"/> + <source>Unknown exception during download.</source> + <translation>Nieznany bÅ‚Ä…d pobierania.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="190"/> + <source>Retrieving meta information from remote repository...</source> + <translation>Pobieranie metainformacji ze zdalnego repozytorium...</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="195"/> + <source>Failure to fetch repositories.</source> + <translation>BÅ‚Ä…d pobierania repozytoriów.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="212"/> + <source>Unknown exception during extracting.</source> + <translation>Nieznany wyjÄ…tek podczas rozpakowywania.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob.cpp" line="239"/> + <source>Extracting meta information...</source> + <translation>Rozpakowywanie metainformacji...</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob_p.h" line="85"/> + <source>Error while extracting '%1': %2</source> + <translation>BÅ‚Ä…d rozpakowywania "%1": %2</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob_p.h" line="88"/> + <source>Unknown exception caught while extracting %1.</source> + <translation>ZÅ‚apano nieznany wyjÄ…tek podczas rozpakowywania %1.</translation> + </message> + <message> + <location filename="../../libs/installer/metadatajob_p.h" line="92"/> + <source>Could not open %1 for reading. Error: %2</source> + <translation>Nie można otworzyć pliku %1 do odczytu: %2</translation> + </message> +</context> +<context> + <name>QInstaller::PackageManagerCore</name> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="365"/> + <source>Error writing Maintenance Tool</source> + <translation>BÅ‚Ä…d przy zapisie narzÄ™dzia konserwacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="563"/> + <source> +Downloading packages...</source> + <translation> +Pobieranie pakietów...</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="586"/> + <source>Installation canceled by user</source> + <translation>Instalacja anulowana przez użytkownika</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="588"/> + <source>All downloads finished.</source> + <translation>ZakoÅ„czono pobieranie.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="610"/> + <source>Cancelling the Installer</source> + <translation>Anulowanie instalacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="672"/> + <source>Authentication Error</source> + <translation>BÅ‚Ä…d autoryzacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="672"/> + <source>Some components could not be removed completely because admin rights could not be acquired: %1.</source> + <translation>Niektóre komponenty nie zostaÅ‚y caÅ‚kowicie usuniÄ™te z powodu braku wymaganych uprawnieÅ„ administratora: %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="677"/> + <source>Unknown error.</source> + <translation>Nieznany bÅ‚Ä…d.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="677"/> + <source>Some components could not be removed completely because an unknown error happened.</source> + <translation>Niektóre komponenty nie zostaÅ‚y caÅ‚kowicie usuniÄ™te, ponieważ wystÄ…piÅ‚ nieznany bÅ‚Ä…d.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="842"/> + <source>Application not running in Package Manager mode!</source> + <translation>Aplikacja nie jest uruchomiona w trybie "Package Manager".</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="849"/> + <source>No installed packages found.</source> + <translation>Brak zainstalowanych pakietów.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="926"/> + <source>Application running in Uninstaller mode!</source> + <translation>Aplikacja uruchomiona w trybie "Uninstaller".</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="977"/> + <source>There is an important update available, please run the updater first.</source> + <translation>DostÄ™pne jest ważne uaktualnienie, które należy zainstalować w pierwszej kolejnoÅ›ci.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="1456"/> + <source>Error while elevating access rights.</source> + <translation>BÅ‚Ä…d ustalania praw dostÄ™pu.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2438"/> + <source>Error</source> + <translation>BÅ‚Ä…d</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2469"/> + <source>invalid</source> + <translation>Niepoprawny</translation> + </message> +</context> +<context> + <name>QInstaller::PackageManagerCorePrivate</name> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="393"/> + <source>Unresolved dependencies</source> + <translation>NierozwiÄ…zane zależnoÅ›ci</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="406"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1543"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1568"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1743"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1812"/> + <source>Error</source> + <translation>BÅ‚Ä…d</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="754"/> + <source>Access error</source> + <translation>BÅ‚Ä…d dostÄ™pu</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="755"/> + <source>Format error</source> + <translation>BÅ‚Ä™dny format</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="756"/> + <source>Could not write installer configuration to %1: %2</source> + <translation>Nie można zapisać konfiguracji instalatora do %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="872"/> + <source>Stop Processes</source> + <translation>Zatrzymaj przetwarzanie</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="872"/> + <source>These processes should be stopped to continue: + +%1</source> + <translation>Aby kontynuować, nastÄ™pujÄ…ce procesy powinny zostać zatrzymane: + +%1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="880"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1843"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2037"/> + <source>Installation canceled by user</source> + <translation>Instalacja anulowana przez użytkownika</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="980"/> + <source>Writing maintenance tool.</source> + <translation>Zapisywanie narzÄ™dzia konserwacji.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="986"/> + <source>Failed to seek in file %1: %2</source> + <translation>Nie można przesunąć wskaźnika pozycji pliku %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="993"/> + <source>Maintenance tool is not a bundle</source> + <translation>NarzÄ™dzie konserwacji nie jest pakietem</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1007"/> + <source>Could not write maintenance tool data to %1: %2</source> + <translation>Nie można zapisać danych narzÄ™dzia konserwacji do %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1026"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1327"/> + <source>Could not remove data file '%1': %2</source> + <translation>Nie można usunąć pliku z danymi "%1": %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1032"/> + <source>Could not write maintenance tool to %1: %2</source> + <translation>Nie można zapisać narzÄ™dzia konserwacji do %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1332"/> + <source>Could not write maintenance tool binary data to %1: %2</source> + <translation>Nie można zapisać binarnych danych narzÄ™dzia konserwacji do %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1413"/> + <source>Variable 'TargetDir' not set.</source> + <translation>Zmienna "TargetDir" nie zostaÅ‚a ustawiona.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1451"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1706"/> + <source>Preparing the installation...</source> + <translation>Przygotowywanie instalacji...</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1461"/> + <source>It is not possible to install from network location</source> + <translation>Instalacja z sieci nie jest możliwa</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1502"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1504"/> + <source>Creating local repository</source> + <translation>Tworzenie lokalnego repozytorium</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1549"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1723"/> + <source>Creating Maintenance Tool</source> + <translation>Tworzenie narzÄ™dzia konserwacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1558"/> + <source> +Installation finished!</source> + <translation> +Instalacja zakoÅ„czona.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1574"/> + <source> +Installation aborted!</source> + <translation> +Instalacja przerwana.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1608"/> + <source>It is not possible to run that operation from a network location</source> + <translation>Uruchomienie tej operacji z sieci nie jest możliwe</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1712"/> + <source>Removing deselected components...</source> + <translation>Usuwanie odznaczonych komponentów...</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1733"/> + <source> +Update finished!</source> + <translation> +ZakoÅ„czono uaktualnianie.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1749"/> + <source> +Update aborted!</source> + <translation> +Przerwano uaktualnianie.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1821"/> + <source>Uninstallation completed successfully.</source> + <translation>Dezinstalacja pomyÅ›lnie zakoÅ„czona.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1821"/> + <source>Uninstallation aborted.</source> + <translation>Dezinstalacja przerwana.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1837"/> + <source> +Installing component %1</source> + <translation> +Instalacja komponentu %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1866"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2055"/> + <source>Installer Error</source> + <translation>BÅ‚Ä…d instalacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1867"/> + <source>Error during installation process (%1): +%2</source> + <translation>BÅ‚Ä…d podczas instalacji (%1): +%2</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1932"/> + <source>Cannot prepare uninstall</source> + <translation>Nie można przygotować dezinstalacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1963"/> + <source>Cannot start uninstall</source> + <translation>Nie można uruchomić dezinstalacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2056"/> + <source>Error during uninstallation process: +%1</source> + <translation>BÅ‚Ä…d podczas dezinstalacji: +%1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2084"/> + <source>Unknown error</source> + <translation>Nieznany bÅ‚Ä…d</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2102"/> + <source>Could not retrieve remote tree: %1.</source> + <translation>Nie można odczytać zdalnego drzewa: %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2131"/> + <source>Failure to read packages from: %1.</source> + <translation>Nie można odczytać pakietów z: %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2156"/> + <source>Could not retrieve meta information: %1</source> + <translation>Nie można odczytać metainformacji: %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2213"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2224"/> + <source>Could not add temporary update source information.</source> + <translation>Nie można dodać tymczasowej informacji o źródÅ‚ach aktualizacji.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2239"/> + <source>Could not find any update source information.</source> + <translation>Brak informacji o źródÅ‚ach aktualizacji.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2309"/> + <source>Dependency cycle between components detected: '%1' and '%2'.</source> + <translation>Wykryto cyklicznÄ… zależność pomiÄ™dzy komponentami "%1" i "%2".</translation> + </message> +</context> +<context> + <name>QInstaller::PackageManagerGui</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="256"/> + <source>%1 Setup</source> + <translation>Ustawienia %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="258"/> + <source>Maintain %1</source> + <translation>Konserwacja %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="603"/> + <source>Do you want to cancel the installation process?</source> + <translation>Czy anulować instalacjÄ™?</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="605"/> + <source>Do you want to cancel the uninstallation process?</source> + <translation>Czy anulować dezinstalacjÄ™?</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="607"/> + <source>Do you want to quit the installer application?</source> + <translation>Czy zakoÅ„czyć instalacjÄ™?</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="609"/> + <source>Do you want to quit the uninstaller application?</source> + <translation>Czy zakoÅ„czyć dezinstalacjÄ™?</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="611"/> + <source>Do you want to quit the maintenance application?</source> + <translation>Czy zakoÅ„czyć konserwacjÄ™?</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="616"/> + <source>Question</source> + <translation>Pytanie</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="658"/> + <source>Settings</source> + <translation>Ustawienia</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="715"/> + <source>Error</source> + <translation>BÅ‚Ä…d</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="716"/> + <source>It is not possible to install from network location. +Please copy the installer to a local drive</source> + <translation>Instalacja z sieci nie jest możliwa. +Skopiuj instalator na lokalny dysk.</translation> + </message> +</context> +<context> + <name>QInstaller::PerformInstallationForm</name> + <message> + <location filename="../../libs/installer/performinstallationform.cpp" line="97"/> + <location filename="../../libs/installer/performinstallationform.cpp" line="158"/> + <location filename="../../libs/installer/performinstallationform.cpp" line="171"/> + <source>&Show Details</source> + <translation>&Pokaż szczegóły</translation> + </message> + <message> + <location filename="../../libs/installer/performinstallationform.cpp" line="158"/> + <source>&Hide Details</source> + <translation>&Ukryj szczegóły</translation> + </message> +</context> +<context> + <name>QInstaller::PerformInstallationPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2255"/> + <source>U&ninstall</source> + <translation>Zdezi&nstaluj</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2256"/> + <source>Uninstalling %1</source> + <translation>Dezinstalowanie %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2260"/> + <source>&Update</source> + <translation>&Uaktualnij</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2261"/> + <source>Updating components of %1</source> + <translation>Uaktualnianie komponentów %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2265"/> + <source>&Install</source> + <translation>Za&instaluj</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2266"/> + <source>Installing %1</source> + <translation>Instalowanie %1</translation> + </message> +</context> +<context> + <name>QInstaller::ProxyCredentialsDialog</name> + <message> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="14"/> + <source>Dialog</source> + <translation>Dialog</translation> + </message> + <message> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="20"/> + <source>The proxy %1 requires a username and password.</source> + <translation>Proxy %1 wymaga nazwy użytkownika i hasÅ‚a.</translation> + </message> + <message> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="29"/> + <source>Username:</source> + <translation>Nazwa użytkownika:</translation> + </message> + <message> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="36"/> + <source>Username</source> + <translation>Nazwa użytkownika</translation> + </message> + <message> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="43"/> + <source>Password:</source> + <translation>HasÅ‚o:</translation> + </message> + <message> + <location filename="../../libs/installer/proxycredentialsdialog.ui" line="53"/> + <source>Password</source> + <translation>HasÅ‚o</translation> + </message> +</context> +<context> + <name>QInstaller::ReadyForInstallationPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2030"/> + <source>U&ninstall</source> + <translation>Zdezi&nstaluj</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2031"/> + <source>Ready to Uninstall</source> + <translation>Gotowy do dezinstalacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2032"/> + <source>Setup is now ready to begin removing %1 from your computer.<br><font color="red">The program directory %2 will be deleted completely</font>, including all content in that directory!</source> + <translation>Konfiguracja gotowa do dezinstalacji %1.<br><font color="red">Katalog programu %2 zostanie caÅ‚kowicie usuniÄ™ty.</font>, wÅ‚Ä…czajÄ…c caÅ‚Ä… jego zawartość.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2041"/> + <source>U&pdate</source> + <translation>&Uaktualnij</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2042"/> + <source>Ready to Update Packages</source> + <translation>Gotowy do uaktualnienia pakietów</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2043"/> + <source>Setup is now ready to begin updating your installation.</source> + <translation>Konfiguracja gotowa do rozpoczÄ™cia aktualizacji.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2046"/> + <source>&Install</source> + <translation>Za&instaluj</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2047"/> + <source>Ready to Install</source> + <translation>Gotowy do instalacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2048"/> + <source>Setup is now ready to begin installing %1 on your computer.</source> + <translation>Konfiguracja gotowa do rozpoczÄ™cia instalacji %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2109"/> + <source>Not enough disk space to store temporary files and the installation! Available space: %1, at least required %2.</source> + <translation>NiewystarczajÄ…ca ilość wolnego miejsca do przechowania plików tymczasowych i instalacji. DostÄ™pna ilość wolnego miejsca: %1, wymagana ilość miejsca: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2118"/> + <source>Not enough disk space to store all selected components! Available space: %1, at least required: %2.</source> + <translation>NiewystarczajÄ…ca ilość wolnego miejsca do przechowania wszystkich wybranych komponentów. DostÄ™pna ilość wolnego miejsca: %1, wymagana ilość miejsca: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2126"/> + <source>Not enough disk space to store temporary files! Available space: %1, at least required: %2.</source> + <translation>NiewystarczajÄ…ca ilość wolnego miejsca do przechowania plików tymczasowych. DostÄ™pna ilość wolnego miejsca: %1, wymagana ilość miejsca: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2135"/> + <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 1% of the volume's space available afterwards. %1</source> + <translation>Wybrany dysk posiada wystarczajÄ…ca ilość miejsca na instalacjÄ™, lecz po instalacji pozostanie na nim mniej niż 1% wolnego miejsca. %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2140"/> + <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 100 MB available afterwards. %1</source> + <translation>Wybrany dysk posiada wystarczajÄ…ca ilość miejsca na instalacjÄ™, lecz po instalacji pozostanie na nim mniej niż 100MB wolnego miejsca. %1</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2146"/> + <source>Installation will use %1 of disk space.</source> + <translation>Instalacja zajmie %1 wolnego miejsca na dysku.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2156"/> + <source>Cannot resolve all dependencies.</source> + <translation>Nie można rozwiÄ…zać wszystkich zależnoÅ›ci.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2172"/> + <source>Components about to be removed.</source> + <translation>Komponenty do usuniÄ™cia.</translation> + </message> +</context> +<context> + <name>QInstaller::RegisterFileTypeOperation</name> + <message> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="99"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="100"/> + <source>2 to 5</source> + <translation>od 2 do 5</translation> + </message> + <message> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="152"/> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="215"/> + <source>Registering file types is only supported on Windows.</source> + <translation>Rejestrowanie typów plików możliwe jest jedynie na Windows.</translation> + </message> + <message> + <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="164"/> + <source>Register File Type: Invalid arguments</source> + <translation>Rejestracja typów plików: niepoprawne argumenty</translation> + </message> +</context> +<context> + <name>QInstaller::RemoteObject</name> + <message> + <location filename="../../libs/installer/remoteobject.h" line="99"/> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>Nie można odczytać wszystkich danych po wysÅ‚aniu komendy: %1. Oczekiwano %2 bajtów, otrzymano %3 bajtów. BÅ‚Ä…d: %4</translation> + </message> +</context> +<context> + <name>QInstaller::RemoteServerConnection</name> + <message> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="191"/> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="305"/> + <location filename="../../libs/installer/remoteserverconnection.cpp" line="396"/> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>Nie można odczytać wszystkich danych po wysÅ‚aniu komendy: %1. Oczekiwano %2 bajtów, otrzymano %3 bajtów. BÅ‚Ä…d: %4</translation> + </message> +</context> +<context> + <name>QInstaller::ReplaceOperation</name> + <message> + <location filename="../../libs/installer/replaceoperation.cpp" line="62"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/replaceoperation.cpp" line="63"/> + <source>exactly 3</source> + <translation>dokÅ‚adnie 3</translation> + </message> + <message> + <location filename="../../libs/installer/replaceoperation.cpp" line="73"/> + <source>Failed to open %1 for reading</source> + <translation>Nie można otworzyć %1 do odczytu</translation> + </message> + <message> + <location filename="../../libs/installer/replaceoperation.cpp" line="83"/> + <source>Failed to open %1 for writing</source> + <translation>Nie można otworzyć %1 do zapisu</translation> + </message> +</context> +<context> + <name>QInstaller::Resource</name> + <message> + <location filename="../../libs/installer/binaryformat.cpp" line="173"/> + <source>Could not open Resource '%1' read-only.</source> + <translation>Nie można otworzyć zasobu "%1" do odczytu.</translation> + </message> + <message> + <location filename="../../libs/installer/binaryformat.cpp" line="242"/> + <source>Read failed after %1 bytes: %2</source> + <translation>BÅ‚Ä…d odczytu po %1 bajtach: %2</translation> + </message> + <message> + <location filename="../../libs/installer/binaryformat.cpp" line="247"/> + <source>Write failed after %1 bytes: %2</source> + <translation>BÅ‚Ä…d zapisu po %1 bajtach: %2</translation> + </message> +</context> +<context> + <name>QInstaller::RestartPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="2473"/> + <source>Completing the %1 Setup Wizard</source> + <translation>ZakoÅ„czenie kreatora ustawieÅ„ %1</translation> + </message> +</context> +<context> + <name>QInstaller::ScriptEngine</name> + <message> + <location filename="../../libs/installer/scriptengine.cpp" line="659"/> + <source>Could not open the requested script file at %1: %2.</source> + <translation>Nie można otworzyć wymaganego pliku ze skryptem "%1": %2.</translation> + </message> + <message> + <location filename="../../libs/installer/scriptengine.cpp" line="677"/> + <source>Exception while loading the component script '%1'. (%2)</source> + <translation>WyjÄ…tek podczas Å‚adowania skryptu komponentu "%1". (%2)</translation> + </message> +</context> +<context> + <name>QInstaller::SelfRestartOperation</name> + <message> + <location filename="../../libs/installer/selfrestartoperation.cpp" line="57"/> + <source>Installer object needed in '%1' operation is empty.</source> + <translation>Wymagany obiekt installer w operacji %1 jest pusty.</translation> + </message> + <message> + <location filename="../../libs/installer/selfrestartoperation.cpp" line="63"/> + <source>Self Restart: Only valid within updater or packagemanager mode.</source> + <translation>Ponownie uruchomienie: Możliwe tylko w trybie akutalizacji albo w trybie menadżera pakietów.</translation> + </message> + <message> + <location filename="../../libs/installer/selfrestartoperation.cpp" line="69"/> + <source>Self Restart: Invalid arguments</source> + <translation>Ponownie uruchomienie: NiewÅ‚aÅ›ciwe argumenty</translation> + </message> +</context> +<context> + <name>QInstaller::ServerAuthenticationDialog</name> + <message> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="14"/> + <source>Server Requires Authentication</source> + <translation>Serwer wymaga autoryzacji</translation> + </message> + <message> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="20"/> + <source>You need to supply a username and password to access this site.</source> + <translation>Należy podać nazwÄ™ użytkownia i hasÅ‚o aby uzystać dostÄ™p do tej strony.</translation> + </message> + <message> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="30"/> + <source>Username:</source> + <translation>Nazwa użytkownika:</translation> + </message> + <message> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="40"/> + <source>Password:</source> + <translation>HasÅ‚o:</translation> + </message> + <message> + <location filename="../../libs/installer/serverauthenticationdialog.ui" line="77"/> + <source>%1 at %2</source> + <translation>%1 w %2</translation> + </message> +</context> +<context> + <name>QInstaller::SettingsOperation</name> + <message> + <location filename="../../libs/installer/settingsoperation.cpp" line="72"/> + <source>Missing argument(s) '%1' calling '%2' with arguments '%3'.</source> + <translatorcomment>What is %3? Looks like broken.</translatorcomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../libs/installer/settingsoperation.cpp" line="82"/> + <source>Current method argument calling '%1' with arguments '%2' is not supported. Please use set, remove, add_array_value or remove_array_value.</source> + <translation>WywoÅ‚anie metody "%1" z argumentami "%2" nie jest obsÅ‚ugiwane. Należy użyć "add", "remove", "add_array_value" lub "remove_array_value".</translation> + </message> +</context> +<context> + <name>QInstaller::SimpleMoveFileOperation</name> + <message> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="55"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>NiewÅ‚aÅ›ciwe argumenty w %0: ilość przekazanych argumentów %1, oczekiwano %2, %3.</translation> + </message> + <message> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="56"/> + <source>exactly 2</source> + <translation>dokÅ‚adnie 2</translation> + </message> + <message> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="65"/> + <source>None of the arguments can be empty: source '%1', target '%2'.</source> + <translation>Å»aden z argumentów nie może być pusty: plik źródÅ‚owy "%1", plik docelowy "%2".</translation> + </message> + <message> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="76"/> + <source>Cannot move source '%1' to target '%2', because target exists and is not removable.</source> + <translation>Nie można przenieść pliku źródÅ‚owego "%1" do miejsca docelowego "%2", ponieważ dolecowy plik już istnieje i nie można go usunąć.</translation> + </message> + <message> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="85"/> + <source>Cannot move source '%1' to target '%2': %3</source> + <translation>Nie można przenieść pliku źródÅ‚owego "%1" do miejsca docelowego "%2": %3</translation> + </message> + <message> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="90"/> + <location filename="../../libs/installer/simplemovefileoperation.cpp" line="100"/> + <source>Move '%1' to '%2'.</source> + <translation>Przenoszenie "%1" do "%2".</translation> + </message> +</context> +<context> + <name>QInstaller::StartMenuDirectoryPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1929"/> + <source>Start Menu shortcuts</source> + <translation>Skrót menu startowego</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1930"/> + <source>Select the Start Menu in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.</source> + <translation>Wybierz menu startowe, w którym utworzyć skrót do programu. Możesz również podać nazwÄ™ nowego katalogu.</translation> + </message> +</context> +<context> + <name>QInstaller::TargetDirectoryPage</name> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1683"/> + <source>Installation Folder</source> + <translation>Katalog instalacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1690"/> + <source>Please specify the folder where %1 will be installed.</source> + <translation>Podaj katalog w którym zostanie zainstalowany %1.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1703"/> + <source>Alt+R</source> + <comment>browse file system to choose a file</comment> + <translation>Alt+R</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1704"/> + <source>B&rowse...</source> + <translation>&PrzeglÄ…daj...</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1777"/> + <source>The folder you selected already exists and contains an installation. Choose a different target for installation.</source> + <translation>Wybrany katalog istnieje i zawiera instalacjÄ™. Wybierz inny katalog docelowy.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1782"/> + <source>You have selected an existing, non-empty folder for installation. +Note that it will be completely wiped on uninstallation of this application. +It is not advisable to install into this folder as installation might fail. +Do you want to continue?</source> + <translation>Wybrano istniejÄ…cy, niepusty katalog do instalacji. +Zwróć uwagÄ™, że zostanie on caÅ‚kowicie skasowany w trakcie dezinstalacji aplikacji. +Nie zaleca siÄ™ instalacji do tego katalogu, gdyż instalacja może siÄ™ nie powieść. +Czy kontynuować?</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1786"/> + <source>You have selected an existing file or symlink, please choose a different target for installation.</source> + <translation>Wybrano istniejÄ…cy plik lub dowiÄ…zanie symboliczne. Wybierz inne miejsce docelowe instalacji.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1806"/> + <source>Select Installation Folder</source> + <translation>Wybierz katalog instalacji</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1821"/> + <source>The installation path cannot be empty, please specify a valid folder.</source> + <translation>Åšcieżka instalacji nie może być pusta. Podaj nazwÄ™ poprawnego katalogu.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1825"/> + <source>The installation path cannot be relative, please specify an absolute path.</source> + <translation>Åšcieżka instalacji nie może być wzglÄ™dna. Podaj peÅ‚nÄ… Å›cieżkÄ™ do katalogu.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1831"/> + <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> + <translation>Åšcieżka instalacji posiada znaki z poza ASCII. Nie jest to obecnie obsÅ‚ugiwane. Podaj innÄ… Å›cieżkÄ™ lub katalog instalacji.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1840"/> + <source>As the install directory is completely deleted, installing in %1 is forbidden.</source> + <translation>Instalowanie w %1 jest niedozwolone, gdyż katalog instalacji zostanie kompletnie usuniÄ™ty.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1848"/> + <source>The path you have entered is too long, please make sure to specify a valid path.</source> + <translation>Podana Å›cieżka jest za dÅ‚uga.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1863"/> + <source>The path you have entered is not valid, please make sure to specify a valid target.</source> + <translation>Podana Å›cieżka jest niepoprawna.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1877"/> + <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> + <translation>Podana Å›cieżka zawiera niepoprawny napÄ™d.</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1884"/> + <source>The installation path must not end with '.', please specify a valid folder.</source> + <translation>Åšcieżka instalacji nie może być zakoÅ„czona znakiem ".".</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1899"/> + <source>The installation path must not contain '%1', please specify a valid folder.</source> + <translation>Åšcieżka instalacji nie może zawierać "%1".</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1910"/> + <source>Warning</source> + <translation>Ostrzeżenie</translation> + </message> + <message> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1917"/> + <source>Error</source> + <translation>BÅ‚Ä…d</translation> + </message> +</context> +<context> + <name>QInstaller::TestRepository</name> + <message> + <location filename="../../libs/installer/testrepository.cpp" line="79"/> + <source>Empty repository URL.</source> + <translation>Pusty URL repozytorium.</translation> + </message> + <message> + <location filename="../../libs/installer/testrepository.cpp" line="85"/> + <source>URL scheme not supported: %1 (%2).</source> + <translation>NieobsÅ‚ugiwany schemat URL: %1 (%2).</translation> + </message> + <message> + <location filename="../../libs/installer/testrepository.cpp" line="112"/> + <source>Got a timeout while testing: '%1'</source> + <translation>Przekroczono maksymalny czas oczekiwania na zakoÅ„czenie testowania: "%1"</translation> + </message> + <message> + <location filename="../../libs/installer/testrepository.cpp" line="132"/> + <source>Could not parse Updates.xml! Error: %1.</source> + <translation>Nie można sparsować Updates.xml. BÅ‚Ä…d: %1.</translation> + </message> + <message> + <location filename="../../libs/installer/testrepository.cpp" line="137"/> + <source>Updates.xml could not be opened for reading!</source> + <translation>Nie można otworzyć Updates.xml do odczytu.</translation> + </message> + <message> + <location filename="../../libs/installer/testrepository.cpp" line="140"/> + <source>Updates.xml could not be found on server!</source> + <translation>Nie znaleziono Updates.xml na serwerze.</translation> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="71"/> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="76"/> + <source>Authorization required</source> + <translation>Wymagana autoryzacja</translation> + </message> + <message> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="72"/> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="77"/> + <source>Enter your password to authorize for sudo:</source> + <translation>Podaj hasÅ‚o do autoryzacji sudo:</translation> + </message> + <message> + <location filename="../../libs/installer/adminauthorization_x11.cpp" line="88"/> + <source>Error acquiring admin rights</source> + <translation>BÅ‚Ä…d nabywania praw administratora</translation> + </message> +</context> +<context> + <name>RemoteClient</name> + <message> + <location filename="../../libs/installer/remoteclient_p.h" line="145"/> + <source>Could not get authorization.</source> + <translation>Nie można uzyskać autoryzacji.</translation> + </message> + <message> + <location filename="../../libs/installer/remoteclient_p.h" line="146"/> + <source>Could not get authorization that is needed for continuing the installation. + Either abort the installation or use the fallback solution by running + +%1 + +as root and then clicking OK.</source> + <translation>Nie można uzyskać autoryzacji wymaganej do dalszej instalacji. Przerwij instalacjÄ™ albo użyj rozwiÄ…zania awaryjnego wykonujÄ…c: + +%1 + +jako administrator, po czym naciÅ›nij OK.</translation> + </message> +</context> +<context> + <name>ResourceCollectionManager</name> + <message> + <location filename="../../libs/installer/binaryformat.cpp" line="401"/> + <source>Could not open resource %1: %2</source> + <translation>Nie można otworzyć pliku z zasobami %1: %2</translation> + </message> +</context> +<context> + <name>Settings</name> + <message> + <location filename="../../libs/installer/settings.cpp" line="239"/> + <source>Could not open settings file %1 for reading: %2</source> + <translation>Nie można otworzyć pliku z ustawieniami %1 do odczytu: %2</translation> + </message> +</context> +<context> + <name>SettingsDialog</name> + <message> + <location filename="../settingsdialog.ui" line="14"/> + <source>Settings</source> + <translation>Ustawienia</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="24"/> + <source>Network</source> + <translation>Sieć</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="30"/> + <source>No proxy</source> + <translation>Brak proxy</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="43"/> + <source>System proxy settings</source> + <translation>Ustawienia systemowego proxy</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="53"/> + <source>Manual proxy configuration</source> + <translation>RÄ™czna konfiguracja proxy</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="66"/> + <source>HTTP proxy:</source> + <translation>HTTP proxy:</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="83"/> + <location filename="../settingsdialog.ui" line="138"/> + <source>Port:</source> + <translation>Port:</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="121"/> + <source>FTP proxy:</source> + <translation>FTP proxy:</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="190"/> + <source>Repositories</source> + <translation>Repozytoria</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="196"/> + <source>Add Username and Password for authentication if needed.</source> + <translation>Dodaj nazwÄ™ użytkownia i hasÅ‚o do autoryzacji, jeÅ›li wymagane.</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="212"/> + <source>Use temporary repositories only</source> + <translation>Używaj tylko tymczasowych repozytoriów</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="221"/> + <source>Add</source> + <translation>Dodaj</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="228"/> + <source>Remove</source> + <translation>UsuÅ„</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="235"/> + <source>Test</source> + <translation>Przetestuj</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="255"/> + <location filename="../settingsdialog.cpp" line="357"/> + <source>Show Passwords</source> + <translation>Pokaż hasÅ‚a</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="134"/> + <source>Check this to use repository during fetch.</source> + <translation>Zaznacz aby użyć repozytorium podczas pobierania.</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="136"/> + <source>Add the username to authenticate on the server.</source> + <translation>Dodaj nazwÄ™ użytkownia w celu autoryzacji na serwerze.</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="138"/> + <source>Add the password to authenticate on the server.</source> + <translation>Dodaj hasÅ‚o w celu autoryzacji na serwerze.</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="140"/> + <source>The servers URL that contains a valid repository.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="338"/> + <source>There was an error testing this repository.</source> + <translation>WystÄ…piÅ‚ bÅ‚Ä…d podczas testowania tego repozytorium.</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="339"/> + <source>Do you want to disable the tested repository?</source> + <translation>Czy zdezaktywować przetestowane repozytorium?</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="357"/> + <source>Hide Passwords</source> + <translation>Ukryj hasÅ‚a</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="402"/> + <source>Use</source> + <translation>Użyj</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="402"/> + <source>Username</source> + <translation>Nazwa użytkownika</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="402"/> + <source>Password</source> + <translation>HasÅ‚o</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="403"/> + <source>Repository</source> + <translation>Repozytorium</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="404"/> + <source>Default repositories</source> + <translation>DomyÅ›lne repozytoria</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="405"/> + <source>Temporary repositories</source> + <translation>Tymczasowe repozytoria</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="406"/> + <source>User defined repositories</source> + <translation>WÅ‚asne repozytoria</translation> + </message> +</context> +<context> + <name>UpdateOperation</name> + <message> + <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="83"/> + <source>Registry path %1 is not writable</source> + <translation>Åšcieżka %1 rejestru jest tylko do odczytu</translation> + </message> + <message> + <location filename="../../libs/installer/environmentvariablesoperation.cpp" line="95"/> + <source>Could not write to registry path %1</source> + <translation>Nie można zapisać do Å›cieżki rejestru %1</translation> + </message> + <message> + <location filename="../../libs/kdtools/kdupdaterupdateoperation.cpp" line="303"/> + <source>Renaming %1 into %2 failed with %3.</source> + <translation>Zmiana nazwy %1 na %2 zakoÅ„czona bÅ‚Ä™dem %3.</translation> + </message> +</context> +</TS> diff --git a/src/sdk/translations/ru.ts b/src/sdk/translations/ru.ts index 9673906c6..6485407d4 100644 --- a/src/sdk/translations/ru.ts +++ b/src/sdk/translations/ru.ts @@ -2,10 +2,44 @@ <!DOCTYPE TS> <TS version="2.1" language="ru_RU"> <context> - <name>Component</name> + <name>AuthenticationRequiredException</name> <message> - <source>Could not open archive %1: %2</source> - <translation>Ðевозможно открыть архив %1: %2</translation> + <source>%1 at %2</source> + <translation>%1 в %2</translation> + </message> + <message> + <source>Proxy requires authentication.</source> + <translation>ПрокÑи-Ñервер требует аутентификацию.</translation> + </message> +</context> +<context> + <name>BinaryContent</name> + <message> + <source>Could not seek to %1 to read the operation data.</source> + <translation>Ðе удалоÑÑŒ перейти в позицию %1 Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… операций.</translation> + </message> + <message> + <source>Could not seek to %1 to read the resource collection block.</source> + <translation>Ðе удалоÑÑŒ перейти в позицию %1 Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ° набора реÑурÑов.</translation> + </message> + <message> + <source>Could not open meta resource. Error: %1</source> + <translation>Ðе удалоÑÑŒ открыть метареÑурÑÑ‹. Ошибка: %1</translation> + </message> +</context> +<context> + <name>BinaryLayout</name> + <message> + <source>Could not seek to %1 to read the embedded meta data count.</source> + <translation>Ðе удалоÑÑŒ перейти в позицию %1 Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñчётчика вÑтроенных метаданных.</translation> + </message> + <message> + <source>Could not seek to %1 to read the resource collection segment.</source> + <translation>Ðе удалоÑÑŒ перейти в позицию %1 Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñегмента набора реÑурÑов.</translation> + </message> + <message> + <source>Unexpected mismatch of meta resources. Read %1, expected: %2.</source> + <translation>Ðеожиданное неÑовпадение метареÑурÑов. Прочитано %1, ожидалоÑÑŒ: %2.</translation> </message> </context> <context> @@ -32,101 +66,68 @@ </message> </context> <context> - <name>GetRepositoryMetaInfoJob</name> - <message> - <source>Empty repository URL.</source> - <translation>ПуÑтой URL хранилища.</translation> - </message> - <message> - <source>Invalid repository URL: %1</source> - <translation>Ðеверный URL хранилища: %1</translation> - </message> + <name>DirectoryGuard</name> <message> - <source>URL scheme not supported: %1 (%2)</source> - <translation>Схема URL не поддерживаетÑÑ: %1 (%2)</translation> - </message> - <message> - <source>Retrieving component meta information...</source> - <translation>Получение метаданных компонета...</translation> - </message> - <message> - <source>Could not open Updates.xml for reading. Error: %1</source> - <translation>Ðе удалоÑÑŒ открыть Updates.xml Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ: Ошибка: %1</translation> - </message> - <message> - <source>Could not fetch a valid version of Updates.xml from repository: %1. Error: %2</source> - <translation>Ðе удалоÑÑŒ загрузить корректную верÑию Updates.xml из хранилища: %1. Ошибка: %2</translation> - </message> - <message> - <source>Download Error</source> - <translation>Ошибка загрузки</translation> - </message> - <message> - <source>Parsing component meta information...</source> - <translation>Разбор метаданных компонента...</translation> + <source>Path exists but is not a folder: %1</source> + <translation>Путь ÑущеÑтвует, но не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼: %1</translation> </message> <message> - <source>Repository updates received.</source> - <translation>Получены Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ð°.</translation> + <source>Could not create folder: %1</source> + <translation>Ðе удалоÑÑŒ Ñоздать каталог: %1</translation> </message> +</context> +<context> + <name>ExtractCallbackImpl</name> <message> - <source>Could not move Updates.xml to target location. Error: %1</source> - <translation>Ðе удалоÑÑŒ перемеÑтить Updates.xml. Ошибка: %1</translation> + <source>Could not retrieve path of archive item %1</source> + <translation>Ðе удалоÑÑŒ определить путь файла %1 в архиве</translation> </message> <message> - <source>Finished updating component meta information.</source> - <translation>Завершена обработка метаданных компонента.</translation> + <source>Could not remove already existing symlink. %1</source> + <translation>Ðе удалоÑÑŒ удалить ÑущеÑтвующую Ñимвольную ÑÑылку. %1</translation> </message> <message> - <source>Could not fetch Updates.xml from repository: %1. Error: %2</source> - <translation>Ðе удалоÑÑŒ загрузить Updates.xml из хранилища: %1. Ошибка: %2</translation> + <source>Could not open file: %1 (%2)</source> + <translation>Ðе удалоÑÑŒ открыть файл: %1 (%2)</translation> </message> <message> - <source>Retrieving component information from remote repository...</source> - <translation>Получение информации о компоненте из внешнего хранилища...</translation> + <source>Could not create symlink at '%1'. Another one is already existing.</source> + <translation>Ðе удалоÑÑŒ Ñоздать Ñимвольную ÑÑылку «%1», потому что ÑÑылка уже ÑущеÑтвует.</translation> </message> <message> - <source>Meta data download canceled.</source> - <translation>Загрузка метаданных отменена.</translation> + <source>Could not read symlink target from file '%1'.</source> + <translation>Ðе удалоÑÑŒ прочитать цель Ñимвольной ÑÑылки из файла «%1».</translation> </message> <message> - <source>Unknown exception.</source> - <translation>ÐеизвеÑтное иÑключение.</translation> + <source>Could not create symlink at %1. %2</source> + <translation>Ðе удалоÑÑŒ Ñоздать Ñимвольную ÑÑылку %1. %2</translation> </message> </context> <context> - <name>IntroductionPageImpl</name> + <name>InstallerCalculator</name> <message> - <source>Package manager</source> - <translation>Менеджер пакетов</translation> + <source>Components added as automatic dependencies:</source> + <translation>Компоненты, добавленные как автоматичеÑкие завиÑимоÑти:</translation> </message> <message> - <source>Update components</source> - <translation>Обновить компоненты</translation> - </message> - <message> - <source>Remove all components</source> - <translation>Удалить вÑе компоненты</translation> - </message> - <message> - <source>Retrieving information from remote installation sources...</source> - <translation>Получение информации из удалённых иÑточников уÑтановки...</translation> + <source>Components added as dependency for '%1':</source> + <translation>Компоненты, добавленные как завиÑимоÑÑ‚ÑŒ Ð´Ð»Ñ %1:</translation> </message> <message> - <source>At least one valid and enabled repository required for this action to succeed.</source> - <translation>Ð”Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñтого дейÑÑ‚Ð²Ð¸Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один включённый и дейÑтвующий репозиторий.</translation> + <source>Components that have resolved dependencies:</source> + <translation>Компоненты Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÑ‘Ð½Ð½Ñ‹Ð¼Ð¸ завиÑимоÑÑ‚Ñми:</translation> </message> <message> - <source>No updates available.</source> - <translation>Ðет доÑтупных обновлений.</translation> + <source>Selected components without dependencies:</source> + <translation>Выбранные компоненты без завиÑимоÑтей:</translation> </message> <message> - <source> Only local package management available.</source> - <translation> Возможно только локальное управление пакетами.</translation> + <source>Recursion detected, component '%1' already added with reason: '%2'</source> + <translation>Обнаружена рекурÑиÑ: компонент «%1» уже добавлен по причине: «%2»</translation> </message> <message> - <source>Quit</source> - <translation>Выход</translation> + <source>Cannot find missing dependency '%1' for '%2'.</source> + <translation>Ðе удалоÑÑŒ найти компонент «%1», необходимый Ð´Ð»Ñ Â«%2».</translation> </message> </context> <context> @@ -137,22 +138,22 @@ </message> </context> <context> - <name>KDSaveFile</name> + <name>KDLockFile</name> <message> - <source>Append mode not supported.</source> - <translation>Режим Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ поддерживаетÑÑ.</translation> + <source>Could not create lock file '%1': %2</source> + <translation>Ðе удалоÑÑŒ Ñоздать файл блокировки «%1»: %2</translation> </message> <message> - <source>Read-only access not supported.</source> - <translation>ДоÑтуп только на чтение не поддерживаетÑÑ.</translation> + <source>Could not write PID to lock file '%1': %2</source> + <translation>Ðе удалоÑÑŒ запиÑать PID в файл блокировки «%1»: %2</translation> </message> <message> - <source>Could not backup existing file %1: %2</source> - <translation>Ðевозможно Ñоздать резервную копию ÑущеÑтвующего файла %1: %2</translation> + <source>Could not obtain the lock for file '%1': %2</source> + <translation>Ðе удалоÑÑŒ заблокировать файл «%1»: %2</translation> </message> <message> - <source>TODO</source> - <translation></translation> + <source>Could not release the lock for file '%1': %2</source> + <translation>Ðе удалоÑÑŒ разблокировать файл «%1»: %2</translation> </message> </context> <context> @@ -163,7 +164,7 @@ </message> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Ðеверные аргументы в %0: требуетÑÑ%3 %2, а передано %1.</translation> + <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> </message> <message> <source>exactly 2</source> @@ -533,8 +534,8 @@ <translation>ЗагружаетÑÑ Ñ„Ð°Ð¹Ð» Updates.xml Ñ Ñервера обновлений.</translation> </message> <message> - <source>Could not download updates from %1 ('%2')</source> - <translation>Ðевозможно загрузить Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ %1 («%2»)</translation> + <source>Could not download update source %1 from ('%2')</source> + <translation>Ðе удалоÑÑŒ загрузить иÑточник обновлений %1 Ñ («%2»)</translation> </message> <message> <source>Updates.xml file(s) downloaded from update sources.</source> @@ -612,11 +613,74 @@ </message> </context> <context> + <name>Lib7z</name> + <message> + <source>Could not retrieve number of items in archive</source> + <translation>Ðе удалоÑÑŒ определить количеÑтво файлов в архиве</translation> + </message> + <message> + <source>Could not retrieve path of archive item %1</source> + <translation>Ðе удалоÑÑŒ определить путь файла %1 в архиве</translation> + </message> + <message> + <source>Unknown exception caught (%1)</source> + <translation>Возникло неизвеÑтное иÑключение (%1)</translation> + </message> + <message> + <source>internal code: %1</source> + <translation>внутренний код ошибки: %1</translation> + </message> + <message> + <source>not enough memory</source> + <translation>недоÑтаточно памÑти</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Ошибка: %1</translation> + </message> + <message> + <source>Could not load codecs</source> + <translation>Ðе удалоÑÑŒ загрузить кодеки</translation> + </message> + <message> + <source>Could not retrieve default format</source> + <translation>Ðе удалоÑÑŒ определить формат по умолчанию</translation> + </message> + <message> + <source>Could not create archive %1. %2</source> + <translation>Ðе удалоÑÑŒ Ñоздать архив %1. %2</translation> + </message> + <message> + <source>CArc index %1 out of bounds [0, %2]</source> + <translation>Ð˜Ð½Ð´ÐµÐºÑ CArc %1 вне лимитов [0, %2]</translation> + </message> + <message> + <source>Item index %1 out of bounds [0, %2]</source> + <translation>Ð˜Ð½Ð´ÐµÐºÑ Ñ„Ð°Ð¹Ð»Ð° %1 вне лимитов [0, %2]</translation> + </message> + <message> + <source>Could not create output file for writing: %1</source> + <translation>Ðе удалоÑÑŒ Ñоздать выходной файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %1</translation> + </message> +</context> +<context> <name>Lib7z::ExtractItemJob</name> <message> <source>Could not list archive: QIODevice not set or already destroyed.</source> <translation>Ðевозможно Ñоздать архив: QIODevice не уÑтановлен или уже разрушен.</translation> </message> + <message> + <source>Error while extracting '%1': %2</source> + <translation>Ошибка Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Â«%1»: %2</translation> + </message> + <message> + <source>Unknown exception caught (%1)</source> + <translation>Возникло неизвеÑтное иÑключение (%1)</translation> + </message> + <message> + <source>Failed</source> + <translation>Ðе удалоÑÑŒ</translation> + </message> </context> <context> <name>Lib7z::ListArchiveJob</name> @@ -624,6 +688,40 @@ <source>Could not list archive: QIODevice already destroyed.</source> <translation>Ðевозможно Ñоздать архив: QIODevice уже разрушен.</translation> </message> + <message> + <source>Unknown exception caught (%1)</source> + <translation>Возникло неизвеÑтное иÑключение (%1)</translation> + </message> + <message> + <source>Failed</source> + <translation>Ðе удалоÑÑŒ</translation> + </message> +</context> +<context> + <name>OpenArchiveInfo</name> + <message> + <source>Could not load codecs</source> + <translation>Ðе удалоÑÑŒ загрузить кодеки</translation> + </message> + <message> + <source>Could not retrieve default format</source> + <translation>Ðе удалоÑÑŒ определить формат по умолчанию</translation> + </message> + <message> + <source>Could not open archive</source> + <translation>Ðе удалоÑÑŒ открыть архив</translation> + </message> + <message> + <source>No CArc found</source> + <translation>CArc не найден</translation> + </message> +</context> +<context> + <name>QIODeviceSequentialOutStream</name> + <message> + <source>No device set for output stream</source> + <translation>УÑтройÑтво Ð´Ð»Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ потока не задано</translation> + </message> </context> <context> <name>QInstaller</name> @@ -664,40 +762,101 @@ <translation>ИБ</translation> </message> <message> + <source>Could not remove file %1: %2</source> + <translation>Ðе удалоÑÑŒ удалить файл %1: %2</translation> + </message> + <message> + <source>Could not remove folder %1: %2</source> + <translation>Ðе удалоÑÑŒ удалить каталог %1: %2</translation> + </message> + <message> + <source>Could not create folder %1</source> + <translation>Ðе удалоÑÑŒ Ñоздать каталог %1</translation> + </message> + <message> + <source>Could not copy file from %1 to %2: %3</source> + <translation>Ðе удалоÑÑŒ Ñкопировать файл из %1 в %2: %3</translation> + </message> + <message> + <source>Could not move file from %1 to %2: %3</source> + <translation>Ðе удалоÑÑŒ перемеÑтить файл из %1 в %2: %3</translation> + </message> + <message> + <source>Could not create folder %1: %2</source> + <translation>Ðе удалоÑÑŒ Ñоздать каталог %1: %2</translation> + </message> + <message> + <source>Could not open temporary file: %1</source> + <translation>Ðе удалоÑÑŒ открыть временный файл %1</translation> + </message> + <message> + <source>Could not open temporary file for template %1: %2</source> + <translation>Ðе удалоÑÑŒ открыть временный файл Ð´Ð»Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° %1: %2</translation> + </message> + <message> <source>Corrupt installation</source> <translation>УÑтановка повреждена</translation> </message> <message> <source>Your installation seems to be corrupted. Please consider re-installing from scratch.</source> - <translation>Возможно, уÑтановленное приложение повреждено. Попробуйте его заново переуÑтановить.</translation> + <translation>Видимо, уÑтановленное приложение повреждено. Попробуйте его заново переуÑтановить.</translation> </message> -</context> -<context> - <name>QInstaller::AddQtCreatorArrayValueOperation</name> <message> - <source>exactly 4</source> - <translation>ровно 4</translation> + <source>No marker found, stopped after %1.</source> + <translation>Маркер не найден, оÑтановлено поÑле %1.</translation> </message> <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> + <source>Cannot open file %1 for reading: %2</source> + <translation>Ðевозможно открыть файл %1 на чтение: %2</translation> </message> <message> - <source> (group, arrayname, key, value)</source> - <translation> (группа, Ð¸Ð¼Ñ Ð¼Ð°ÑÑива, ключ, значение)</translation> + <source>Cannot open file %1 for writing: %2</source> + <translation>Ðевозможно открыть файл %1 на запиÑÑŒ: %2</translation> </message> <message> - <source>Needed installer object in %1 operation is empty.</source> - <translation>ОтÑутÑтвует необходимый объект программы уÑтановки в операции %1.</translation> + <source>Read failed after %1 bytes: %2</source> + <translation>Ðе удалоÑÑŒ прочитать поÑле %1 байт: %2</translation> + </message> + <message> + <source>Copy failed. Error: %1</source> + <translation>Сбой копированиÑ. Ошибка: %1</translation> + </message> + <message> + <source>Write failed after %1 bytes: %2</source> + <translation>Сбой запиÑи Ñ %1 байта: %2</translation> + </message> + <message> + <source>Could not create temporary file</source> + <translation>Ðе удалоÑÑŒ Ñоздать временный файл</translation> + </message> + <message> + <source>Could not retrieve property %1 for item %2</source> + <translation>Ðе удалоÑÑŒ определить ÑвойÑтво %1 Ð´Ð»Ñ Ñлемента %2</translation> + </message> + <message> + <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> + <translation>СвойÑтво %1 Ñлемента %2 отноÑитÑÑ Ð½Ðµ к типу VT_FILETIME, а к %3</translation> + </message> + <message> + <source>Could not convert file time to local time</source> + <translation>Ðе удалоÑÑŒ преобразовать Ð²Ñ€ÐµÐ¼Ñ Ñ„Ð°Ð¹Ð»Ð° в локальное времÑ</translation> </message> <message> - <source>There is no value set for %1 on the installer object.</source> - <translation>ОтÑутÑтвует значение Ñлемента %1 в объекте программы уÑтановки.</translation> + <source>Could not convert local file time to system time</source> + <translation>Ðе удалоÑÑŒ преобразовать Ð²Ñ€ÐµÐ¼Ñ Ñ„Ð°Ð¹Ð»Ð° в ÑиÑтемное времÑ</translation> + </message> + <message> + <source>The specified module could not be found.</source> + <translation>Ðе удалоÑÑŒ найти указанный модуль.</translation> </message> </context> <context> <name>QInstaller::Component</name> <message> + <source>Components cannot have children in updater mode.</source> + <translation>У компонентов не может быть потомков в режиме обновлениÑ.</translation> + </message> + <message> <source>Could not open the requested translation file '%1'.</source> <translation>Ðевозможно открыть файл перевода «%1».</translation> </message> @@ -710,10 +869,6 @@ <translation>Ðевозможно загрузить UI файл «%1». Ошибка: %2</translation> </message> <message> - <source>An error has occurred while reading the UI file.</source> - <translation>Произошла ошибка при чтении UI файла.</translation> - </message> - <message> <source>Could not open the requested license file '%1'. Error: %2</source> <translation>Ðевозможно открыть файл лицензии «%1». Ошибка: %2</translation> </message> @@ -726,10 +881,6 @@ <translation>Ошибка: Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ %1 не ÑущеÑтвует</translation> </message> <message> - <source>Cannot resolve isAutoDependOn in %1</source> - <translation>Ðевозможно выполнить метод isAutoDependOn в Ñценарии %1</translation> - </message> - <message> <source>Cannot resolve isDefault in %1</source> <translation>Ðевозможно выполнить метод isDefault в Ñценарии %1</translation> </message> @@ -745,6 +896,10 @@ <translation>Ð˜Ð¼Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð°</translation> </message> <message> + <source>Action</source> + <translation>ДейÑтвие</translation> + </message> + <message> <source>Installed Version</source> <translation>УÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð²ÐµÑ€ÑиÑ</translation> </message> @@ -760,6 +915,22 @@ <source>Size</source> <translation>Размер</translation> </message> + <message> + <source>Component is marked for installation.</source> + <translation>Компонент выбран Ð´Ð»Ñ ÑƒÑтановки.</translation> + </message> + <message> + <source>Component is marked for uninstallation.</source> + <translation>Компонент выбран Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ.</translation> + </message> + <message> + <source>Component is installed.</source> + <translation>Компонент уÑтановлен.</translation> + </message> + <message> + <source>Component is not installed.</source> + <translation>Компонент не уÑтановлен.</translation> + </message> </context> <context> <name>QInstaller::ComponentSelectionPage</name> @@ -840,7 +1011,7 @@ </message> <message> <source>Needed installer object in %1 operation is empty.</source> - <translation>ОтÑутÑтвует необходимый объект программы уÑтановки в операции %1.</translation> + <translation>Ð’ операции «%1» необходимый объект уÑтановщика пуÑÑ‚.</translation> </message> <message> <source>Can not save the output of %1 to an empty installer key value.</source> @@ -895,8 +1066,31 @@ </message> </context> <context> + <name>QInstaller::CopyFileTask</name> + <message> + <source>Invalid task item count.</source> + <translation type="unfinished">Ðеверное чиÑло Ñлементов task.</translation> + </message> + <message> + <source>Could not open source '%1' for read. Error: %2.</source> + <translation>Ðе удалоÑÑŒ открыть иÑточник «%1» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ. Ошибка: %2.</translation> + </message> + <message> + <source>Could not open target '%1' for write. Error: %2.</source> + <translation>Ðе удалоÑÑŒ открыть «%1» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи. Ошибка: %2.</translation> + </message> + <message> + <source>Writing to target '%1' failed. Error: %2.</source> + <translation>Сбой запиÑи в «%1». Ошибка %2.</translation> + </message> +</context> +<context> <name>QInstaller::CreateDesktopEntryOperation</name> <message> + <source>Could not backup file %1: %2</source> + <translation>Ðе удалоÑÑŒ Ñоздать резервную копию файла %1: %2</translation> + </message> + <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> </message> @@ -923,6 +1117,14 @@ <source>exactly 2</source> <translation>ровно 2</translation> </message> + <message> + <source>Could not create link from %1 to %2.</source> + <translation>Ðе удалоÑÑŒ Ñоздать ÑÑылку Ñ %1 на %2.</translation> + </message> + <message> + <source>Could not remove link from %1 to %2.</source> + <translation>Ðе удалоÑÑŒ Ñоздать ÑÑылку Ñ %1 на %2.</translation> + </message> </context> <context> <name>QInstaller::CreateLocalRepositoryOperation</name> @@ -931,12 +1133,16 @@ <translation>Ðевозможно уÑтановить права доÑтупа Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %1!</translation> </message> <message> + <source>Could not remove file %1: %2</source> + <translation>Ðе удалоÑÑŒ удалить файл %1: %2</translation> + </message> + <message> <source>Could not move file %1 to %2. Error: %3</source> <translation>Ðевозможно перемеÑтить файл %1 в %2. Ошибка: %3</translation> </message> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> + <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1,%3 требуетÑÑ %2.</translation> </message> <message> <source>exactly 2</source> @@ -995,11 +1201,15 @@ </message> <message> <source>Could not create folder %1: %2.</source> - <translation>Ðевозможно Ñоздать каталог: %1: %2.</translation> + <translation>Ðе удалоÑÑŒ Ñоздать каталог: %1: %2.</translation> + </message> + <message> + <source>Failed to overwrite %1: %2</source> + <translation>Ðе удалоÑÑŒ перезапиÑать %1: %2</translation> </message> <message> <source>Could not create link %1: %2</source> - <translation>Ðевозможно Ñоздать ÑÑылку %1: %2</translation> + <translation>Ðе удалоÑÑŒ Ñоздать ÑÑылку %1: %2</translation> </message> </context> <context> @@ -1048,6 +1258,55 @@ Error while loading %2</source> </message> </context> <context> + <name>QInstaller::Downloader</name> + <message> + <source>Target '%1' not open for write. Error: %2.</source> + <extracomment>%2 is a sentence describing the error.</extracomment> + <translation>«%1» не открыт Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи. Ошибка: %2.</translation> + </message> + <message> + <source>Writing to target '%1' failed. Error: %2.</source> + <extracomment>%2 is a sentence describing the error.</extracomment> + <translation>Сбой запиÑи в «%1». Ошибка %2.</translation> + </message> + <message> + <source>Redirect loop detected '%1'.</source> + <translation>Обнаружено кольцо перенаправлений «%1».</translation> + </message> + <message> + <source>Checksum mismatch detected '%1'.</source> + <translation>Обнаружено неÑовпадение контрольной Ñуммы «%1».</translation> + </message> + <message> + <source>Network error while downloading '%1': %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при загрузке «%1»: %2.</translation> + </message> + <message> + <source>Unknown network error while downloading: %1.</source> + <extracomment>%1 is a sentence describing the error</extracomment> + <translation>ÐеизвеÑÑ‚Ð½Ð°Ñ ÑÐµÑ‚ÐµÐ²Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸: %1.</translation> + </message> + <message> + <source>Pause and resume not supported by network transfers.</source> + <translation>ПриоÑтановка и продолжение не поддерживаютÑÑ Ñетевыми протоколами.</translation> + </message> + <message> + <source>Invalid source '%1'. Error: %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>Ðеверный иÑточник «%1». Ошибка: %2.</translation> + </message> + <message> + <source>Target file '%1' already exists but is not a file.</source> + <translation>«%1» уже ÑущеÑтвует, но не ÑвлÑетÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð¼.</translation> + </message> + <message> + <source>Could not open target '%1' for write. Error: %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>Ðе удалоÑÑŒ открыть «%1» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи. Ошибка: %2.</translation> + </message> +</context> +<context> <name>QInstaller::ElevatedExecuteOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> @@ -1104,7 +1363,7 @@ Error while loading %2</source> </message> <message> <source>Error while extracting '%1': %2</source> - <translation>Ошибка при извлечении «%1»: %2</translation> + <translation>Ошибка Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Â«%1»: %2</translation> </message> <message> <source>Unknown exception caught while extracting %1.</source> @@ -1112,58 +1371,73 @@ Error while loading %2</source> </message> </context> <context> - <name>QInstaller::FileTaskObserver</name> - <message> - <source> of </source> - <translation> из </translation> - </message> + <name>QInstaller::FakeStopProcessForUpdateOperation</name> <message> - <source> received.</source> - <translation> полученных.</translation> + <source>Number of arguments does not match: one is required</source> + <translation>КоличеÑтво аргументов не Ñовпадает: требуетÑÑ 1</translation> </message> <message> - <source>/sec</source> - <translation>/Ñ</translation> + <source>Could not get package manager core.</source> + <translation>Ðевозможно получить Ñдро менеджера пакетов.</translation> </message> <message> - <source> day</source> - <translation> день</translation> + <source>This process should be stopped before continuing: %1</source> + <translation>Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ завершить процеÑÑ %1</translation> </message> <message> - <source> days</source> - <translation> дней</translation> + <source>These processes should be stopped before continuing: %1</source> + <translation>Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ завершить Ñти процеÑÑÑ‹: %1</translation> </message> +</context> +<context> + <name>QInstaller::FileTaskObserver</name> <message> - <source> hour</source> - <translation> чаÑ</translation> + <source>%1 of %2</source> + <translation>%1 из %2</translation> </message> <message> - <source> hours</source> - <translation> чаÑов</translation> + <source>%1 received.</source> + <translation>%1 получено.</translation> </message> <message> - <source> minute</source> - <translation> минута</translation> + <source>(%1/sec)</source> + <translation>(%1/Ñ)</translation> </message> - <message> - <source> minutes</source> - <translation> минут</translation> + <message numerus="yes"> + <source>%n day(s), </source> + <translation> + <numerusform>%n день, </numerusform> + <numerusform>%n днÑ, </numerusform> + <numerusform>%n дней, </numerusform> + </translation> </message> - <message> - <source> second</source> - <translation> Ñекунда</translation> + <message numerus="yes"> + <source>%n hour(s), </source> + <translation> + <numerusform>%n чаÑ, </numerusform> + <numerusform>%n чаÑа, </numerusform> + <numerusform>%n чаÑов, </numerusform> + </translation> </message> - <message> - <source> seconds</source> - <translation> Ñекунд</translation> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation> + <numerusform>%n минута</numerusform> + <numerusform>%n минуты</numerusform> + <numerusform>%n минут</numerusform> + </translation> </message> - <message> - <source> - </source> - <translation> - </translation> + <message numerus="yes"> + <source>%n second(s)</source> + <translation> + <numerusform>%n Ñекунда</numerusform> + <numerusform>%n Ñекунды</numerusform> + <numerusform>%n Ñекунд</numerusform> + </translation> </message> <message> - <source> remaining.</source> - <translation> оÑталоÑÑŒ.</translation> + <source> - %1%2%3%4 remaining.</source> + <translation> - оÑталоÑÑŒ %1%2%3%4.</translation> </message> <message> <source> - unknown time remaining.</source> @@ -1212,8 +1486,8 @@ Error while loading %2</source> <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> </message> <message> - <source>3 or 4</source> - <translation>3 или 4</translation> + <source>3, 4 or 5</source> + <translation>3, 4 или 5</translation> </message> </context> <context> @@ -1230,6 +1504,26 @@ Error while loading %2</source> <source> (Sourcepath, [Vendorprefix])</source> <translation> (иÑточник, [Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ Ð¿Ð¾Ñтавщика])</translation> </message> + <message> + <source>Invalid Argument: source folder must not be empty.</source> + <translation>ÐедопуÑтимый параметр: иÑходный каталог не может быть пуÑтым.</translation> + </message> + <message> + <source>Could not backup file %1: %2</source> + <translation>Ðе удалоÑÑŒ Ñоздать резервную копию файла %1: %2</translation> + </message> + <message> + <source>Failed to overwrite %1: %2</source> + <translation>Ðе удалоÑÑŒ перезапиÑать %1: %2</translation> + </message> + <message> + <source>Failed to copy file %1: %2</source> + <translation>Ðе удалоÑÑŒ Ñкопировать %1: %2</translation> + </message> + <message> + <source>Could not create folder at %1: %2</source> + <translation>Ðе удалоÑÑŒ Ñоздать каталог в %1: %2</translation> + </message> </context> <context> <name>QInstaller::IntroductionPage</name> @@ -1241,6 +1535,38 @@ Error while loading %2</source> <source>Welcome to the %1 Setup Wizard.</source> <translation>Добро пожаловать в маÑтер уÑтановки %1.</translation> </message> + <message> + <source>Add or remove components</source> + <translation>Добавление или удаление компонентов</translation> + </message> + <message> + <source>Update components</source> + <translation>Обновление компонентов</translation> + </message> + <message> + <source>Remove all components</source> + <translation>Удаление вÑех компонентов</translation> + </message> + <message> + <source>Retrieving information from remote installation sources...</source> + <translation>Получение информации из удалённых иÑточников...</translation> + </message> + <message> + <source>At least one valid and enabled repository required for this action to succeed.</source> + <translation>Ð”Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñтого дейÑÑ‚Ð²Ð¸Ñ Ð½ÑƒÐ¶Ð½Ð¾ Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ одно включённое и дейÑтвующее хранилище.</translation> + </message> + <message> + <source>No updates available.</source> + <translation>Ðет доÑтупных обновлений.</translation> + </message> + <message> + <source> Only local package management available.</source> + <translation> ДоÑтупно только локальное управление пакетами.</translation> + </message> + <message> + <source>Quit</source> + <translation>Выйти</translation> + </message> </context> <context> <name>QInstaller::LicenseAgreementPage</name> @@ -1291,7 +1617,7 @@ Error while loading %2</source> </message> <message> <source>Needed installer object in %1 operation is empty.</source> - <translation>ОтÑутÑтвует необходимый объект программы уÑтановки в операции %1.</translation> + <translation>Ð’ операции «%1» необходимый объект уÑтановщика пуÑÑ‚.</translation> </message> <message> <source>Can not write license file: %1.</source> @@ -1312,28 +1638,13 @@ Error while loading %2</source> <source>exactly 3</source> <translation>ровно 3</translation> </message> -</context> -<context> - <name>QInstaller::MacReplaceInstallNamesOperation</name> <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> - </message> - <message> - <source>at least 3</source> - <translation>по крайней мере 3</translation> - </message> - <message> - <source>One of the given arguments is empty. Argument1=%1; Argument2=%2, Argument3=%3</source> - <translation>Один из переданных параметров пуÑтой. Параметр1=%1; Параметр2=%2; Параметр3=%3</translation> - </message> - <message> - <source>Cannot run otool. Is Xcode installed?</source> - <translation>Ðе удалоÑÑŒ запуÑтить otool. Xcode уÑтановлен?</translation> + <source>Failed to open '%1' for reading.</source> + <translation>Сбой Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Â«%1» на чтение.</translation> </message> <message> - <source>Cannot start process %0.</source> - <translation>Ðе удалоÑÑŒ запуÑтить процеÑÑ %0.</translation> + <source>Failed to open '%1' for writing.</source> + <translation>Сбой Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Â«%1» на запиÑÑŒ.</translation> </message> </context> <context> @@ -1351,6 +1662,14 @@ Error while loading %2</source> <translation>Загрузка метаданных отменена.</translation> </message> <message> + <source>Missing proxy credentials.</source> + <translation>ПрокÑи-Ñерверу требуетÑÑ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ.</translation> + </message> + <message> + <source>Authentication failed.</source> + <translation>Ошибка аутентификации.</translation> + </message> + <message> <source>Unknown exception during download.</source> <translation>Возникло неизвеÑтное иÑключение во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸.</translation> </message> @@ -1386,8 +1705,8 @@ Error while loading %2</source> <context> <name>QInstaller::PackageManagerCore</name> <message> - <source>Error writing Uninstaller</source> - <translation>Ошибка запиÑи программы удалениÑ</translation> + <source>Error writing Maintenance Tool</source> + <translation>Ошибка запиÑи Maintenance Tool</translation> </message> <message> <source> @@ -1440,6 +1759,10 @@ Downloading packages...</source> <translation>ДоÑтупно важное иÑправление, Ñначала запуÑтите программу обновлениÑ.</translation> </message> <message> + <source>Error while elevating access rights.</source> + <translation>Ошибка при попытке повыÑить уровень доÑтупа.</translation> + </message> + <message> <source>Error</source> <translation>Ошибка</translation> </message> @@ -1455,22 +1778,6 @@ Downloading packages...</source> <translation>Ошибка</translation> </message> <message> - <source>Component(s) added as automatic dependencies</source> - <translation>Компоненты были добавлены как автоматичеÑкие завиÑимоÑти</translation> - </message> - <message> - <source>Added as dependency for %1.</source> - <translation>Добавлен как завиÑимоÑÑ‚ÑŒ Ð´Ð»Ñ %1.</translation> - </message> - <message> - <source>Component(s) that have resolved Dependencies</source> - <translation>Компоненты, которые избавлены от завиÑимоÑтей</translation> - </message> - <message> - <source>Selected Component(s) without Dependencies</source> - <translation>Выбранные компоненты без завиÑимоÑтей</translation> - </message> - <message> <source>Access error</source> <translation>Ошибка доÑтупа</translation> </message> @@ -1499,37 +1806,6 @@ Downloading packages...</source> <translation>УÑтановка отменена пользователем</translation> </message> <message> - <source>Writing uninstaller.</source> - <translation>ЗапиÑÑŒ программы удалениÑ.</translation> - </message> - <message> - <source>Uninstaller is not a bundle</source> - <translation>Программа ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ ÑвлÑетÑÑ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼ приложениÑ</translation> - </message> - <message> - <source>Could not write uninstaller data to %1: %2</source> - <translation>Ðевозможно запиÑать данные программы ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð² %1: %2</translation> - </message> - <message> - <source>Could not write uninstaller to %1: %2</source> - <translation>Ðевозможно запиÑать программу ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð² %1: %2</translation> - </message> - <message> - <source>Found a binary data file, but we are the installer and we should read the binary resource from our very own binary!</source> - <translation variants="yes"> - <lengthvariant>Ðайден бинарный файл Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸, но программа уÑтановки может читать бинарные файлы только из ÑобÑтвенного иÑполнÑемого файла!</lengthvariant> - <lengthvariant></lengthvariant> - </translation> - </message> - <message> - <source>Could not write uninstaller binary data to %1: %2</source> - <translation>Ðевозможно запиÑать бинарные данные программы ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð² %1: %2</translation> - </message> - <message> - <source>ProductName should be set</source> - <translation>Ðеобходимо задать ProductName</translation> - </message> - <message> <source>Variable 'TargetDir' not set.</source> <translation>ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ 'TargetDir' не определена.</translation> </message> @@ -1546,10 +1822,6 @@ Downloading packages...</source> <translation>СоздаётÑÑ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ репозиторий</translation> </message> <message> - <source>Creating Uninstaller</source> - <translation>Создание программы удалениÑ</translation> - </message> - <message> <source> Installation finished!</source> <translation> @@ -1582,16 +1854,48 @@ Update aborted!</source> Обновление прервано!</translation> </message> <message> - <source> -Uninstallation completed successfully!</source> - <translation> -Удаление уÑпешно завершено!</translation> + <source>Unresolved dependencies</source> + <translation>Ðеразрешённые завиÑимоÑти</translation> </message> <message> - <source> -Uninstallation aborted!</source> - <translation> -Удаление прервано!</translation> + <source>Writing maintenance tool.</source> + <translation>ЗапиÑÑŒ Maintenance Tool.</translation> + </message> + <message> + <source>Failed to seek in file %1: %2</source> + <translation>Сбой поиÑка в файле %1: %2</translation> + </message> + <message> + <source>Maintenance tool is not a bundle</source> + <translation>Maintenance Tool не ÑвлÑетÑÑ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼</translation> + </message> + <message> + <source>Could not write maintenance tool data to %1: %2</source> + <translation>Ðе удалоÑÑŒ запиÑать данные Maintenance Tool в %1: %2</translation> + </message> + <message> + <source>Could not remove data file '%1': %2</source> + <translation>Ðе удалоÑÑŒ удалить файл данных «%1»: %2</translation> + </message> + <message> + <source>Could not write maintenance tool to %1: %2</source> + <translation>Ðе удалоÑÑŒ запиÑать Maintenance Tool в %1: %2</translation> + </message> + <message> + <source>Could not write maintenance tool binary data to %1: %2</source> + <translation>Ðе удалоÑÑŒ запиÑать двоичные данные Maintenance Tool в %1: %2</translation> + </message> + <message> + <source>Creating Maintenance Tool</source> + <translation>Создание Maintenance Tool</translation> + </message> + <message> + <source>Uninstallation completed successfully.</source> + <translation>Удаление уÑпешно завершено.</translation> + </message> + <message> + <source>Uninstallation aborted.</source> + <translation>Удаление прервано.</translation> </message> <message> <source> @@ -1738,72 +2042,35 @@ Please copy the installer to a local drive</source> </message> </context> <context> - <name>QInstaller::QtPatchOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> - </message> - <message> - <source>3 or 4</source> - <translation>3 или 4</translation> - </message> - <message> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>ОтÑутÑтвует необходимый объект уÑтановщика в операции «%1».</translation> - </message> + <name>QInstaller::ProxyCredentialsDialog</name> <message> - <source>First argument should be 'linux', 'mac' or 'windows'. No other type is supported at this time.</source> - <translation>Первым Ñлементом должен быть «linux», «mac» или «windows». Другие типы в наÑтоÑщий момент не поддерживаютÑÑ.</translation> - </message> - <message> - <source>Could not find the needed QmakeOutputInstallerKey(%1) value on the installer object. The ConsumeOutput operation on the valid qmake needs to be called first.</source> - <translation>Ðевозможно найти значение QmakeOutputInstallerKey(%1) в объекте уÑтановщика. Сначала должна быть выполнена Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ ConsumeOutput Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ qmake'а.</translation> + <source>Dialog</source> + <translation></translation> </message> <message> - <source>QMake from the current Qt version -(%1)is not existing. Please file a bugreport with this dialog at https://bugreports.qt-project.org.</source> - <translation>ОтÑутÑтвует QMake из текущей верÑии Qt -(%1). ПожалуйÑта, отправьте Ñообщение об ошибке, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ„Ð¾Ñ€Ð¼Ñƒ на вебÑайте https://bugreports.qt-project.org.</translation> + <source>The proxy %1 requires a username and password.</source> + <translation>ПрокÑи %1 требует Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ пароль.</translation> </message> <message> - <source>The output of -%1 -query -is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. -output: "%2"</source> - <translation>Ðевозможно разобрать вывод запроÑа %1. -ПожалуйÑта, отправьте Ñообщение об ошибке, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ„Ð¾Ñ€Ð¼Ñƒ на вебÑайте https://bugreports.qt-project.org. -вывод: «%2»</translation> + <source>Username:</source> + <translation>ИмÑ:</translation> </message> <message> - <source>Qt patch error: new Qt dir(%1) -needs to be less than 255 characters.</source> - <translation>Ошибка патча Qt. Ðовый каталог Qt (%1) -должен Ñодержать менее 255 Ñимволов в имени.</translation> + <source>Username</source> + <translation>Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ</translation> </message> <message> - <source>Qt patch error: Can not open %1.(%2)</source> - <translation>Ошибка внеÑÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ в Qt. Ðевозможно открыть %1.(%2)</translation> + <source>Password:</source> + <translation>Пароль:</translation> </message> <message> - <source>The installer was not able to get the unpatched path from -%1.(maybe it is broken or removed) -It tried to patch the Qt binaries, but all other files in Qt are unpatched. -This could result in a broken Qt version. -Sometimes it helps to restart the installer with a switched off antivirus software.</source> - <translation>Программе уÑтановки не удалоÑÑŒ получить иÑходный путь -из %1.(Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°: файл повреждён или удалён) -СиÑтема предпринÑла попытку иÑправить бинарные файлы Qt; при Ñтом вÑе прочие файлы оÑталиÑÑŒ в иÑходном виде. -Ðта ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ привеÑти к повреждению Qt. -Попробуйте отключить антивируÑную программу и Ñнова запуÑтить программу-уÑтановщик.</translation> + <source>Password</source> + <translation>Пароль</translation> </message> </context> <context> <name>QInstaller::ReadyForInstallationPage</name> <message> - <source>&Show Details</source> - <translation>&Показать подробноÑти</translation> - </message> - <message> <source>U&ninstall</source> <translation>У&далить</translation> </message> @@ -1860,16 +2127,16 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <translation>Ðа выбранном Вами диÑке доÑтаточно меÑта Ð´Ð»Ñ ÑƒÑтановки. Тем не менее, поÑле Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ ÑƒÑтановки на диÑке оÑтанетÑÑ Ð¼ÐµÐ½ÑŒÑˆÐµ 100 МБ Ñвободного меÑта. %1</translation> </message> <message> - <source>Can not resolve all dependencies!</source> - <translation>Ðевозможно разрешить вÑе завиÑимоÑти!</translation> + <source>Installation will use %1 of disk space.</source> + <translation>Ð”Ð»Ñ ÑƒÑтановки потребуетÑÑ %1 диÑкового проÑтранÑтва.</translation> </message> <message> - <source>Components about to be removed.</source> - <translation>Компоненты готовы к удалению.</translation> + <source>Cannot resolve all dependencies.</source> + <translation>Ðевозможно разрешить вÑе завиÑимоÑти.</translation> </message> <message> - <source>&Hide Details</source> - <translation>&Скрыть подробноÑти</translation> + <source>Components about to be removed.</source> + <translation>Компоненты готовы к удалению.</translation> </message> </context> <context> @@ -1883,11 +2150,29 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <translation>от 2 до 5</translation> </message> <message> + <source>Registering file types is only supported on Windows.</source> + <translation>РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‚Ð¸Ð¿Ð¾Ð² файлов возможна только в Windows.</translation> + </message> + <message> <source>Register File Type: Invalid arguments</source> <translation>РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‚Ð¸Ð¿Ð¾Ð² файлов: недопуÑтимые параметры</translation> </message> </context> <context> + <name>QInstaller::RemoteObject</name> + <message> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>Ðе удалоÑÑŒ прочитать вÑе данные поÑле отправки команды: %1. ОжидалоÑÑŒ байт: %2; получено байт: %3. Ошибка: %4</translation> + </message> +</context> +<context> + <name>QInstaller::RemoteServerConnection</name> + <message> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>Ðе удалоÑÑŒ прочитать вÑе данные поÑле отправки команды: %1. ОжидалоÑÑŒ байт: %2; получено байт: %3. Ошибка: %4</translation> + </message> +</context> +<context> <name>QInstaller::ReplaceOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> @@ -1897,6 +2182,29 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <source>exactly 3</source> <translation>ровно 3</translation> </message> + <message> + <source>Failed to open %1 for reading</source> + <translation>Сбой Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° %1 на чтение</translation> + </message> + <message> + <source>Failed to open %1 for writing</source> + <translation>Сбой Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° %1 на запиÑÑŒ</translation> + </message> +</context> +<context> + <name>QInstaller::Resource</name> + <message> + <source>Could not open Resource '%1' read-only.</source> + <translation>Ðе удалоÑÑŒ открыть на чтение реÑÑƒÑ€Ñ Â«%1».</translation> + </message> + <message> + <source>Read failed after %1 bytes: %2</source> + <translation>Сбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ %1 байта: %2</translation> + </message> + <message> + <source>Write failed after %1 bytes: %2</source> + <translation>Сбой запиÑи Ñ %1 байта: %2</translation> + </message> </context> <context> <name>QInstaller::RestartPage</name> @@ -1909,26 +2217,18 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <name>QInstaller::ScriptEngine</name> <message> <source>Could not open the requested script file at %1: %2.</source> - <translation>Ðевозможно открыть файл ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ %1: %2.</translation> - </message> - <message> - <source>Exception while loading the component script: '%1'</source> - <translation>Возникло иÑключение при загрузке компонента ÑценариÑ: «%1»</translation> - </message> - <message> - <source>Could not load the component script inside a script context: '%1'</source> - <translation>Ðевозможно загрузить компонент ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ контекÑта ÑценариÑ: «%1»</translation> + <translation>Ðе удалоÑÑŒ открыть файл ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ %1: %2.</translation> </message> <message> - <source>Fatal error while evaluating a script.</source> - <translation>Произошла неиÑÐ¿Ñ€Ð°Ð²Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при выполнении ÑценариÑ.</translation> + <source>Exception while loading the component script '%1'. (%2)</source> + <translation>Возникло иÑключение при загрузке ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð° «%1». (%2)</translation> </message> </context> <context> <name>QInstaller::SelfRestartOperation</name> <message> <source>Installer object needed in '%1' operation is empty.</source> - <translation>ОтÑутÑтвует необходимый объект программы уÑтановки в операции «%1».</translation> + <translation>Ð’ операции «%1» необходимый объект уÑтановщика пуÑÑ‚.</translation> </message> <message> <source>Self Restart: Only valid within updater or packagemanager mode.</source> @@ -1940,30 +2240,26 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa </message> </context> <context> - <name>QInstaller::SetQtCreatorValueOperation</name> + <name>QInstaller::ServerAuthenticationDialog</name> <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> - </message> - <message> - <source>exactly 4</source> - <translation>ровно 4</translation> + <source>Server Requires Authentication</source> + <translation>Сервер требует аутентификации</translation> </message> <message> - <source> (rootInstallPath, group, key, value)</source> - <translation> (корневой каталог уÑтановки, группа, ключ, значение)</translation> + <source>You need to supply a username and password to access this site.</source> + <translation>Сайт требует ввеÑти Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ пароль.</translation> </message> <message> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>ОтÑутÑтвует необходимый объект программы уÑтановки в операции «%1».</translation> + <source>Username:</source> + <translation>ИмÑ:</translation> </message> <message> - <source>There is no value set for '%1' on the installer object.</source> - <translation>ОтÑутÑтвует значение Ñлемента «%1» в объекте программы уÑтановки.</translation> + <source>Password:</source> + <translation>Пароль:</translation> </message> <message> - <source>Needed installer object in '%1' operation is empty.</source> - <translation>ОтÑутÑтвует необходимый объект программы уÑтановки в операции «%1».</translation> + <source>%1 at %2</source> + <translation>%1 в %2</translation> </message> </context> <context> @@ -1992,11 +2288,11 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <translation>Ð’Ñе аргументы должны быть непуÑтыми: иÑточник «%1», назначение «%2».</translation> </message> <message> - <source>Can not move source '%1' to target '%2', because target exists and is not removable.</source> - <translation>Ðевозможно перемеÑтить «%1» в «%2», потому что файл Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑущеÑтвует и не может быть удалён.</translation> + <source>Cannot move source '%1' to target '%2', because target exists and is not removable.</source> + <translation>Ðевозможно перемеÑтить «%1» в «%2»: файл Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑущеÑтвует и не может быть удалён.</translation> </message> <message> - <source>Can not move source '%1' to target '%2': %3</source> + <source>Cannot move source '%1' to target '%2': %3</source> <translation>Ðевозможно перемеÑтить «%1» в «%2»: «%3»</translation> </message> <message> @@ -2036,24 +2332,66 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <translation>О&бзор...</translation> </message> <message> - <source>Error</source> - <translation>Ошибка</translation> + <source>The folder you selected already exists and contains an installation. Choose a different target for installation.</source> + <translation>Выбранный каталог ÑущеÑтвует и Ñодержит уÑтановленное приложение. Выберите другой каталог.</translation> </message> <message> - <source>The install directory cannot be empty, please specify a valid folder.</source> - <translation>Каталог уÑтановки не может быть пуÑтым, выберите другой каталог.</translation> + <source>You have selected an existing, non-empty folder for installation. +Note that it will be completely wiped on uninstallation of this application. +It is not advisable to install into this folder as installation might fail. +Do you want to continue?</source> + <translation>Каталог, выбранный Ð´Ð»Ñ ÑƒÑтановки приложениÑ, уже Ñодержит файлы. +Он будет Ñтёрт вмеÑте Ñо вÑем Ñодержимым при удалении приложениÑ. +Производить уÑтановку в Ñтот каталог не рекомендуетÑÑ, так как не иÑключён Ñбой. +Продолжить?</translation> </message> <message> - <source>As the install directory is completely deleted on uninstall, installing in %1 is forbidden.</source> - <translation>УÑтановка в %1 запрещена, так как уÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ñтью удалена во Ð²Ñ€ÐµÐ¼Ñ Ð´ÐµÐ¸Ð½ÑталлÑции.</translation> + <source>You have selected an existing file or symlink, please choose a different target for installation.</source> + <translation>Выбранный файл или ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÑылка уже ÑущеÑтвует. Выберите другой каталог уÑтановки.</translation> </message> <message> - <source>Warning</source> - <translation>Предупреждение</translation> + <source>The installation path cannot be empty, please specify a valid folder.</source> + <translation>Ðеобходимо задать путь к каталогу уÑтановки. Выберите подходÑщий каталог.</translation> + </message> + <message> + <source>The installation path cannot be relative, please specify an absolute path.</source> + <translation>Путь к каталогу уÑтановки не может быть отноÑительным. Задайте абÑолютный путь.</translation> + </message> + <message> + <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> + <translation>Ð’ Ñтроке пути или в имени каталога уÑтановки ÑодержитÑÑ Ñимвол, не отноÑÑщийÑÑ Ðº ASCII. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñ‚Ð°ÐºÐ¸Ðµ Ñимволы не поддерживаютÑÑ. Выберите другой путь или каталог уÑтановки.</translation> + </message> + <message> + <source>As the install directory is completely deleted, installing in %1 is forbidden.</source> + <translation>УÑтановка в %1 запрещена, так как каталог уÑтановки полноÑтью удалён.</translation> + </message> + <message> + <source>The path you have entered is too long, please make sure to specify a valid path.</source> + <translation>Введённый путь Ñлишком длинный, введите корректный путь.</translation> + </message> + <message> + <source>The path you have entered is not valid, please make sure to specify a valid target.</source> + <translation>Введён неверный путь, проверьте правильноÑÑ‚ÑŒ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿ÑƒÑ‚Ð¸ к каталогу.</translation> </message> <message> - <source>You have selected an existing, non-empty folder for installation. Note that it will be completely wiped on uninstallation of this application. It is not advisable to install into this folder as installation might fail. Do you want to continue?</source> - <translation>Выбранный Ð´Ð»Ñ ÑƒÑтановки каталог не пуÑÑ‚. Он будет полноÑтью очищен при удалении Ñтого приложениÑ. Ðе рекомендуетÑÑ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ уÑтановку в Ñтот каталог, так как не иÑключён Ñбой. Продолжить?</translation> + <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> + <translation>Указан неверный путь, проверьте Ð¸Ð¼Ñ Ð´Ð¸Ñка.</translation> + </message> + <message> + <source>The installation path must not end with '.', please specify a valid folder.</source> + <translation>Путь к каталогу уÑтановки не может оканчиватьÑÑ Ñ‚Ð¾Ñ‡ÐºÐ¾Ð¹. Выберите другой каталог.</translation> + </message> + <message> + <source>The installation path must not contain '%1', please specify a valid folder.</source> + <translation>Путь к каталогу уÑтановки не может Ñодержать «%1». Выберите другой каталог.</translation> + </message> + <message> + <source>Error</source> + <translation>Ошибка</translation> + </message> + <message> + <source>Warning</source> + <translation>Предупреждение</translation> </message> <message> <source>Select Installation Folder</source> @@ -2088,25 +2426,10 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa </message> </context> <context> - <name>QInstallerCreator::Archive</name> - <message> - <source>Could not open archive file %1 for reading.</source> - <translation>Ðевозможно открыть архив %1 на чтение.</translation> - </message> - <message> - <source>Could not create archive from %1: Not a file.</source> - <translation>Ðевозможно Ñоздать архив из %1: Ðе ÑвлÑетÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð¼.</translation> - </message> - <message> - <source>Error while packing directory at %1</source> - <translation>Ошибка при архивировании каталога в %1</translation> - </message> -</context> -<context> <name>QObject</name> <message> <source>Authorization required</source> - <translation>ТребуетÑÑ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ</translation> + <translation>ТребуетÑÑ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ</translation> </message> <message> <source>Enter your password to authorize for sudo:</source> @@ -2116,355 +2439,91 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <source>Error acquiring admin rights</source> <translation>Ошибка при попытке Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð°Ð² админиÑтратора</translation> </message> +</context> +<context> + <name>QtPatchOperation</name> <message> - <source>No marker found, stopped after %1.</source> - <translation>Маркёр не найден, оÑтановлено поÑле %1.</translation> - </message> - <message> - <source>Cannot create zipped file for path %1: %2</source> - <translation>Ðевозможно Ñоздать файл zip-архива в каталоге %1: %2</translation> - </message> - <message> - <source>Could not seek to in-binary resource. (offset: %1, length: %2)</source> - <translation>ПоиÑк внедрённого реÑурÑа невозможен. (отÑтуп: %1, длина: %2)</translation> - </message> - <message> - <source>Could not register in-binary resource.</source> - <translation>Ðевозможно зарегиÑтрировать реÑÑƒÑ€Ñ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ бинарного файла.</translation> - </message> - <message> - <source>Could not open binary %1: %2</source> - <translation>Ðевозможно открыть двоичный файл %1: %2</translation> - </message> - <message> - <source>Could not seek to binary layout section.</source> - <translation>ПоиÑк раздела двоичного шаблона невозможен.</translation> - </message> - <message> - <source>Could not seek to metadata index.</source> - <translation>ПоиÑк индекÑа метаданных невозможен.</translation> - </message> - <message> - <source>Could not seek to operation list.</source> - <translation>ПоиÑк ÑпиÑка операций невозможен.</translation> - </message> - <message> - <source>Could not seek to component index information.</source> - <translation>ПоиÑк данных о компоненте индекÑа невозможен.</translation> - </message> - <message> - <source>Could not seek to component index.</source> - <translation>ПоиÑк компонента индекÑа невозможен.</translation> - </message> - <message> - <source>Could not backup file %1</source> - <translation>Ðевозможно Ñоздать резервную копию файла %1</translation> - </message> - <message> - <source>Could not delete file %1</source> - <translation>Ðевозможно удалить файл %1</translation> - </message> - <message> - <source>Could not restore backup file into %1</source> - <translation>Ðевозможно воÑÑтановить резервную копию в %1</translation> - </message> - <message> - <source>Could not create link from %1 to %2.</source> - <translation>Ðевозможно Ñоздать ÑÑылку Ñ %1 на %2.</translation> - </message> - <message> - <source>Could not remove link from %1 to %2.</source> - <translation>Ðевозможно Ñоздать ÑÑылку Ñ %1 на %2.</translation> - </message> - <message> - <source>Could not remove file %1: %2</source> - <translation>Ðевозможно удалить файл %1: %2</translation> - </message> - <message> - <source>Failed to overwrite %1: %2</source> - <translation>Ðе удалоÑÑŒ перезапиÑать %1: %2</translation> - </message> - <message> - <source>Registry path %1 is not writable</source> - <translation>Ðевозможно запиÑать в рееÑÑ‚Ñ€ по пути %1</translation> - </message> - <message> - <source>Could not write to registry path %1</source> - <translation>Ðевозможно запиÑать в рееÑÑ‚Ñ€ по пути %1</translation> - </message> - <message> - <source>Cannot open file %1 for reading: %2</source> - <translation>Ðевозможно открыть файл %1 на чтение: %2</translation> - </message> - <message> - <source>Cannot open file %1 for writing: %2</source> - <translation>Ðевозможно открыть файл %1 на запиÑÑŒ: %2</translation> - </message> - <message> - <source>Write failed after %1 bytes: %2</source> - <translation>Ðе удалоÑÑŒ запиÑать поÑле %1 байт: %2</translation> - </message> - <message> - <source>Read failed after %1 bytes: %2</source> - <translation>Ðе удалоÑÑŒ прочитать поÑле %1 байт: %2</translation> - </message> - <message> - <source>Could not remove folder %1: %2</source> - <translation>Ðевозможно удалить каталог %1: %2</translation> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>ÐедопуÑтимое количеÑтво параметров в %0: передано %1, требуетÑÑ %2%3.</translation> </message> <message> - <source>Could not create folder %1</source> - <translation>Ðевозможно Ñоздать каталог %1</translation> + <source>3 or 4</source> + <translation>3 или 4</translation> </message> <message> - <source>Could not copy file from %1 to %2: %3</source> - <translation>Ðевозможно Ñкопироватьфайл из %1 в %2: %3</translation> + <source>Needed installer object in "%1" operation is empty.</source> + <translation>Ð’ операции «%1» необходимый объект уÑтановщика пуÑÑ‚.</translation> </message> <message> - <source>Could not move file from %1 to %2: %3</source> - <translation>Ðевозможно перемеÑтить файл из %1 в %2: %3</translation> + <source>First argument should be 'linux', 'mac' or 'windows'. No other type is supported at this time.</source> + <translation>Первым Ñлементом должен быть «linux», «mac» или «windows». Другие типы в наÑтоÑщий момент не поддерживаютÑÑ.</translation> </message> <message> - <source>Could not create folder %1: %2</source> - <translation>Ðевозможно Ñоздать каталог %1: %2</translation> + <source>Could not find the needed QmakeOutputInstallerKey(%1) value on the installer object. The ConsumeOutput operation on the valid qmake needs to be called first.</source> + <translation>Ðе удалоÑÑŒ найти значение QmakeOutputInstallerKey(%1) в объекте уÑтановщика. Сначала должна быть выполнена Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ ConsumeOutput Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ qmake'а.</translation> </message> <message> - <source>Could not open temporary file: %1</source> - <translation>Ðевозможно открыть временный файл %1</translation> + <source>QMake from the current Qt version +(%1)is not existing. Please file a bugreport with this dialog at https://bugreports.qt-project.org.</source> + <translation>ОтÑутÑтвует QMake в текущем профиле Qt +(%1). ПожалуйÑта, отправьте Ñообщение об ошибке, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ„Ð¾Ñ€Ð¼Ñƒ на вебÑайте https://bugreports.qt-project.org.</translation> </message> <message> - <source>Could not open temporary file for template %1: %2</source> - <translation>Ðевозможно открыть временный файл шаблона %1: %2</translation> + <source>The output of +%1 -query +is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. +output: "%2"</source> + <translation>Ðевозможно разобрать вывод запроÑа %1. +ПожалуйÑта, отправьте Ñообщение об ошибке, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ„Ð¾Ñ€Ð¼Ñƒ на вебÑайте https://bugreports.qt-project.org. +вывод: «%2»</translation> </message> <message> - <source>Could not create temporary directory at %1: %2</source> - <translation>Ðе удалоÑÑŒ Ñоздать временный каталог в %1: %2</translation> + <source>Qt patch error: new Qt dir(%1) +needs to be less than 255 characters.</source> + <translation>Ошибка патча Qt. Ðовый каталог Qt (%1) +должен Ñодержать менее 255 Ñимволов в имени.</translation> </message> <message> - <source>Could not create temporary directory at %1: unknown error</source> - <translation>Ðе удалоÑÑŒ Ñоздать временный каталог в %1: неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°</translation> + <source>Qt patch error: Can not open %1.(%2)</source> + <translation>Ошибка внеÑÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ в Qt. Ðевозможно открыть %1.(%2)</translation> </message> <message> - <source>Authorization Error</source> - <translation>Ошибка авторизации</translation> + <source>The installer was not able to get the unpatched path from +%1.(maybe it is broken or removed) +It tried to patch the Qt binaries, but all other files in Qt are unpatched. +This could result in a broken Qt version. +Sometimes it helps to restart the installer with a switched off antivirus software.</source> + <translation>Программе уÑтановки не удалоÑÑŒ получить иÑходный путь +из %1.(Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°: файл повреждён или удалён) +СиÑтема предпринÑла попытку иÑправить бинарные файлы Qt; при Ñтом вÑе прочие файлы оÑталиÑÑŒ в иÑходном виде. +Ðта ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ привеÑти к повреждению Qt. +Попробуйте отключить антивируÑную программу и Ñнова запуÑтить программу-уÑтановщик.</translation> </message> +</context> +<context> + <name>RemoteClient</name> <message> <source>Could not get authorization.</source> <translation>Ðе удалоÑÑŒ авторизоватьÑÑ.</translation> </message> <message> <source>Could not get authorization that is needed for continuing the installation. -Either abort the installation or use the fallback solution by running + Either abort the installation or use the fallback solution by running + %1 -as root and then clicking ok.</source> + +as root and then clicking OK.</source> <translation>Ðе удалоÑÑŒ пройти авторизацию, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð° Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ ÑƒÑтановки. -Ð’Ñ‹ можете либо прервать уÑтановку, либо попытатьÑÑ ÑƒÑтранить проблему запуÑтив +Можно прервать уÑтановку или попытатьÑÑ ÑƒÑтранить проблему запуÑтив %1 от имени root'а и нажав ОК.</translation> </message> +</context> +<context> + <name>ResourceCollectionManager</name> <message> - <source>Invalid Argument: source folder must not be empty.</source> - <translation>ÐедопуÑтимый параметр: каталог Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð½Ðµ может быть пуÑтым.</translation> - </message> - <message> - <source>Could not backup file %1: %2</source> - <translation>Ðевозможно Ñоздать резервную копию файла %1: %2</translation> - </message> - <message> - <source>Failed to copy file %1: %2</source> - <translation>Ðе удалоÑÑŒ Ñкопировать %1: %2</translation> - </message> - <message> - <source>Could not create folder at %1: %2</source> - <translation>Ðевозможно удалить каталог в %1: %2</translation> - </message> - <message> - <source>Path exists but is not a folder: %1</source> - <translation>Путь ÑущеÑтвует, но ведёт не к каталогу: %1</translation> - </message> - <message> - <source>Could not create folder: %1</source> - <translation>Ðевозможно Ñоздать каталог: %1</translation> - </message> - <message> - <source>Could not create temporary file</source> - <translation>Ðевозможно Ñоздать временный файл</translation> - </message> - <message> - <source>Could not retrieve property %1 for item %2</source> - <translation>Ðевозможно определить ÑвойÑтво %1 Ð´Ð»Ñ Ñлемента %2</translation> - </message> - <message> - <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> - <translation>СвойÑтво %1 Ñдемента %2 отноÑитÑÑ Ð½Ðµ к типу VT_FILETIME, а к %3</translation> - </message> - <message> - <source>Could not convert file time to local time</source> - <translation>Ðевозможно преобразовать Ð²Ñ€ÐµÐ¼Ñ Ñ„Ð°Ð¹Ð»Ð° в локальное времÑ</translation> - </message> - <message> - <source>Could not convert local file time to system time</source> - <translation>Ðевозможно преобразовать Ð²Ñ€ÐµÐ¼Ñ Ñ„Ð°Ð¹Ð»Ð° в ÑиÑтемное времÑ</translation> - </message> - <message> - <source>No device set for output stream</source> - <translation>Ðе задан QIODevice Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÐ° вывода</translation> - </message> - <message> - <source>Could not load codecs</source> - <translation>Ðевозможно загрузить кодеки</translation> - </message> - <message> - <source>Could not retrieve default format</source> - <translation>Ðевозможно определить формат по умолчанию</translation> - </message> - <message> - <source>Could not open archive</source> - <translation>Ðевозможно открыть архив</translation> - </message> - <message> - <source>No CArc found</source> - <translation>CArc не найден</translation> - </message> - <message> - <source>Could not retrieve number of items in archive</source> - <translation>Ðевозможно определить количеÑтво файлов в архиве</translation> - </message> - <message> - <source>Could not retrieve path of archive item %1</source> - <translation>Ðевозможно определить путь файла %1 в архиве</translation> - </message> - <message> - <source>Unknown exception caught (%1)</source> - <translation>Возникло неизвеÑтное иÑключение (%1)</translation> - </message> - <message> - <source>Failed</source> - <translation>Ðе удалоÑÑŒ</translation> - </message> - <message> - <source>Could not remove already existing symlink. %1</source> - <translation>Ðевозможно удалить ÑущеÑтвующую Ñимвольную ÑÑылку. %1</translation> - </message> - <message> - <source>Could not open file: %1 (%2)</source> - <translation>Ðевозможно открыть файл: %1 (%2)</translation> - </message> - <message> - <source>Could not create symlink at '%1'. Another one is already existing.</source> - <translation>Ðевозможно Ñоздать Ñимвольную ÑÑылку «%1», потому что ÑÑылка уже ÑущеÑтвует.</translation> - </message> - <message> - <source>Could not read symlink target from file '%1'.</source> - <translation>Ðевозможно прочитать цель Ñимвольной ÑÑылки из файла «%1».</translation> - </message> - <message> - <source>Could not create symlink at %1. %2</source> - <translation>Ðевозможно Ñоздать Ñимвольную ÑÑылку %1. %2</translation> - </message> - <message> - <source>internal code: %1</source> - <translation>внутренний код ошибки: %1</translation> - </message> - <message> - <source>not enough memory</source> - <translation>недоÑтаточно памÑти</translation> - </message> - <message> - <source>Error: %1</source> - <translation>Ошибка: %1</translation> - </message> - <message> - <source>Could not create archive %1. %2</source> - <translation>Ðевозможно Ñоздать архив %1. %2</translation> - </message> - <message> - <source>Error while extracting '%1': %2</source> - <translation>Ошибка при извлечении «%1»: %2</translation> - </message> - <message> - <source>CArc index %1 out of bounds [0, %2]</source> - <translation>Ð˜Ð½Ð´ÐµÐºÑ CArc %1 вне лимитов [0, %2]</translation> - </message> - <message> - <source>Item index %1 out of bounds [0, %2]</source> - <translation>Ð˜Ð½Ð´ÐµÐºÑ Ñ„Ð°Ð¹Ð»Ð° %1 вне лимитов [0, %2]</translation> - </message> - <message> - <source>Could not create output file for writing: %1</source> - <translation>Ðевозможно Ñоздать выходной файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %1</translation> - </message> - <message> - <source>Invalid arguments: %1 arguments given, %2 to %3 expected.</source> - <translation>ÐедопуÑтимое количеÑтво параметров: передано %1, требуетÑÑ Ð¾Ñ‚ %2 до %3.</translation> - </message> - <message> - <source>Invalid arguments: %1 arguments given, %2 expected.</source> - <translation>ÐедопуÑтимое количеÑтво параметров: передано %1, требуетÑÑ %2.</translation> - </message> - <message> - <source>Error while elevating access rights.</source> - <translation>Ошибка при попытке повыÑить уровень доÑтупа.</translation> - </message> - <message> - <source>Failed to seek in file %1: %2</source> - <translation>ПоиÑк в файле %1 не удалÑÑ: %2</translation> - </message> - <message> - <source>Registering file types is only supported on Windows.</source> - <translation>РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‚Ð¸Ð¿Ð¾Ð² файлов возможна только в ОС Windows.</translation> - </message> - <message> - <source>Failed to open %1 for reading</source> - <translation>Ðе удалоÑÑŒ открыть файл %1 на чтение</translation> - </message> - <message> - <source>Failed to open %1 for writing</source> - <translation>Ðе удалоÑÑŒ открыть файл %1 на запиÑÑŒ</translation> - </message> - <message> - <source>Could not create lock file %1: %2</source> - <translation>Ðевозможно Ñоздать файл блокировки %1: %2</translation> - </message> - <message> - <source>Could not write PID to lock file %1: %2</source> - <translation>Ðевозможно запиÑать PID в файл блокировки %1: %2</translation> - </message> - <message> - <source>Could not lock lock file %1: %2</source> - <translation>Ðевозможно заблокировать файл блокировки %1: %2</translation> - </message> - <message> - <source>Could not unlock lock file %1: %2</source> - <translation>Ðевозможно разблокировать файл блокировки %1: %2</translation> - </message> - <message> - <source>Failed to seek in file %1. Reason: %2.</source> - <translation>ПоиÑк в файле %1 не удалÑÑ. Причина: %2.</translation> - </message> - <message> - <source>Failed to open '%1' for reading.</source> - <translation>Ðевозможно открыть «%1» на чтение.</translation> - </message> - <message> - <source>Failed to open '%1' for writing.</source> - <translation>Ðевозможно открыть «%1» на запиÑÑŒ.</translation> - </message> - <message> - <source>Number of arguments does not match: one is required</source> - <translation>КоличеÑтво аргументов не Ñовпадает: требуетÑÑ 1</translation> - </message> - <message> - <source>Could not get package manager core.</source> - <translation>Ðевозможно получить Ñдро менеджера пакетов.</translation> - </message> - <message> - <source>This process should be stopped before continuing: %1</source> - <translation>Перед продолжением необходимо завершить процеÑÑ %1</translation> - </message> - <message> - <source>These processes should be stopped before continuing: %1</source> - <translation>Перед продолжением необходимо завершить Ñти процеÑÑÑ‹: %1</translation> + <source>Could not open resource %1: %2</source> + <translation>Ðе удалоÑÑŒ открыть реÑÑƒÑ€Ñ %1: %2</translation> </message> </context> <context> @@ -2505,26 +2564,10 @@ as root and then clicking ok.</source> <translation>Порт:</translation> </message> <message> - <source>HTTP proxy requires authentication</source> - <translation>Ð”Ð»Ñ Ð´Ð¾Ñтупа к HTTP прокÑи необходима аутентификациÑ</translation> - </message> - <message> - <source>Username:</source> - <translation>Логин:</translation> - </message> - <message> - <source>Password:</source> - <translation>Пароль:</translation> - </message> - <message> <source>FTP proxy:</source> <translation>FTP прокÑи-Ñервер:</translation> </message> <message> - <source>FTP proxy requires authentication</source> - <translation>Ð”Ð»Ñ Ð´Ð¾Ñтупа к FTP прокÑи необходима аутентификациÑ</translation> - </message> - <message> <source>Repositories</source> <translation>Репозитории</translation> </message> @@ -2610,60 +2653,18 @@ as root and then clicking ok.</source> </message> </context> <context> - <name>TargetDirectoryPageImpl</name> - <message> - <source>The installation path cannot be empty, please specify a valid folder.</source> - <translation>Ðеобходимо задать путь к каталогу уÑтановки. Выберите подходÑщий каталог.</translation> - </message> - <message> - <source>The installation path cannot be relative, please specify an absolute path.</source> - <translation>Путь к каталогу уÑтановки не может быть отноÑительным. Задайте абÑолютный путь.</translation> - </message> - <message> - <source>As the install directory is completely deleted, installing in %1 is forbidden.</source> - <translation>Так как каталог уÑтановки полноÑтью удалён, уÑтановка в %1 запрещена.</translation> - </message> - <message> - <source>The path you have entered is too long, please make sure to specify a valid path.</source> - <translation>Введённый путь Ñлишком длинный, введите корректный путь.</translation> - </message> - <message> - <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> - <translation>Указан неверный путь, проверьте Ð¸Ð¼Ñ Ð´Ð¸Ñка.</translation> - </message> - <message> - <source>The installation path must not contain %1, please specify a valid folder.</source> - <translation>Путь к каталогу уÑтановки не может Ñодержать %1. Выберите другой каталог.</translation> - </message> - <message> - <source>Warning</source> - <translation>Предупреждение</translation> - </message> - <message> - <source>Error</source> - <translation>Ошибка</translation> - </message> - <message> - <source>The folder you selected already exists and contains an installation. Choose a different target for installation.</source> - <translation>Выбранный каталог ÑущеÑтвует и Ñодержит уÑтановленное приложение. Выберите другой каталог.</translation> - </message> + <name>UpdateOperation</name> <message> - <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> - <translation>Ð’ Ñтроке пути или в имени каталога уÑтановки ÑодержитÑÑ Ñимвол, не отноÑÑщийÑÑ Ðº ASCII. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñ‚Ð°ÐºÐ¸Ðµ Ñимволы не поддерживаютÑÑ. Выберите другой путь или каталог уÑтановки.</translation> + <source>Registry path %1 is not writable</source> + <translation>Ðевозможно запиÑать ключ %1 в рееÑÑ‚Ñ€</translation> </message> <message> - <source>You have selected an existing, non-empty folder for installation. -Note that it will be completely wiped on uninstallation of this application. -It is not advisable to install into this folder as installation might fail. -Do you want to continue?</source> - <translation>Каталог выбранный Ð´Ð»Ñ ÑƒÑтановки приложениÑ, уже Ñодержит файлы. -Он будет полноÑтью очищен при удалении приложениÑ. -Ðе рекомендуетÑÑ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ уÑтановку в Ñтот каталог, так как не иÑключён Ñбой. -Продолжить?</translation> + <source>Could not write to registry path %1</source> + <translation>Ðе удалоÑÑŒ запиÑать ключ %1 в рееÑÑ‚Ñ€</translation> </message> <message> - <source>You have selected an existing file or symlink, please choose a different target for installation.</source> - <translation>Выбранный файл или ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÑылка уже ÑущеÑтвует. Выберите другой каталог уÑтановки.</translation> + <source>Renaming %1 into %2 failed with %3.</source> + <translation>Сбой Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ %1 в %2: %3.</translation> </message> </context> </TS> diff --git a/src/sdk/translations/sv.ts b/src/sdk/translations/sv.ts deleted file mode 100644 index c6557cdab..000000000 --- a/src/sdk/translations/sv.ts +++ /dev/null @@ -1,3384 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="se_FI"> -<context> - <name>Component</name> - <message> - <location filename="../../common/binaryformat.cpp" line="578"/> - <source>Could not open archive %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>IntroductionPageImpl</name> - <message> - <location filename="../installerbasecommons.cpp" line="63"/> - <source>Package manager</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="68"/> - <source>Update components</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="73"/> - <source>Remove all components</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="83"/> - <source>Retrieving information from remote installation sources...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="145"/> - <source>No updates available.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="164"/> - <source> Only local package management available.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDJob</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdjob.cpp" line="176"/> - <source>Canceled</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDSaveFile</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdsavefile.cpp" line="251"/> - <source>Append mode not supported.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdsavefile.cpp" line="256"/> - <source>Read-only access not supported.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdsavefile.cpp" line="344"/> - <source>Could not backup existing file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdsavefile.cpp" line="385"/> - <location filename="../../libinstaller/3rdparty/kdtools/kdsavefile.cpp" line="396"/> - <location filename="../../libinstaller/3rdparty/kdtools/kdsavefile.cpp" line="407"/> - <source>TODO</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::AppendFileOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="597"/> - <source>Cannot backup file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="610"/> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="624"/> - <source>Could not open file %1 for writing: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="643"/> - <source>Cannot find backup file for %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="649"/> - <source>Could not restore backup file for %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="660"/> - <source>Could not restore backup file for %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::CopyOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="123"/> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="112"/> - <source>Could not backup file %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="136"/> - <source>Could not remove destination file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="145"/> - <source>Could not copy %1 to %2: %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="157"/> - <source>Could not delete file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="170"/> - <source>Could not restore backup file into %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::DeleteOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="341"/> - <source>Cannot create backup of %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="351"/> - <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="368"/> - <source>Cannot restore backup file for %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::ExecuteOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="848"/> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="906"/> - <source>Execution failed: %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::FileDownloader</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="53"/> - <source>%L1 B</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="56"/> - <source>%L1 KB</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="59"/> - <source>%L1 MB</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="61"/> - <source>%L1 GB</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="300"/> - <source>Could not reopen downloaded file %1 for reading: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="316"/> - <source>Download canceled.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="323"/> - <source>Cryptographic hashes do not match.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="327"/> - <source>Download finished.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="429"/> - <source> of </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="432"/> - <source> downloaded.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="435"/> - <source>/sec</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="446"/> - <source> day</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="446"/> - <source> days</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="450"/> - <source> hour</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="450"/> - <source> hours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="454"/> - <source> minute</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="454"/> - <source> minutes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="459"/> - <source> second</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="459"/> - <source> seconds</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="461"/> - <source> - </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="461"/> - <source> remaining.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="463"/> - <source> - unknown time remaining.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::FtpDownloader</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="1013"/> - <source>Download was aborted due to network errors.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="1034"/> - <source>Cannot download %1: Writing to temporary file failed: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::HttpDownloader</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="1154"/> - <source>Cannot download %1: Writing to temporary file failed: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="1281"/> - <source>Cannot download %1: Could not create temporary file: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::LocalFileDownloader</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="597"/> - <source>Cannot open source file for reading.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="612"/> - <source>Cannot open destination file for writing.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="668"/> - <source>Writing to %1 failed: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::MkdirOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="445"/> - <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="452"/> - <source>Could not create folder %1: Unknown error.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="490"/> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="492"/> - <source>Cannot remove directory %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::MoveOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="233"/> - <source>Could not backup file %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="244"/> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="258"/> - <source>Could not remove destination file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="268"/> - <source>Could not copy %1 to %2: %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="290"/> - <source>Cannot remove file %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="284"/> - <source>Cannot copy %1 to %2: %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="303"/> - <source>Cannot restore backup file for %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::PackagesInfo</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp" line="102"/> - <source>%1 contains invalid content: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp" line="284"/> - <source>The file %1 does not exist.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp" line="292"/> - <source>Could not open %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp" line="317"/> - <source>Root element %1 unexpected, should be 'Packages'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp" line="304"/> - <source>Parse error in %1 at %2, %3: %4</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::PrependFileOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="695"/> - <source>Cannot backup file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="708"/> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="719"/> - <source>Could not open file %1 for reading: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="735"/> - <source>Could not open file %1 for writing: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="753"/> - <source>Cannot find backup file for %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="758"/> - <source>Cannot restore backup file for %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="769"/> - <source>Cannot restore backup file for %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::RmdirOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="530"/> - <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="538"/> - <source>Could not remove folder %1: The folder does not exist.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="547"/> - <source>Could not remove folder %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="561"/> - <source>Cannot recreate directory %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::SignatureVerificationDownloader</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="1461"/> - <source>Could not download signature: scheme %1 not supported.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="1474"/> - <source>Downloading signature: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="1486"/> - <source>Could not open signature file: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp" line="1492"/> - <source>Could not open file for verification: %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::Task</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdatertask.cpp" line="179"/> - <source>%1 started</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdatertask.cpp" line="192"/> - <source>%1 cannot be stopped</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdatertask.cpp" line="210"/> - <source>Cannot stop task %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdatertask.cpp" line="229"/> - <source>%1 cannot be paused</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdatertask.cpp" line="247"/> - <source>Cannot pause task %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdatertask.cpp" line="275"/> - <source>Cannot resume task %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdatertask.cpp" line="331"/> - <source>%1 done</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::Update</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdate.cpp" line="235"/> - <source>Downloading update...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdate.cpp" line="243"/> - <source>Update downloaded</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::UpdateCompatOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="1029"/> - <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="1041"/> - <source>Cannot restore previous compat-level</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::UpdateFinder</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="315"/> - <source>Could not download updates from %1 ('%2')</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="185"/> - <source>Could not access the package information of this application.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="196"/> - <source>Could not access the update sources information of this application.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="219"/> - <source>%1 updates found.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="302"/> - <source>Downloading Updates.xml from update sources.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="353"/> - <source>Updates.xml file(s) downloaded from update sources.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="374"/> - <source>Looking for compatibility update...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="399"/> - <source>Found compatibility update..</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="402"/> - <source>Compatibility level %1 update</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="408"/> - <source>Compatibility update for the required architecture and hardware configuration was not found.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="409"/> - <source>Compatibility update not found.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="425"/> - <source>Compatibility update found.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="427"/> - <source>No compatibility updates found.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="452"/> - <source>Computing applicable updates.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="456"/> - <source>Application updates computed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp" line="744"/> - <source>Downloading Updates.xml from update sources</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::UpdatePackageOperation</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="971"/> - <source>Invalid arguments: %1 arguments given, 3 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="980"/> - <source>Cannot update %1-%2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp" line="993"/> - <source>Cannot restore %1-%2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::UpdateSourcesInfo</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp" line="126"/> - <source>%1 contains invalid content: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp" line="326"/> - <source>Could not read "%1"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp" line="338"/> - <source>XML Parse error in %1 at %2, %3: %4</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp" line="350"/> - <source>Root element %1 unexpected, should be "UpdateSources"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp" line="397"/> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesourcesinfo.cpp" line="408"/> - <source>Could not save changes to "%1": %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>KDUpdater::UpdatesInfoData</name> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="61"/> - <source>Updates.Xml contains invalid content: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="69"/> - <source>Could not read "%1"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="79"/> - <source>Parse error in %1 at %2, %3: %4</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="89"/> - <source>root element %1 unexpected, should be "Updates"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="122"/> - <source>ApplicationName element is missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="127"/> - <source>ApplicationVersion element is missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="183"/> - <source>PackageUpdate element without Name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="187"/> - <source>PackageUpdate element without Version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="191"/> - <source>PackageUpdate element without ReleaseDate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="195"/> - <source>PackageUpdate element without UpdateFile</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="232"/> - <source>CompatUpdate element without CompatLevel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="237"/> - <source>CompatUpdate element without ReleaseDate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdupdaterupdatesinfo.cpp" line="242"/> - <source>CompatUpdate element without UpdateFile</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Lib7z::ExtractItemJob</name> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1355"/> - <source>Could not list archive: QIODevice not set or already destroyed.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Lib7z::ListArchiveJob</name> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="679"/> - <source>Could not list archive: QIODevice already destroyed.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::AddQtCreatorArrayValueOperation</name> - <message> - <location filename="../../libinstaller/addqtcreatorarrayvalueoperation.cpp" line="64"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 4 expected (group, arrayname, key, value).</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/addqtcreatorarrayvalueoperation.cpp" line="73"/> - <location filename="../../libinstaller/addqtcreatorarrayvalueoperation.cpp" line="125"/> - <source>Needed installer object in %1 operation is empty.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::Component</name> - <message> - <location filename="../../libinstaller/component.cpp" line="212"/> - <source>%L1 Bytes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="215"/> - <source>%L1 kBytes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="218"/> - <source>%L1 MBytes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="221"/> - <source>%L1 GBytes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="383"/> - <source>Could not open the requested script file at %1: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="388"/> - <location filename="../../libinstaller/component.cpp" line="408"/> - <source>Exception while loading the component script: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="477"/> - <source>Could not open the requested translation file at %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="496"/> - <source>Could not open the requested UI file at %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="525"/> - <source>Could not open the requested license file at %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="836"/> - <source>Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="836"/> - <source>Error: Operation %1 does not exist</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="1010"/> - <source>Can't resolve isAutoDependOn in %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/component.cpp" line="1050"/> - <source>Can't resolve isDefault in %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::ComponentSelectionPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1001"/> - <source>Component Name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1003"/> - <source>Installed Version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1004"/> - <source>New Version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1005"/> - <source>Size</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1036"/> - <source>Alt+A</source> - <comment>select default components</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1037"/> - <source>Def&ault</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1042"/> - <source>Alt+R</source> - <comment>reset to already installed components</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1043"/> - <source>&Reset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1052"/> - <source>Alt+S</source> - <comment>select all components</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1053"/> - <source>&Select All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1059"/> - <source>Alt+D</source> - <comment>deselect all components</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1060"/> - <source>&Deselect All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1126"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1127"/> - <source>This component will occupy approximately %1 on your hard disk drive.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1200"/> - <source>Select Components</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1211"/> - <source>Please select the components you want to update.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1212"/> - <source>Please select the components you want to install.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1213"/> - <source>Please select the components you want to uninstall.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1214"/> - <source>Select the components to install. Deselect installed components to uninstall them.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::CopyDirectoryOperation</name> - <message> - <location filename="../../libinstaller/copydirectoryoperation.cpp" line="70"/> - <source>Invalid arguments in %0: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/copydirectoryoperation.cpp" line="81"/> - <source>Invalid arguments in %0: Directories are invalid: %1 %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/copydirectoryoperation.cpp" line="114"/> - <source>Could not create %0</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/copydirectoryoperation.cpp" line="120"/> - <source>Could not copy %0 to %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/copydirectoryoperation.cpp" line="140"/> - <source>Could not remove %0</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::CreateDesktopEntryOperation</name> - <message> - <location filename="../../libinstaller/createdesktopentryoperation.cpp" line="137"/> - <source>Invalid arguments in %0: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/createdesktopentryoperation.cpp" line="147"/> - <source>Failed to overwrite %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/createdesktopentryoperation.cpp" line="154"/> - <source>Could not write Desktop Entry at %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::CreateShortcutOperation</name> - <message> - <location filename="../../libinstaller/createshortcutoperation.cpp" line="161"/> - <source>Could not create folder %1: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/createshortcutoperation.cpp" line="179"/> - <source>Could not create link %1: %2</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::DownloadArchivesJob</name> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="117"/> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="166"/> - <source>Canceled</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="153"/> - <source>Downloading hash signature failed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="247"/> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="283"/> - <source>Download Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="247"/> - <source>Hash verification while downloading failed. This is a temporary error, please retry.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="252"/> - <source>Could not verify Hash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="260"/> - <source>Could not open %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="283"/> - <source>Could not download archive: %1 : %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="295"/> - <source>Could not fetch archives: %1 -Error while loading %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="337"/> - <source>Downloading archive hash for component: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="339"/> - <source>Downloading archive for component: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="342"/> - <source>Scheme not supported: %1 (%2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/downloadarchivesjob.cpp" line="345"/> - <source>Could not find component for: %1.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::ElevatedExecuteOperation</name> - <message> - <location filename="../../libinstaller/elevatedexecuteoperation.cpp" line="81"/> - <source>Invalid arguments in %1: %2 arguments given, at least 1 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/elevatedexecuteoperation.cpp" line="135"/> - <source>Execution failed: Could not start detached: "%1"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/elevatedexecuteoperation.cpp" line="187"/> - <source>Execution failed: Could not start: "%1"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/elevatedexecuteoperation.cpp" line="202"/> - <source>Execution failed(Crash): "%1"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/elevatedexecuteoperation.cpp" line="208"/> - <source>Execution failed(Unexpected exit code: %1): "%2"</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::EnvironmentVariableOperation</name> - <message> - <location filename="../../libinstaller/environmentvariablesoperation.cpp" line="132"/> - <source>Invalid arguments in %0: %1 arguments given, 2-3 expected.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::ExtractArchiveOperation</name> - <message> - <location filename="../../libinstaller/extractarchiveoperation.cpp" line="58"/> - <source>Invalid arguments in %0: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::ExtractArchiveOperation::Runnable</name> - <message> - <location filename="../../libinstaller/extractarchiveoperation_p.h" line="177"/> - <source>Could not open %1 for reading: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/extractarchiveoperation_p.h" line="186"/> - <source>Error while extracting %1: %2. (Maybe the target dir(%3) is blocked by another process.)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/extractarchiveoperation_p.h" line="189"/> - <source>Error while extracting %1: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/extractarchiveoperation_p.h" line="192"/> - <source>Unknown exception caught while extracting %1.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::FakeStopProcessForUpdateOperation</name> - <message> - <location filename="../../libinstaller/fakestopprocessforupdateoperation.cpp" line="113"/> - <source>These processes should be stopped to continue: - -%1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::FinishedPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1842"/> - <source>Completing the %1 Wizard</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1850"/> - <source>Click Done to exit the %1 Wizard.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1850"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1853"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1905"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1853"/> - <source>Click Finish to exit the %1 Wizard.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1884"/> - <source>Restart</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1909"/> - <source>Run %1 now.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1915"/> - <source>The %1 Wizard failed.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::GetRepositoryMetaInfoJob</name> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="198"/> - <source>Empty repository URL.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="203"/> - <source>Invalid repository URL: %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="209"/> - <source>URL scheme not supported: %1 (%2).</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="238"/> - <source>Retrieving component meta information...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="254"/> - <source>Could not move Updates.xml to target location: %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="260"/> - <source>Could not open Updates.xml for reading: %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="268"/> - <source>Could not fetch a valid version of Updates.xml from repository: %1. Error: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="273"/> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="372"/> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="502"/> - <source>Download Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="281"/> - <source>Parsing component meta information...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="330"/> - <source>Repository updates received.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="355"/> - <source>Finished updating component meta information...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="366"/> - <source>Could not fetch Updates.xml from repository: %1. Error: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="388"/> - <source>Retrieving component information from remote repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="464"/> - <source>Could not open meta info archive: %1. Error: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="477"/> - <source>Bad hash.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="476"/> - <source>The hash of one component does not match the expected one.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="496"/> - <source>Could not download meta information for component: %1. Error: %2.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::GetRepositoryMetaInfoJob::ZipRunnable</name> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="94"/> - <source>Error while extracting %1: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="96"/> - <source>Unknown exception caught while extracting %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/getrepositorymetainfojob.cpp" line="99"/> - <source>Could not open %1 for reading: %2.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::GlobalSettingsOperation</name> - <message> - <location filename="../../libinstaller/globalsettingsoperation.cpp" line="56"/> - <source>Settings are not writable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/globalsettingsoperation.cpp" line="66"/> - <source>Failed to write settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/globalsettingsoperation.cpp" line="120"/> - <source>Invalid arguments in 0%: %1 arguments given, at least 3 expected.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::InstallIconsOperation</name> - <message> - <location filename="../../libinstaller/installiconsoperation.cpp" line="132"/> - <source>Invalid arguments in %0: %1 arguments given, 1 expected.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::IntroductionPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="788"/> - <source>Setup - %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="794"/> - <source>Welcome to the %1 Setup Wizard.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="794"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::LicenseAgreementPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="854"/> - <source>License Agreement</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="855"/> - <source>Please read the following license agreement(s). You must accept the terms contained in these agreement(s) before continuing with the installation.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="881"/> - <source>Alt+A</source> - <comment>agree license</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="891"/> - <source>I h<u>a</u>ve read and agree to the following terms contained in the license agreements accompanying the Qt SDK and additional items. I agree that my use of the Qt SDK is governed by the terms and conditions contained in these license agreements.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="891"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="906"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="899"/> - <source>Alt+D</source> - <comment>do not agree license</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="906"/> - <source>I <u>d</u>o not accept the terms and conditions of the above listed license agreements. Please note by checking the box, you must cancel the installation or downloading the Qt SDK and must destroy all copies, or portions thereof, of the Qt SDK in your possessions.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::LicenseOperation</name> - <message> - <location filename="../../libinstaller/licenseoperation.cpp" line="58"/> - <source>No license files found to copy.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/licenseoperation.cpp" line="65"/> - <source>Needed installer object in %1 operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/licenseoperation.cpp" line="80"/> - <source>Can not write license file: %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/licenseoperation.cpp" line="97"/> - <source>No license files found to delete.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::LineReplaceOperation</name> - <message> - <location filename="../../libinstaller/linereplaceoperation.cpp" line="60"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 3 expected.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::MacReplaceInstallNamesOperation</name> - <message> - <location filename="../../libinstaller/macreplaceinstallnamesoperation.cpp" line="66"/> - <source>Invalid arguments in %0: %1 arguments given, 3 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/macreplaceinstallnamesoperation.cpp" line="144"/> - <source>Can't invoke otool. Is Xcode installed?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/macreplaceinstallnamesoperation.cpp" line="262"/> - <source>Can't start process %0.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::PackageManagerCore</name> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="262"/> - <source>Error writing Uninstaller</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="364"/> - <source> -Downloading packages...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="389"/> - <source>Installation canceled by user</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="390"/> - <source>All downloads finished.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="407"/> - <location filename="../../libinstaller/packagemanagercore.cpp" line="1782"/> - <source>Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="423"/> - <source>Cancelling the Installer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="466"/> - <source>Authentication Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="466"/> - <source>Some components could not be removed completely because admin rights could not be acquired: %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="471"/> - <source>Unknown error.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="471"/> - <source>Some components could not be removed completely because an unknown error happened.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="562"/> - <source>Application not running in Package Manager mode!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="569"/> - <source>No installed packages found.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="646"/> - <source>Application running in Uninstaller mode!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="1813"/> - <source>invalid</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::PackageManagerCorePrivate</name> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="327"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1459"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1622"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1713"/> - <source>Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="439"/> - <source>Component(s) added as automatic dependencies</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="481"/> - <source>Added as dependency for %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="490"/> - <source>Component(s) that have resolved Dependencies</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="499"/> - <source>Selected Component(s) without Dependencies</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="808"/> - <source>Access error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="809"/> - <source>Format error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="810"/> - <source>Could not write installer configuration to %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="927"/> - <source>Stop Processes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="927"/> - <source>These processes should be stopped to continue: - -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="935"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1741"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1919"/> - <source>Installation canceled by user</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1053"/> - <source>Could not write uninstaller to %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1263"/> - <source>Found a binary data file, but we are the installer and we should read the binary resource from our very own binary!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1287"/> - <source>Could not write uninstaller binary data to %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1334"/> - <source>ProductName should be set</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1359"/> - <source>Variable 'TargetDir' not set.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1397"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1583"/> - <source>Preparing the installation...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1440"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1603"/> - <source>Creating Uninstaller</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1449"/> - <source> -Installation finished!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1465"/> - <source> -Installation aborted!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1589"/> - <source>Removing deselected components...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1612"/> - <source> -Update finished!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1628"/> - <source> -Update aborted!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1705"/> - <source> -Deinstallation finished!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1716"/> - <source> -Deinstallation aborted!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1735"/> - <source> -Installing component %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1764"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1936"/> - <source>Installer Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1765"/> - <source>Error during installation process (%1): -%2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1831"/> - <source>Cannot prepare uninstall</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1862"/> - <source>Cannot start uninstall</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1937"/> - <source>Error during uninstallation process: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1972"/> - <source>Unknown error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1991"/> - <source>Could not retrieve remote tree: %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="2020"/> - <source>Failure to read packages from: %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="2046"/> - <source>Could not retrieve meta information: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="2101"/> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="2112"/> - <source>Could not add temporary update source information.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="2125"/> - <source>Could not find any update source information.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::PackageManagerGui</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="238"/> - <source>%1 Setup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="240"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="540"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="554"/> - <source>Question</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="541"/> - <source>Do you want to abort the %1 process?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="541"/> - <source>uninstallation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="542"/> - <source>installation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="546"/> - <source>installer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="548"/> - <source>uninstaller</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="550"/> - <source>maintenance</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="555"/> - <source>Do you want to abort the %1 application?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="596"/> - <source>Settings</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::PackageManagerPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="675"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="680"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::PerformInstallationForm</name> - <message> - <location filename="../../libinstaller/performinstallationform.cpp" line="86"/> - <location filename="../../libinstaller/performinstallationform.cpp" line="136"/> - <location filename="../../libinstaller/performinstallationform.cpp" line="153"/> - <source>&Show Details</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/performinstallationform.cpp" line="136"/> - <source>&Hide Details</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::PerformInstallationPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1776"/> - <source>U&ninstall</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1777"/> - <source>Uninstalling %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1781"/> - <source>&Update</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1782"/> - <source>Updating components of %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1786"/> - <source>&Install</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1787"/> - <source>Installing %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1805"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::QtPatchOperation</name> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="129"/> - <source>Invalid arguments in %0: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="140"/> - <source>First argument should be 'linux', 'mac' or 'windows'. No other type is supported at this time.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="155"/> - <source>QMake from the current Qt version -(%1)is not existing. Please file a bugreport with this dialog at https://bugreports.qt-project.org.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="165"/> - <source>The output of -%1 -query -is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. -output: "%2"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="177"/> - <source>Qt patch error: new Qt dir(%1) -needs to be less than 255 characters.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="194"/> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="244"/> - <source>Qt patch error: Can not open %1.(%2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="306"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="313"/> - <source>Error while relocating Qt: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/qtpatchoperation.cpp" line="319"/> - <source>The installer was not able to get the unpatched path from -%1.(maybe it is broken or removed) -It tried to patch the Qt binaries, but all other files in Qt are unpatched. -This could result in a broken Qt version. -Sometimes it helps to restart the installer with a switched off antivirus software.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::ReadyForInstallationPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1527"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1706"/> - <source>&Show Details</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1560"/> - <source>U&ninstall</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1561"/> - <source>Ready to Uninstall</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1562"/> - <source>Setup is now ready to begin removing %1 from your computer.<br><font color="red">The program directory %2 will be deleted completely</font>, including all content in that directory!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1570"/> - <source>U&pdate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1571"/> - <source>Ready to Update Packages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1572"/> - <source>Setup is now ready to begin updating your installation.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1575"/> - <source>&Install</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1576"/> - <source>Ready to Install</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1577"/> - <source>Setup is now ready to begin installing %1 on your computer.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1623"/> - <source>Not enough disk space to store temporary files and the installation! Available space: %1, at least required %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1630"/> - <source>Not enough disk space to store all selected components! Available space: %1, at least required: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1637"/> - <source>Not enough disk space to store temporary files! Available space: %1, at least required: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1645"/> - <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 1% of the volume's space available afterwards. %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1650"/> - <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 100 MB available afterwards. %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1664"/> - <source>Can not resolve all dependencies!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1682"/> - <source>Components about to be removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1706"/> - <source>&Hide Details</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::RegisterDefaultDebuggerOperation</name> - <message> - <location filename="../../libinstaller/registerdefaultdebuggeroperation.cpp" line="85"/> - <location filename="../../libinstaller/registerdefaultdebuggeroperation.cpp" line="124"/> - <source>Invalid arguments in %0: %1 arguments given, 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerdefaultdebuggeroperation.cpp" line="95"/> - <location filename="../../libinstaller/registerdefaultdebuggeroperation.cpp" line="134"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerdefaultdebuggeroperation.cpp" line="109"/> - <source>Can't read from tool chains xml file(%1) correctly.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::RegisterDocumentationOperation</name> - <message> - <location filename="../../libinstaller/registerdocumentationoperation.cpp" line="89"/> - <source>Invalid arguments in %0: %1 arguments given, 1 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerdocumentationoperation.cpp" line="104"/> - <source>Could not register help file %1: File not found.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerdocumentationoperation.cpp" line="135"/> - <source>Could not unregister help file %1: File not found.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::RegisterFileTypeOperation</name> - <message> - <location filename="../../libinstaller/registerfiletypeoperation.cpp" line="59"/> - <source>Invalid arguments in %0</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerfiletypeoperation.cpp" line="120"/> - <source>Register File Type: Invalid arguments</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::RegisterQtInCreatorOperation</name> - <message> - <location filename="../../libinstaller/registerqtoperation.cpp" line="65"/> - <source>Invalid arguments in %0: %1 arguments given, minimum 3 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerqtoperation.cpp" line="84"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerqtoperation.cpp" line="102"/> - <source>Can't read from tool chains xml file(%1) correctly.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::RegisterQtInCreatorV23Operation</name> - <message> - <location filename="../../libinstaller/registerqtv23operation.cpp" line="96"/> - <location filename="../../libinstaller/registerqtv23operation.cpp" line="175"/> - <source>Invalid arguments in %0: %1 arguments given, minimum 4 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerqtv23operation.cpp" line="104"/> - <location filename="../../libinstaller/registerqtv23operation.cpp" line="183"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerqtv23operation.cpp" line="110"/> - <source>The given TargetDir %1 is not a valid/existing dir.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::RegisterQtInCreatorV2Operation</name> - <message> - <location filename="../../libinstaller/registerqtv2operation.cpp" line="63"/> - <location filename="../../libinstaller/registerqtv2operation.cpp" line="139"/> - <source>Invalid arguments in %0: %1 arguments given, minimum 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerqtv2operation.cpp" line="71"/> - <location filename="../../libinstaller/registerqtv2operation.cpp" line="147"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerqtv2operation.cpp" line="77"/> - <source>The given TargetDir %1 is not a valid/existing dir.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::RegisterToolChainOperation</name> - <message> - <location filename="../../libinstaller/registertoolchainoperation.cpp" line="66"/> - <location filename="../../libinstaller/registertoolchainoperation.cpp" line="121"/> - <source>Invalid arguments in %0: %1 arguments given, minimum 4 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registertoolchainoperation.cpp" line="76"/> - <location filename="../../libinstaller/registertoolchainoperation.cpp" line="131"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registertoolchainoperation.cpp" line="101"/> - <location filename="../../libinstaller/registertoolchainoperation.cpp" line="156"/> - <source>Can't read from tool chains xml file(%1) correctly.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registertoolchainoperation.cpp" line="108"/> - <location filename="../../libinstaller/registertoolchainoperation.cpp" line="163"/> - <source>Some arguments are not right in %1 operation.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::ReplaceOperation</name> - <message> - <location filename="../../libinstaller/replaceoperation.cpp" line="60"/> - <source>Invalid arguments in %0: %1 arguments given, 3 expected.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::RestartPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1955"/> - <source>Completing the %1 Setup Wizard</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::SelfRestartOperation</name> - <message> - <location filename="../../libinstaller/selfrestartoperation.cpp" line="55"/> - <source>Needed installer object in "%1" operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/selfrestartoperation.cpp" line="61"/> - <source>Self Restart: Only valid within updater or packagemanager mode.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/selfrestartoperation.cpp" line="67"/> - <source>Self Restart: Invalid arguments</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::SetDemosPathOnQtOperation</name> - <message> - <location filename="../../libinstaller/setdemospathonqtoperation.cpp" line="58"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/setdemospathonqtoperation.cpp" line="76"/> - <source>The output of -%1 -query -is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. -output: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/setdemospathonqtoperation.cpp" line="90"/> - <source>Qt patch error: new Qt demo path (%1) -needs to be less than 255 characters.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::SetExamplesPathOnQtOperation</name> - <message> - <location filename="../../libinstaller/setexamplespathonqtoperation.cpp" line="58"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/setexamplespathonqtoperation.cpp" line="76"/> - <source>The output of -%1 -query -is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. -output: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/setexamplespathonqtoperation.cpp" line="90"/> - <source>Qt patch error: new Qt example path (%1) -needs to be less than 255 characters.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::SetImportsPathOnQtCoreOperation</name> - <message> - <location filename="../../libinstaller/setimportspathonqtcoreoperation.cpp" line="101"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 2 expected.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::SetPathOnQtCoreOperation</name> - <message> - <location filename="../../libinstaller/setpathonqtcoreoperation.cpp" line="103"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 3 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/setpathonqtcoreoperation.cpp" line="127"/> - <source>The second type/value needs to be one of: %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::SetPluginPathOnQtCoreOperation</name> - <message> - <location filename="../../libinstaller/setpluginpathonqtcoreoperation.cpp" line="100"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 2 expected.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::SetQtCreatorValueOperation</name> - <message> - <location filename="../../libinstaller/setqtcreatorvalueoperation.cpp" line="63"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 4 expected (rootInstallPath, group, key, value).</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/setqtcreatorvalueoperation.cpp" line="93"/> - <source>Needed installer object in %1 operation is empty.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::SimpleMoveFileOperation</name> - <message> - <location filename="../../libinstaller/simplemovefileoperation.cpp" line="53"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/simplemovefileoperation.cpp" line="63"/> - <source>None of the arguments can be empty: source(%1), target(%2).</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/simplemovefileoperation.cpp" line="74"/> - <source>Can not copy source(%1) to target(%2), because target exists and is not removable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/simplemovefileoperation.cpp" line="83"/> - <source>Can not move source(%1) to target(%2): %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/simplemovefileoperation.cpp" line="88"/> - <location filename="../../libinstaller/simplemovefileoperation.cpp" line="98"/> - <source>Move %1 to %2.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::StartMenuDirectoryPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1423"/> - <source>Start Menu shortcuts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1424"/> - <source>Select the Start Menu in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::TargetDirectoryPage</name> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1294"/> - <source>Installation Folder</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1302"/> - <source>Please specify the folder where %1 will be installed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1302"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1317"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1355"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1370"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1381"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1406"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1316"/> - <source>Alt+R</source> - <comment>browse file system to choose a file</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1317"/> - <source>B&rowse...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1355"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1370"/> - <source>Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1356"/> - <source>The install directory cannot be empty, please specify a valid folder.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1371"/> - <source>As the install directory is completely deleted, installing in %1 is forbidden.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1381"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1382"/> - <source>You have selected an existing, non-empty folder for installation. Note that it will be completely wiped on uninstallation of this application. It is not advisable to install into this folder as installation might fail. Do you want to continue?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="1407"/> - <source>Select Installation Folder</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstaller::UpdateCreatorSettingsFrom21To22Operation</name> - <message> - <location filename="../../libinstaller/updatecreatorsettingsfrom21to22operation.cpp" line="278"/> - <source>Invalid arguments in %0: %1 arguments given, exactly 0 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/updatecreatorsettingsfrom21to22operation.cpp" line="286"/> - <source>Needed installer object in %1 operation is empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/updatecreatorsettingsfrom21to22operation.cpp" line="304"/> - <source>Can not remove previous registered Qt Versions in %1 operation.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QInstallerCreator::Archive</name> - <message> - <location filename="../../common/binaryformat.cpp" line="303"/> - <source>Could not create %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="412"/> - <source>Could not open archive file %1 for reading.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="431"/> - <source>Could not create archive from %1: Not a file.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="455"/> - <source>Error while packing directory at %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QObject</name> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="198"/> - <location filename="../../binarycreator/binarycreator.cpp" line="208"/> - <location filename="../../common/repositorygen.cpp" line="796"/> - <source>Could not copy %1 to %2: %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="366"/> - <source>Could not create temporary file for generated rcc project file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="471"/> - <location filename="../../binarycreator/binarycreator.cpp" line="517"/> - <source>Could not copy %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="485"/> - <source>Could not remove the private key from config.xml</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="586"/> - <source>Error: Packages parameter missing argument.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="589"/> - <source>Error: Package directory not found at the specified location.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="596"/> - <source>Error: Package to exclude missing.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="607"/> - <source>Error: Template parameter missing argument.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="610"/> - <source>Error: Template not found at the specified location.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="617"/> - <source>Error: Config parameter missing argument.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="620"/> - <source>Error: Config directory %1 not found at the specified location.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="624"/> - <source>Error: Configuration %1 is not a directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="628"/> - <source>Error: Config directory %1 is not readable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="635"/> - <source>Error: Resource files to include missing.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="646"/> - <source>Error: Target parameter missing.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="649"/> - <source>Error: No components selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="652"/> - <source>Error: No configuration directory selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="710"/> - <source>Could not create a RSA signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../binarycreator/binarycreator.cpp" line="713"/> - <source>Created RSA signature could not be verified. Is the given public key wrong?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="74"/> - <source>Component %1 can't contain '-'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="80"/> - <source>Component %1 does not contain a package description.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="93"/> - <source>Component package description for %1 is invalid. Error at line: %2, column: %3 -> %4</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="101"/> - <source>Component folder name must match component name: %1 in %2/</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="209"/> - <source>Circular dependencies detected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="219"/> - <source>Couldn't find package for component %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="274"/> - <source>Folder %1 does not exist.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="110"/> - <source>Component version for %1 is invalid! <Version>%2</version></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="304"/> - <location filename="../../common/repositorygen.cpp" line="748"/> - <source>Could not move %1 to %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="314"/> - <source>Could not open %1 for writing.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="378"/> - <source>Could not parse %1: line: %2, column: %3: %4 (%5)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="462"/> - <source>Could not create directory %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="486"/> - <source>Could not copy the script %1 to its target location %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="504"/> - <source>Couldn't find any user interface matching %1 while copying user interfaces of %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="515"/> - <source>Could not copy the UI file %1 to its target location %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="539"/> - <source>Could not find any translation file matching %1 while copying translations of %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="550"/> - <source>Could not copy the translation %1 to its target location %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="573"/> - <source>Could not find any license matching %1 while copying license files of %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="582"/> - <source>Could not copy the license file %1 to its target location %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="756"/> - <source>Could not open %1 for writing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="783"/> - <source>Could not create repository folder for component %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/repositorygen.cpp" line="859"/> - <source>Could not open %1 for writing: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../repogen/repogen.cpp" line="118"/> - <source>Error: Package to exclude missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../repogen/repogen.cpp" line="127"/> - <source>Error: Packages parameter missing argument</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../repogen/repogen.cpp" line="131"/> - <source>Error: Package directory not found at the specified location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../repogen/repogen.cpp" line="139"/> - <location filename="../../repogen/repogen.cpp" line="158"/> - <source>Error: Config parameter missing argument</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../repogen/repogen.cpp" line="142"/> - <source>Error: Config directory %1 not found at the specified location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../repogen/repogen.cpp" line="146"/> - <source>Error: Configuration %1 is not a directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../repogen/repogen.cpp" line="150"/> - <source>Error: Config directory %1 is not readable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../repogen/repogen.cpp" line="197"/> - <source>Repository target folder %1 already exists!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp" line="93"/> - <source>Could not remove folder %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp" line="100"/> - <source>Could not remove folder %1: Unknown error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="219"/> - <source>Searched whole file, no marker found</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="221"/> - <source>Could not seek to %1 in file %2: %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="231"/> - <source>No marker found, stopped after %1 bytes.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="237"/> - <source>No marker found, unknown exception caught.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="479"/> - <source>Cannot create zipped file for path %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="741"/> - <source>Could not seek to in-binary resource. (offset: %1, length: %2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="748"/> - <source>Could not register in-binary resource.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="852"/> - <location filename="../../common/binaryformat.cpp" line="1010"/> - <source>Could not open binary %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="895"/> - <source>Could not seek to binary layout section.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="920"/> - <source>Could not seek to metadata index.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="941"/> - <source>Could not seek to operation list.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="963"/> - <source>Could not seek to component index information.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/binaryformat.cpp" line="967"/> - <source>Could not seek to component index.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="146"/> - <source>Cannot open file %1 for reading: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="153"/> - <location filename="../../common/fileutils.cpp" line="160"/> - <source>Cannot open file %1 for writing: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="169"/> - <source>Write failed after %1 bytes: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="190"/> - <source>Read failed after %1 bytes: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="219"/> - <source>Could not remove file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="244"/> - <source>Could not remove folder %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="313"/> - <location filename="../../common/fileutils.cpp" line="338"/> - <source>Could not create folder %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="325"/> - <source>Could not copy file from %1 to %2: %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="350"/> - <source>Could not move file from %1 to %2: %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="361"/> - <location filename="../../common/fileutils.cpp" line="370"/> - <source>Could not create folder %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="380"/> - <source>Could not open temporary file: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="397"/> - <source>Could not open temporary file for template %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../common/fileutils.cpp" line="407"/> - <source>Could not create temporary folder for template %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp" line="45"/> - <source>Could not create lock file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp" line="55"/> - <source>Could not write PID to lock file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp" line="63"/> - <source>Could not lock lock file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/kdtools/kdlockfile_unix.cpp" line="75"/> - <source>Could not unlock lock file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="137"/> - <source>Path exists but is not a folder: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="153"/> - <source>Could not create folder: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="188"/> - <source>Could not create temporary file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="205"/> - <source>Could not retrieve property %1 for item %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="228"/> - <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="236"/> - <source>Could not convert file time to local time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="240"/> - <source>Could not convert local file time to system time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="569"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1148"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1321"/> - <source>Could not load codecs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="572"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1153"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1326"/> - <source>Could not retrieve default format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="576"/> - <source>Could not open archive</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="578"/> - <source>No CArc found</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="642"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1228"/> - <source>Could not retrieve number of items in archive</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="648"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="731"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="781"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1236"/> - <source>Could not retrieve path of archive item %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="669"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="686"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1201"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1247"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1345"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1367"/> - <source>Unknown exception caught (%1)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="686"/> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1367"/> - <source>Failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="799"/> - <source>Could not create file system link at %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="804"/> - <source>Could not create softlink at %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1183"/> - <source>Could not create archive %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1220"/> - <source>CArc index %1 out of bounds [0, %2]</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1231"/> - <source>Item index %1 out of bounds [0, %2]</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1243"/> - <source>Extracting %1 failed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1266"/> - <source>Could not create output file for writing: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp" line="1299"/> - <source>Extraction failed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/adminauthorization_x11.cpp" line="74"/> - <location filename="../../libinstaller/adminauthorization_x11.cpp" line="77"/> - <source>Authorization required</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/adminauthorization_x11.cpp" line="74"/> - <location filename="../../libinstaller/adminauthorization_x11.cpp" line="78"/> - <source>Enter your password to authorize for sudo:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/adminauthorization_x11.cpp" line="88"/> - <source>Error acquiring admin rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/createdesktopentryoperation.cpp" line="129"/> - <source>Could not backup file %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/createdesktopentryoperation.cpp" line="180"/> - <source>Could not delete file %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/createdesktopentryoperation.cpp" line="191"/> - <source>Could not restore backup file into %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/createshortcutoperation.cpp" line="145"/> - <source>Invalid arguments: %1 arguments given, 2 or 3 expected (optional: "workingDirectory=...").</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/createshortcutoperation.cpp" line="171"/> - <location filename="../../libinstaller/installiconsoperation.cpp" line="189"/> - <source>Failed to overwrite %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/environmentvariablesoperation.cpp" line="89"/> - <source>Registry path %1 is not writable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/environmentvariablesoperation.cpp" line="101"/> - <source>Could not write to registry path %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/fakestopprocessforupdateoperation.cpp" line="102"/> - <source>Number of arguments does not match : one is required</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/installiconsoperation.cpp" line="140"/> - <source>Invalid Argument: source folder must not be empty.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/installiconsoperation.cpp" line="176"/> - <source>Could not backup file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/installiconsoperation.cpp" line="200"/> - <source>Failed to copy file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/installiconsoperation.cpp" line="210"/> - <source>Could not create folder at %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/replaceoperation.cpp" line="71"/> - <source>Failed to open %1 for reading</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/replaceoperation.cpp" line="81"/> - <source>Failed to open %1 for writing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="77"/> - <source>Invalid arguments: %1 arguments given, %2 to %3 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="81"/> - <source>Invalid arguments: %1 arguments given, %2 expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore.cpp" line="1028"/> - <source>Error while elevating access rights.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagercore_p.cpp" line="1040"/> - <source>Failed to seek in file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="128"/> - <source>kB</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="131"/> - <source>MB</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="134"/> - <source>GB</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="330"/> - <source>Could not open the requested script file at %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/packagemanagergui.cpp" line="367"/> - <location filename="../../libinstaller/packagemanagergui.cpp" line="373"/> - <source>Exception while loading the control script %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/registerfiletypeoperation.cpp" line="105"/> - <location filename="../../libinstaller/registerfiletypeoperation.cpp" line="194"/> - <source>Registering file types in only supported on Windows.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbase_p.cpp" line="411"/> - <source>Failed to seek in file %1. Reason: %2.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/linereplaceoperation.cpp" line="71"/> - <source>Failed to open %1 for reading.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/linereplaceoperation.cpp" line="88"/> - <source>Failed to open %1 for writing.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Settings</name> - <message> - <location filename="../../libinstaller/settings.cpp" line="202"/> - <source>Could not open settings file %1 for reading: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/settings.cpp" line="207"/> - <source>%1 is not valid: Installer root node expected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../libinstaller/settings.cpp" line="235"/> - <source>Multiple %1 elements found, but only one allowed.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>SettingsDialog</name> - <message> - <location filename="../settingsdialog.ui" line="14"/> - <source>Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="24"/> - <source>Network</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="30"/> - <source>No proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="43"/> - <source>System proxy settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="53"/> - <source>Manual proxy configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="79"/> - <source>HTTP proxy:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="96"/> - <location filename="../settingsdialog.ui" line="222"/> - <source>Port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="118"/> - <source>HTTP proxy requires authentication</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="143"/> - <location filename="../settingsdialog.ui" line="269"/> - <source>Username:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="160"/> - <location filename="../settingsdialog.ui" line="286"/> - <source>Password:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="205"/> - <source>FTP proxy:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="244"/> - <source>FTP proxy requires authentication</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="325"/> - <source>Repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="331"/> - <source>Add Username and Password for authentication if needed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="347"/> - <source>Use temporary repositories only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="356"/> - <source>Add</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="363"/> - <source>Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="370"/> - <source>Test</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.ui" line="390"/> - <location filename="../settingsdialog.cpp" line="455"/> - <source>Show Passwords</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="237"/> - <source>Check this to use repository during fetch.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="239"/> - <source>Add the username to authenticate on the server.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="241"/> - <source>Add the password to authenticate on the server.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="243"/> - <source>The servers URL that contains a valid repository.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="436"/> - <source>There was an error testing this repository.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="437"/> - <source>Do you want to disable the tested repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="455"/> - <source>Hide Passwords</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="494"/> - <source>Use</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="494"/> - <source>Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="494"/> - <source>Password</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="495"/> - <source>Repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="496"/> - <source>Default repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="497"/> - <source>Temporary repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="498"/> - <source>User defined repositories</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>TargetDirectoryPageImpl</name> - <message> - <location filename="../installerbasecommons.cpp" line="343"/> - <source>The installation path cannot be empty, please specify a valid folder.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="348"/> - <source>The installation path cannot be relative, please specify an absolute path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="359"/> - <source>The installation path must not contain !@#$%^&*:,; or spaces, please specify a valid folder.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="376"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="385"/> - <source>Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="404"/> - <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="419"/> - <source>As the install directory is completely deleted installing in %1 is forbidden.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="434"/> - <source>The folder you selected exists already and contains an installation. -Do you want to overwrite it?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="439"/> - <source>You have selected an existing, non-empty folder for installation. -Note that it will be completely wiped on uninstallation of this application. -It is not advisable to install into this folder as installation might fail. -Do you want to continue?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../installerbasecommons.cpp" line="443"/> - <source>You have selected an existing file or symlink, please choose a different target for installation.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>TestRepository</name> - <message> - <location filename="../settingsdialog.cpp" line="82"/> - <source>Empty repository URL.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="88"/> - <source>URL scheme not supported: %1 (%2).</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="128"/> - <source>Could not parse Updates.xml! Error: %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="133"/> - <source>Updates.xml could not be opened for reading!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../settingsdialog.cpp" line="136"/> - <source>Updates.xml could not be found on server!</source> - <translation type="unfinished"></translation> - </message> -</context> -</TS> diff --git a/src/sdk/translations/zh_cn.ts b/src/sdk/translations/zh_cn.ts index 022d368ec..95c262fc6 100644 --- a/src/sdk/translations/zh_cn.ts +++ b/src/sdk/translations/zh_cn.ts @@ -1,10 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="zh_CN"> +<TS version="2.1" language="zh_CN"> <context> - <name>Component</name> + <name>AuthenticationRequiredException</name> <message> - <source>Could not open archive %1: %2</source> - <translation>æ— æ³•æ‰“å¼€å˜æ¡£ %1:%2</translation> + <source>%1 at %2</source> + <translation>ä½äºŽ %2 çš„ %1</translation> + </message> + <message> + <source>Proxy requires authentication.</source> + <translation>代ç†éœ€è¦éªŒè¯ã€‚</translation> + </message> +</context> +<context> + <name>BinaryContent</name> + <message> + <source>Could not seek to %1 to read the operation data.</source> + <translation>æ— æ³•æ‰¾åˆ° %1 以读å–æ“作数æ®ã€‚</translation> + </message> + <message> + <source>Could not seek to %1 to read the resource collection block.</source> + <translation>æ— æ³•æ‰¾åˆ° %1 以读å–资æºé›†åˆå—。</translation> + </message> + <message> + <source>Could not open meta resource. Error: %1</source> + <translation>æ— æ³•æ‰“å¼€å…ƒèµ„æºã€‚错误：%1</translation> + </message> +</context> +<context> + <name>BinaryLayout</name> + <message> + <source>Could not seek to %1 to read the embedded meta data count.</source> + <translation>æ— æ³•æ‰¾åˆ° %1 以读å–嵌入元信æ¯æ•°æ®æ€»é‡ã€‚</translation> + </message> + <message> + <source>Could not seek to %1 to read the resource collection segment.</source> + <translation>æ— æ³•æ‰¾åˆ° %1 以读å–资æºé›†ç‰‡æ®µã€‚</translation> + </message> + <message> + <source>Unexpected mismatch of meta resources. Read %1, expected: %2.</source> + <translation>æ„外ä¸åŒ¹é…的元资æºã€‚è¯»å– %1，期望 %2。</translation> </message> </context> <context> @@ -19,11 +54,11 @@ </message> <message> <source>Username:</source> - <translation>用户å:</translation> + <translation>用户å：</translation> </message> <message> <source>Password:</source> - <translation>密ç :</translation> + <translation>密ç ：</translation> </message> <message> <source>%1 at %2</source> @@ -31,38 +66,68 @@ </message> </context> <context> - <name>IntroductionPageImpl</name> + <name>DirectoryGuard</name> <message> - <source>Package manager</source> - <translation>包管ç†å™¨</translation> + <source>Path exists but is not a folder: %1</source> + <translation>路径å˜åœ¨ï¼Œä½†ä¸æ˜¯æ–‡ä»¶å¤¹ï¼š%1</translation> </message> <message> - <source>Update components</source> - <translation>更新组件</translation> + <source>Could not create folder: %1</source> + <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ï¼š%1</translation> </message> +</context> +<context> + <name>ExtractCallbackImpl</name> <message> - <source>Remove all components</source> - <translation>åˆ é™¤æ‰€æœ‰ç»„ä»¶</translation> + <source>Could not retrieve path of archive item %1</source> + <translation>æ— æ³•èŽ·å–å˜æ¡£é¡¹ç›® %1 的路径</translation> </message> <message> - <source>Retrieving information from remote installation sources...</source> - <translation>æ£åœ¨ä»Žè¿œç¨‹å®‰è£…æºæ£€ç´¢ä¿¡æ¯...</translation> + <source>Could not remove already existing symlink. %1</source> + <translation>æ— æ³•åˆ é™¤å·²ç»å˜åœ¨çš„符å·é“¾æŽ¥ã€‚%1</translation> </message> <message> - <source>At least one valid and enabled repository required for this action to succeed.</source> - <translation>è¦ç»§ç»æ¤æ“作，至少需è¦ä¸€ä¸ªæœ‰æ•ˆä¸”å·²å¯ç”¨çš„储å˜åº“。</translation> + <source>Could not open file: %1 (%2)</source> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ï¼š%1 (%2)</translation> </message> <message> - <source>No updates available.</source> - <translation>æ— æ›´æ–°å¯ç”¨ã€‚</translation> + <source>Could not create symlink at '%1'. Another one is already existing.</source> + <translation>æ— æ³•åœ¨â€œ%1â€åˆ›å»ºç¬¦å·é“¾æŽ¥ã€‚å¦ä¸€ä¸ªç¬¦å·é“¾æŽ¥å·²ç»å˜åœ¨ã€‚</translation> </message> <message> - <source> Only local package management available.</source> - <translation> 仅本地包管ç†å¯ç”¨ã€‚</translation> + <source>Could not read symlink target from file '%1'.</source> + <translation>æ— æ³•ä»Žæ–‡ä»¶â€œ%1â€ä¸è¯»å–符å·é“¾æŽ¥ç›®æ ‡ã€‚</translation> </message> <message> - <source>Quit</source> - <translation>退出</translation> + <source>Could not create symlink at %1. %2</source> + <translation>æ— æ³•åœ¨ %1 创建符å·é“¾æŽ¥ã€‚%2</translation> + </message> +</context> +<context> + <name>InstallerCalculator</name> + <message> + <source>Components added as automatic dependencies:</source> + <translation>å·²æ·»åŠ ä¸ºè‡ªåŠ¨ä¾èµ–的组件：</translation> + </message> + <message> + <source>Components added as dependency for '%1':</source> + <translation>å·²æ·»åŠ ä¸ºâ€œ%1â€çš„ä¾èµ–：</translation> + </message> + <message> + <source>Components that have resolved dependencies:</source> + <translation>已解æžä¾èµ–项的组件：</translation> + </message> + <message> + <source>Selected components without dependencies:</source> + <translation>已选定的没有ä¾èµ–项的组件：</translation> + </message> + <message> + <source>Recursion detected, component '%1' already added with reason: '%2'</source> + <translation>检测到递归，组件“%1â€å·²ç»å› 为：“%2â€è¢«æ·»åŠ </translation> + </message> + <message> + <source>Cannot find missing dependency '%1' for '%2'.</source> + <translation>æ— æ³•æ‰¾åˆ°â€œ%2â€ç¼ºå°‘çš„ä¾èµ–“%1â€ã€‚</translation> </message> </context> <context> @@ -73,37 +138,29 @@ </message> </context> <context> - <name>KDSaveFile</name> + <name>KDLockFile</name> <message> - <source>Append mode not supported.</source> - <translation>ä¸æ”¯æŒé™„åŠ æ¨¡å¼ã€‚</translation> + <source>Could not create lock file '%1': %2</source> + <translation>æ— æ³•åˆ›å»ºé”文件“%1â€ï¼š%2</translation> </message> <message> - <source>Read-only access not supported.</source> - <translation>ä¸æ”¯æŒåªè¯»è®¿é—®ã€‚</translation> + <source>Could not write PID to lock file '%1': %2</source> + <translation>æ— æ³•å°† PID 写入é”文件“%1â€ï¼š%2</translation> </message> <message> - <source>Could not backup existing file %1: %2</source> - <translation>æ— æ³•å¤‡ä»½çŽ°æœ‰æ–‡ä»¶ %1:%2</translation> + <source>Could not obtain the lock for file '%1': %2</source> + <translation>æ— æ³•ä¸ºæ–‡ä»¶â€œ%1â€èŽ·å–é”：“%2â€</translation> </message> <message> - <source>TODO</source> - <translation>待办事项</translation> + <source>Could not release the lock for file '%1': %2</source> + <translation>æ— æ³•ä¸ºæ–‡ä»¶â€œ%1â€é‡Šæ”¾é”：%2</translation> </message> </context> <context> <name>KDUpdater::AppendFileOperation</name> <message> <source>Cannot backup file %1: %2</source> - <translation>æ— æ³•å¤‡ä»½æ–‡ä»¶ %1:%2</translation> - </message> - <message> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 2 个。</translation> - </message> - <message> - <source>Could not open file %1 for writing: %2</source> - <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行写入:%2</translation> + <translation>æ— æ³•å¤‡ä»½æ–‡ä»¶ %1：%2</translation> </message> <message> <source>Cannot find backup file for %1.</source> @@ -117,6 +174,18 @@ <source>Could not restore backup file for %1: %2</source> <translation>æ— æ³•æ¢å¤ %1 的备份文件:%2</translation> </message> + <message> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> + </message> + <message> + <source>exactly 2</source> + <translation>æ°å¥½ 2 个</translation> + </message> + <message> + <source>Could not open file '%1' for writing: %2</source> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶â€œ%1â€è¿›è¡Œå†™å…¥ï¼š%2</translation> + </message> </context> <context> <name>KDUpdater::CopyOperation</name> @@ -126,49 +195,42 @@ </message> <message> <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 2 个。</translation> + <translation>å‚æ•°æ— æ•ˆï¼šå·²ç»™å®š %1 个å‚数，应为 2 个。</translation> </message> <message> <source>Could not remove destination file %1: %2</source> - <translation>æ— æ³•åˆ é™¤ç›®æ ‡æ–‡ä»¶ %1:%2</translation> + <translation>æ— æ³•åˆ é™¤ç›®æ ‡æ–‡ä»¶ %1：%2</translation> </message> <message> <source>Could not copy %1 to %2: %3</source> - <translation>æ— æ³•å°† %1 å¤åˆ¶åˆ° %2:%3</translation> + <translation>æ— æ³•å°† %1 å¤åˆ¶åˆ° %2：%3</translation> </message> <message> <source>Could not delete file %1: %2</source> - <translation>æ— æ³•åˆ é™¤æ–‡ä»¶ %1:%2</translation> + <translation>æ— æ³•åˆ é™¤æ–‡ä»¶ %1：%2</translation> </message> <message> <source>Could not restore backup file into %1: %2</source> - <translation>æ— æ³•å°†å¤‡ä»½æ–‡ä»¶æ¢å¤åˆ° %1 ä¸:%2</translation> + <translation>æ— æ³•å°†å¤‡ä»½æ–‡ä»¶æ¢å¤åˆ° %1 ä¸ï¼š%2</translation> + </message> + <message> + <source>Could not copy a non-existent file: %1</source> + <translation>æ— æ³•å¤åˆ¶ä¸å˜åœ¨çš„文件：%1</translation> </message> </context> <context> <name>KDUpdater::DeleteOperation</name> <message> <source>Cannot create backup of %1: %2</source> - <translation>æ— æ³•åˆ›å»º %1 的备份:%2</translation> + <translation>æ— æ³•åˆ›å»º %1 的备份：%2</translation> </message> <message> <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 1 个。</translation> + <translation>å‚æ•°æ— æ•ˆï¼šå·²ç»™å®š %1 个å‚数，应为 1 个。</translation> </message> <message> <source>Cannot restore backup file for %1: %2</source> - <translation>æ— æ³•æ¢å¤ %1 的备份文件:%2</translation> - </message> -</context> -<context> - <name>KDUpdater::ExecuteOperation</name> - <message> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 2 个。</translation> - </message> - <message> - <source>Execution failed: %1</source> - <translation>执行失败:%1</translation> + <translation>æ— æ³•æ¢å¤ %1 的备份文件：%2</translation> </message> </context> <context> @@ -186,109 +248,117 @@ <translation>å·²å–消下载。</translation> </message> <message> - <source> of </source> - <translation> / </translation> + <source> - unknown time remaining.</source> + <translation> - 剩余时间未知。</translation> </message> <message> - <source> downloaded.</source> - <translation> 已下载。</translation> + <source>%1 of %2</source> + <translation>%2 çš„ %1</translation> </message> <message> - <source>/sec</source> - <translation>/秒</translation> + <source>%1 downloaded.</source> + <translation>已下载 %1。</translation> </message> <message> - <source> day</source> - <translation> 天</translation> + <source>(%1/sec)</source> + <translation>（%1/秒）</translation> </message> - <message> - <source> days</source> - <translation> 天</translation> + <message numerus="yes"> + <source>%n day(s), </source> + <translation> + <numerusform>%n 天，</numerusform> + </translation> </message> - <message> - <source> hour</source> - <translation> å°æ—¶</translation> + <message numerus="yes"> + <source>%n hour(s), </source> + <translation> + <numerusform>%n å°æ—¶ï¼Œ </numerusform> + </translation> </message> - <message> - <source> hours</source> - <translation> å°æ—¶</translation> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation> + <numerusform>%n 分钟</numerusform> + </translation> </message> - <message> - <source> minute</source> - <translation> 分</translation> + <message numerus="yes"> + <source>%n second(s)</source> + <translation> + <numerusform>%n 秒</numerusform> + </translation> </message> <message> - <source> minutes</source> - <translation> 分钟</translation> + <source> - %1%2%3%4 remaining.</source> + <translation> - %1%2%3%4 剩余。</translation> </message> +</context> +<context> + <name>KDUpdater::HttpDownloader</name> <message> - <source> second</source> - <translation> 秒</translation> + <source>Cannot download %1: Writing to file '%2' failed: %3</source> + <translation>æ— æ³•ä¸‹è½½ %1：写入文件“%2â€å¤±è´¥ï¼š%3</translation> </message> <message> - <source> seconds</source> - <translation> 秒</translation> + <source>Cannot download %1: Could not create %2: %3</source> + <translation>æ— æ³•ä¸‹è½½ %1ï¼šæ— æ³•åˆ›å»º %2:%3</translation> </message> <message> - <source> - </source> - <translation> - </translation> + <source>%1 at %2</source> + <translation>ä½äºŽ %2 çš„ %1</translation> </message> <message> - <source> remaining.</source> - <translation> 剩余。</translation> + <source>Authentication request canceled.</source> + <translation>å·²å–消身份验è¯è¯·æ±‚。</translation> </message> <message> - <source> - unknown time remaining.</source> - <translation> - 剩余时间未知。</translation> + <source>Secure Connection Failed</source> + <translation>安全连接失败</translation> </message> -</context> -<context> - <name>KDUpdater::HttpDownloader</name> <message> - <source>Cannot download %1: Writing to file '%2' failed: %3</source> - <translation>æ— æ³•ä¸‹è½½ %1:写入文件“%2â€å¤±è´¥:%3</translation> + <source>There was an error during connection to: %1.</source> + <translation>连接“%1â€æ—¶å‘生错误。</translation> </message> <message> - <source>Cannot download %1: Could not create %2: %3</source> - <translation>æ— æ³•ä¸‹è½½ %1:æ— æ³•åˆ›å»º %2:%3</translation> + <source>This could be a problem with the server's configuration, or it could be someone trying to impersonate the server.</source> + <translation>è¿™å¯èƒ½æ˜¯æœåŠ¡å™¨é…置的问题，或者是有人å°è¯•å†’å……æœåŠ¡å™¨ã€‚</translation> </message> <message> - <source>%1 at %2</source> - <translation>ä½äºŽ %2 çš„ %1</translation> + <source>If you have connected to this server successfully in the past or trust this server, the error may be temporary and you can try again.</source> + <translation>如果您以å‰æˆåŠŸè¿žæŽ¥åˆ°è¿™ä¸ªæœåŠ¡å™¨æˆ–者信任æ¤æœåŠ¡å™¨ï¼Œè¿™ä¸ªé”™è¯¯å¯èƒ½æ˜¯æš‚时的，请å†æ¬¡å°è¯•ã€‚</translation> </message> <message> - <source>Authentication request canceled.</source> - <translation>å·²å–消身份验è¯è¯·æ±‚。</translation> + <source>Try again</source> + <translation>å†æ¬¡å°è¯•</translation> </message> </context> <context> <name>KDUpdater::LocalFileDownloader</name> <message> - <source>Cannot open source file '%1' for reading.</source> + <source>Cannot open source file '%1' for reading.</source> <translation>æ— æ³•æ‰“å¼€æºæ–‡ä»¶â€œ%1â€è¿›è¡Œè¯»å–。</translation> </message> <message> - <source>Cannot open destination file '%1' for writing.</source> + <source>Cannot open destination file '%1' for writing.</source> <translation>æ— æ³•æ‰“å¼€ç›®æ ‡æ–‡ä»¶â€œ%1â€è¿›è¡Œå†™å…¥ã€‚</translation> </message> <message> <source>Writing to %1 failed: %2</source> - <translation>写入 %1 失败:%2</translation> + <translation>写入 %1 失败：%2</translation> </message> </context> <context> <name>KDUpdater::MkdirOperation</name> <message> <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 1 个。</translation> + <translation>å‚æ•°æ— æ•ˆï¼šå·²ç»™å®š %1 个å‚数，应为 1 个。</translation> </message> <message> <source>Could not create folder %1: Unknown error.</source> - <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ %1:未知错误。</translation> + <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ %1：未知错误。</translation> </message> <message> <source>Cannot remove directory %1: %2</source> - <translation>æ— æ³•åˆ é™¤ç›®å½• %1:%2</translation> + <translation>æ— æ³•åˆ é™¤ç›®å½• %1：%2</translation> </message> </context> <context> @@ -299,19 +369,19 @@ </message> <message> <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 2 个。</translation> + <translation>å‚æ•°æ— æ•ˆï¼šå·²ç»™å®š %1 个å‚数，应为 2 个。</translation> </message> <message> <source>Could not remove destination file %1: %2</source> - <translation>æ— æ³•åˆ é™¤ç›®æ ‡æ–‡ä»¶ %1:%2</translation> + <translation>æ— æ³•åˆ é™¤ç›®æ ‡æ–‡ä»¶ %1：%2</translation> </message> <message> <source>Could not copy %1 to %2: %3</source> - <translation>æ— æ³•å°† %1 å¤åˆ¶åˆ° %2:%3</translation> + <translation>æ— æ³•å°† %1 å¤åˆ¶åˆ° %2：%3</translation> </message> <message> <source>Cannot copy %1 to %2: %3</source> - <translation>æ— æ³•å°† %1 å¤åˆ¶åˆ° %2:%3</translation> + <translation>æ— æ³•å°† %1 å¤åˆ¶åˆ° %2：%3</translation> </message> <message> <source>Cannot remove file %1.</source> @@ -319,14 +389,14 @@ </message> <message> <source>Cannot restore backup file for %1: %2</source> - <translation>æ— æ³•æ¢å¤ %1 的备份文件:%2</translation> + <translation>æ— æ³•æ¢å¤ %1 的备份文件：%2</translation> </message> </context> <context> <name>KDUpdater::PackagesInfo</name> <message> <source>%1 contains invalid content: %2</source> - <translation>%1 包å«æ— 效的内容:%2</translation> + <translation>%1 包å«æ— 效的内容：%2</translation> </message> <message> <source>The file %1 does not exist.</source> @@ -338,10 +408,10 @@ </message> <message> <source>Parse error in %1 at %2, %3: %4</source> - <translation>%1 ä¸å˜åœ¨è§£æžé”™è¯¯ï¼Œä½äºŽ %2，%3:%4</translation> + <translation>%1 ä¸å˜åœ¨è§£æžé”™è¯¯ï¼Œä½äºŽ %2，%3：%4</translation> </message> <message> - <source>Root element %1 unexpected, should be 'Packages'.</source> + <source>Root element %1 unexpected, should be 'Packages'.</source> <translation>æ ¹å…ƒç´ %1 与预期ä¸ç¬¦ï¼Œåº”为“包â€ã€‚</translation> </message> </context> @@ -349,19 +419,19 @@ <name>KDUpdater::PrependFileOperation</name> <message> <source>Cannot backup file %1: %2</source> - <translation>æ— æ³•å¤‡ä»½æ–‡ä»¶ %1:%2</translation> + <translation>æ— æ³•å¤‡ä»½æ–‡ä»¶ %1：%2</translation> </message> <message> <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 2 个。</translation> + <translation>å‚æ•°æ— æ•ˆï¼šå·²ç»™å®š %1 个å‚数，应为 2 个。</translation> </message> <message> <source>Could not open file %1 for reading: %2</source> - <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行读å–:%2</translation> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行读å–：%2</translation> </message> <message> <source>Could not open file %1 for writing: %2</source> - <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行写入:%2</translation> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行写入：%2</translation> </message> <message> <source>Cannot find backup file for %1.</source> @@ -373,33 +443,33 @@ </message> <message> <source>Cannot restore backup file for %1: %2</source> - <translation>æ— æ³•æ¢å¤ %1 的备份文件:%2</translation> + <translation>æ— æ³•æ¢å¤ %1 的备份文件：%2</translation> </message> </context> <context> <name>KDUpdater::ResourceFileDownloader</name> <message> - <source>Could not read resource file "%1". Reason:</source> - <translation>æ— æ³•è¯»å–æºæ–‡ä»¶â€œ%1â€ã€‚åŽŸå› :</translation> + <source>Could not read resource file "%1". Reason:</source> + <translation>æ— æ³•è¯»å–æºæ–‡ä»¶â€œ%1â€ã€‚åŽŸå› ï¼š</translation> </message> </context> <context> <name>KDUpdater::RmdirOperation</name> <message> <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 1 个。</translation> + <translation>å‚æ•°æ— æ•ˆï¼šå·²ç»™å®š %1 个å‚数，应为 1 个。</translation> </message> <message> <source>Could not remove folder %1: The folder does not exist.</source> - <translation>æ— æ³•åˆ é™¤æ–‡ä»¶å¤¹ %1:该文件夹ä¸å˜åœ¨ã€‚</translation> + <translation>æ— æ³•åˆ é™¤æ–‡ä»¶å¤¹ %1：该文件夹ä¸å˜åœ¨ã€‚</translation> </message> <message> <source>Could not remove folder %1: %2</source> - <translation>æ— æ³•åˆ é™¤æ–‡ä»¶å¤¹ %1:%2</translation> + <translation>æ— æ³•åˆ é™¤æ–‡ä»¶å¤¹ %1：%2</translation> </message> <message> <source>Cannot recreate directory %1: %2</source> - <translation>æ— æ³•é‡æ–°åˆ›å»ºç›®å½• %1:%2</translation> + <translation>æ— æ³•é‡æ–°åˆ›å»ºç›®å½• %1：%2</translation> </message> </context> <context> @@ -434,28 +504,6 @@ </message> </context> <context> - <name>KDUpdater::Update</name> - <message> - <source>Downloading update...</source> - <translation>æ£åœ¨ä¸‹è½½æ›´æ–°...</translation> - </message> - <message> - <source>Update downloaded</source> - <translation>已下载更新</translation> - </message> -</context> -<context> - <name>KDUpdater::UpdateCompatOperation</name> - <message> - <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 1 个。</translation> - </message> - <message> - <source>Cannot restore previous compat-level</source> - <translation>æ— æ³•æ¢å¤å…ˆå‰çš„兼容级别</translation> - </message> -</context> -<context> <name>KDUpdater::UpdateFinder</name> <message> <source>Could not access the package information of this application.</source> @@ -466,42 +514,14 @@ <translation>æ— æ³•è®¿é—®æ¤åº”用程åºçš„æ›´æ–°æºä¿¡æ¯ã€‚</translation> </message> <message> - <source>%1 updates found.</source> - <translation>已找到 %1 个更新。</translation> - </message> - <message> <source>Downloading Updates.xml from update sources.</source> <translation>æ£åœ¨ä»Žæ›´æ–°æºä¸‹è½½ Updates.xml。</translation> </message> <message> - <source>Could not download updates from %1 ('%2')</source> - <translation>æ— æ³•ä»Ž %1 (“%2â€)下载更新</translation> - </message> - <message> <source>Updates.xml file(s) downloaded from update sources.</source> <translation>已从更新æºä¸‹è½½ Updates.xml 文件。</translation> </message> <message> - <source>Looking for compatibility update...</source> - <translation>æ£åœ¨æŸ¥æ‰¾å…¼å®¹æ€§æ›´æ–°...</translation> - </message> - <message> - <source>Found compatibility update.</source> - <translation>已找到兼容性更新。</translation> - </message> - <message> - <source>Update not found.</source> - <translation>未找到更新。</translation> - </message> - <message> - <source>Compatibility update found.</source> - <translation>已找到兼容性更新。</translation> - </message> - <message> - <source>No compatibility updates found.</source> - <translation>未找到兼容性更新。</translation> - </message> - <message> <source>Computing applicable updates.</source> <translation>æ£åœ¨è®¡ç®—适用的更新。</translation> </message> @@ -509,61 +529,56 @@ <source>Application updates computed.</source> <translation>应用程åºæ›´æ–°è®¡ç®—完毕。</translation> </message> -</context> -<context> - <name>KDUpdater::UpdatePackageOperation</name> - <message> - <source>Invalid arguments: %1 arguments given, 3 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 3 个。</translation> - </message> - <message> - <source>Cannot update %1-%2</source> - <translation>æ— æ³•æ›´æ–° %1-%2</translation> + <message numerus="yes"> + <source>%n update(s) found.</source> + <translation> + <numerusform>已找到 %n 个更新。</numerusform> + </translation> </message> <message> - <source>Cannot restore %1-%2</source> - <translation>æ— æ³•æ¢å¤ %1-%2</translation> + <source>Could not download update source %1 from ('%2')</source> + <translation>æ— æ³•ä»Žï¼ˆâ€œ%2â€ï¼‰ä¸‹è½½æ›´æ–°èµ„æº %1</translation> </message> </context> <context> <name>KDUpdater::UpdateSourcesInfo</name> <message> <source>%1 contains invalid content: %2</source> - <translation>%1 包å«æ— 效的内容:%2</translation> + <translation>%1 包å«æ— 效的内容：%2</translation> </message> <message> - <source>Could not read "%1"</source> + <source>Could not read "%1"</source> <translation>æ— æ³•è¯»å–“%1â€</translation> </message> <message> <source>XML Parse error in %1 at %2, %3: %4</source> - <translation>%1 ä¸å˜åœ¨ XML 解æžé”™è¯¯ï¼Œä½äºŽ %2，%3:%4</translation> + <translation>%1 ä¸å˜åœ¨ XML 解æžé”™è¯¯ï¼Œä½äºŽ %2，%3：%4</translation> </message> <message> - <source>Root element %1 unexpected, should be "UpdateSources"</source> + <source>Root element %1 unexpected, should be "UpdateSources"</source> <translation>æ ¹å…ƒç´ %1 与预期ä¸ç¬¦ï¼Œåº”为“更新æºâ€</translation> </message> <message> - <source>Could not save changes to "%1": %2</source> - <translation>æ— æ³•å°†æ›´æ”¹ä¿å˜åˆ°â€œ%1â€:%2</translation> + <source>Could not save changes to "%1": %2</source> + <translation>æ— æ³•å°†æ›´æ”¹ä¿å˜åˆ°â€œ%1â€ï¼š%2</translation> </message> </context> <context> <name>KDUpdater::UpdatesInfoData</name> <message> <source>Updates.xml contains invalid content: %1</source> - <translation>Updates.xml 包å«æ— 效的内容:%1</translation> + <translation>Updates.xml 包å«æ— 效的内容：%1</translation> </message> <message> - <source>Could not read "%1"</source> + <source>Could not read "%1"</source> <translation>æ— æ³•è¯»å–“%1â€</translation> </message> <message> <source>Parse error in %1 at %2, %3: %4</source> - <translation>%1 ä¸å˜åœ¨è§£æžé”™è¯¯ï¼Œä½äºŽ %2，%3:%4</translation> + <translation>%1 ä¸å˜åœ¨è§£æžé”™è¯¯ï¼Œä½äºŽ %2，%3：%4</translation> </message> <message> - <source>Root element %1 unexpected, should be "Updates".</source> + <source>Root element %1 unexpected, should be "Updates".</source> <translation>æ ¹å…ƒç´ %1 与预期ä¸ç¬¦ï¼Œåº”为“更新â€ã€‚</translation> </message> <message> @@ -586,101 +601,283 @@ <source>PackageUpdate element without ReleaseDate</source> <translation>PackageUpdate å…ƒç´ ç¼ºå°‘ ReleaseDate</translation> </message> +</context> +<context> + <name>Lib7z</name> + <message> + <source>Could not retrieve number of items in archive</source> + <translation>æ— æ³•æ£€ç´¢å˜æ¡£ä¸çš„项目数é‡</translation> + </message> + <message> + <source>Could not retrieve path of archive item %1</source> + <translation>æ— æ³•èŽ·å–å˜æ¡£é¡¹ç›® %1 的路径</translation> + </message> + <message> + <source>Unknown exception caught (%1)</source> + <translation>æ•èŽ·æœªçŸ¥å¼‚常(%1)</translation> + </message> + <message> + <source>internal code: %1</source> + <translation>内部代ç ：%1</translation> + </message> + <message> + <source>not enough memory</source> + <translation>内å˜ä¸è¶³</translation> + </message> + <message> + <source>Error: %1</source> + <translation>错误：%1</translation> + </message> <message> - <source>PackageUpdate element without UpdateFile</source> - <translation>PackageUpdate å…ƒç´ ç¼ºå°‘ UpdateFile</translation> + <source>Could not load codecs</source> + <translation>æ— æ³•åŠ è½½è§£ç 器</translation> + </message> + <message> + <source>Could not retrieve default format</source> + <translation>æ— æ³•æ£€ç´¢é»˜è®¤æ ¼å¼</translation> + </message> + <message> + <source>Could not create archive %1. %2</source> + <translation>æ— æ³•åˆ›å»ºå˜æ¡£ %1。%2</translation> </message> <message> - <source>CompatUpdate element without CompatLevel</source> - <translation>CompatUpdate å…ƒç´ ç¼ºå°‘ CompatLevel</translation> + <source>CArc index %1 out of bounds [0, %2]</source> + <translation>CArc 索引 %1 超出 [0, %2] 的范围</translation> </message> <message> - <source>CompatUpdate element without ReleaseDate</source> - <translation>CompatUpdate å…ƒç´ ç¼ºå°‘ ReleaseDate</translation> + <source>Item index %1 out of bounds [0, %2]</source> + <translation>项目索引 %1 超出 [0, %2] 的范围</translation> </message> <message> - <source>CompatUpdate element without UpdateFile</source> - <translation>CompatUpdate å…ƒç´ ç¼ºå°‘ UpdateFile</translation> + <source>Could not create output file for writing: %1</source> + <translation>æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶è¿›è¡Œå†™å…¥ï¼š%1</translation> </message> </context> <context> <name>Lib7z::ExtractItemJob</name> <message> <source>Could not list archive: QIODevice not set or already destroyed.</source> - <translation>æ— æ³•åˆ—å‡ºå˜æ¡£:QIODevice 尚未设置或已æŸå。</translation> + <translation>æ— æ³•åˆ—å‡ºå˜æ¡£ï¼šQIODevice 尚未设置或已æŸå。</translation> + </message> + <message> + <source>Error while extracting '%1': %2</source> + <translation>æå–“%1â€æ—¶å‘生错误：%2</translation> + </message> + <message> + <source>Unknown exception caught (%1)</source> + <translation>æ•èŽ·æœªçŸ¥å¼‚常(%1)</translation> + </message> + <message> + <source>Failed</source> + <translation>失败</translation> </message> </context> <context> <name>Lib7z::ListArchiveJob</name> <message> <source>Could not list archive: QIODevice already destroyed.</source> - <translation>æ— æ³•åˆ—å‡ºå˜æ¡£:QIODevice å·²æŸå。</translation> + <translation>æ— æ³•åˆ—å‡ºå˜æ¡£ï¼šQIODevice å·²æŸå。</translation> + </message> + <message> + <source>Unknown exception caught (%1)</source> + <translation>æ•èŽ·æœªçŸ¥å¼‚常(%1)</translation> + </message> + <message> + <source>Failed</source> + <translation>失败</translation> </message> </context> <context> - <name>QInstaller::AddQtCreatorArrayValueOperation</name> + <name>OpenArchiveInfo</name> <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <source>Could not load codecs</source> + <translation>æ— æ³•åŠ è½½è§£ç 器</translation> </message> <message> - <source>exactly 4</source> - <translation>æ°å¥½ 4 个</translation> + <source>Could not retrieve default format</source> + <translation>æ— æ³•æ£€ç´¢é»˜è®¤æ ¼å¼</translation> </message> <message> - <source> (group, arrayname, key, value)</source> - <translation> (groupã€arraynameã€keyã€value)</translation> + <source>Could not open archive</source> + <translation>æ— æ³•æ‰“å¼€å˜æ¡£</translation> </message> <message> - <source>Needed installer object in %1 operation is empty.</source> - <translation>%1 è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> + <source>No CArc found</source> + <translation>未找到 CArc</translation> </message> +</context> +<context> + <name>QIODeviceSequentialOutStream</name> <message> - <source>There is no value set for %1 on the installer object.</source> - <translation>没有为安装程åºå¯¹è±¡ä¸Šçš„ %1 设定值。</translation> + <source>No device set for output stream</source> + <translation>没有为输出æµè®¾ç½®è®¾å¤‡</translation> </message> </context> <context> - <name>QInstaller::Component</name> + <name>QInstaller</name> <message> - <source>Could not open the requested script file at %1: %2.</source> - <translation>æ— æ³•æ‰“å¼€ä½äºŽ %1 的请求脚本文件:%2.</translation> + <source>No marker found, stopped after %1.</source> + <translation>æœªæ‰¾åˆ°æ ‡è®°ï¼Œå·²åœ¨ %1 åŽåœæ¢ã€‚</translation> + </message> + <message> + <source>Cannot open file %1 for reading: %2</source> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行读å–：%2</translation> + </message> + <message> + <source>Cannot open file %1 for writing: %2</source> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行写入：%2</translation> + </message> + <message> + <source>Read failed after %1 bytes: %2</source> + <translation>è¯»å– %1 å—节åŽå¤±è´¥ï¼š%2</translation> + </message> + <message> + <source>Copy failed. Error: %1</source> + <translation>å¤åˆ¶å¤±è´¥ã€‚错误：%1</translation> + </message> + <message> + <source>Write failed after %1 bytes: %2</source> + <translation>写入 %1 å—节åŽå¤±è´¥ï¼š%2</translation> + </message> + <message> + <source>bytes</source> + <translation>å—节</translation> + </message> + <message> + <source>KiB</source> + <translatorcomment>MB</translatorcomment> + <translation>KB</translation> + </message> + <message> + <source>MiB</source> + <translation>MB</translation> + </message> + <message> + <source>GiB</source> + <translation>GB</translation> + </message> + <message> + <source>TiB</source> + <translation>TB</translation> + </message> + <message> + <source>PiB</source> + <translation>PB</translation> + </message> + <message> + <source>EiB</source> + <translation>EB</translation> + </message> + <message> + <source>ZiB</source> + <translation>ZB</translation> + </message> + <message> + <source>YiB</source> + <translation>YB</translation> + </message> + <message> + <source>Could not remove file %1: %2</source> + <translation>æ— æ³•åˆ é™¤æ–‡ä»¶ %1：%2</translation> + </message> + <message> + <source>Could not remove folder %1: %2</source> + <translation>æ— æ³•åˆ é™¤æ–‡ä»¶å¤¹ %1：%2</translation> + </message> + <message> + <source>Could not create folder %1</source> + <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ %1</translation> + </message> + <message> + <source>Could not copy file from %1 to %2: %3</source> + <translation>æ— æ³•å°†æ–‡ä»¶ä»Ž %1 å¤åˆ¶åˆ° %2：%3</translation> + </message> + <message> + <source>Could not move file from %1 to %2: %3</source> + <translation>æ— æ³•å°†æ–‡ä»¶ä»Ž %1 移动到 %2：%3</translation> + </message> + <message> + <source>Could not create folder %1: %2</source> + <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ %1：%2</translation> + </message> + <message> + <source>Could not open temporary file: %1</source> + <translation>æ— æ³•æ‰“å¼€ä¸´æ—¶æ–‡ä»¶ï¼š%1</translation> + </message> + <message> + <source>Could not open temporary file for template %1: %2</source> + <translation>æ— æ³•æ‰“å¼€æ¨¡æ¿ %1 的临时文件：%2</translation> + </message> + <message> + <source>Could not create temporary file</source> + <translation>æ— æ³•åˆ›å»ºä¸´æ—¶æ–‡ä»¶</translation> + </message> + <message> + <source>Could not retrieve property %1 for item %2</source> + <translation>æ— æ³•æ£€ç´¢ %2 项目的 %1 属性</translation> + </message> + <message> + <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> + <translation>%2 项目的 %1 属性ä¸å±žäºŽ VT_FILETIME 类型，而是 %3</translation> + </message> + <message> + <source>Could not convert file time to local time</source> + <translation>æ— æ³•å°†æ–‡ä»¶æ—¶é—´è½¬æ¢ä¸ºæœ¬åœ°æ—¶é—´</translation> </message> <message> - <source>Exception while loading the component script: %1</source> - <translation>åŠ è½½ç»„ä»¶è„šæœ¬æ—¶å‡ºçŽ°å¼‚å¸¸:%1</translation> + <source>Could not convert local file time to system time</source> + <translation>æ— æ³•å°†æœ¬åœ°æ–‡ä»¶æ—¶é—´è½¬æ¢ä¸ºç³»ç»Ÿæ—¶é—´</translation> </message> <message> - <source>Could not open the requested translation file at %1</source> - <translation>æ— æ³•æ‰“å¼€ä½äºŽ %1 的请求翻译文件:</translation> + <source>Corrupt installation</source> + <translation>安装已æŸå</translation> </message> <message> - <source>Could not open the requested UI file at %1: %2</source> - <translation>æ— æ³•æ‰“å¼€ä½äºŽ %1 的请求 UI 文件:%2</translation> + <source>Your installation seems to be corrupted. Please consider re-installing from scratch.</source> + <translation>您的安装似乎已ç»æŸå。请您考虑é‡æ–°å®‰è£…。</translation> </message> <message> - <source>Could not open the requested license file at %1: %2</source> - <translation>æ— æ³•æ‰“å¼€ä½äºŽ %1 的请求许å¯æ–‡ä»¶:%2</translation> + <source>The specified module could not be found.</source> + <translation>æ— æ³•æ‰¾åˆ°æ‚¨æŒ‡å®šçš„æ¨¡å—。</translation> </message> +</context> +<context> + <name>QInstaller::Component</name> <message> <source>Error</source> <translation>错误</translation> </message> <message> <source>Error: Operation %1 does not exist</source> - <translation>错误:è¿ç®— %1 ä¸å˜åœ¨</translation> + <translation>错误：è¿ç®— %1 ä¸å˜åœ¨</translation> </message> <message> - <source>Can't resolve isAutoDependOn in %1</source> - <translation>æ— æ³•è§£æž %1 ä¸çš„ isAutoDependOn</translation> + <source>Update Info: </source> + <translation>æ›´æ–°ä¿¡æ¯ï¼š</translation> </message> <message> - <source>Can't resolve isDefault in %1</source> - <translation>æ— æ³•è§£æž %1 ä¸çš„ isDefault</translation> + <source>Components cannot have children in updater mode.</source> + <translation>在å‡çº§æ¨¡å¼ä¸‹ç»„ä»¶æ— æ³•å«æœ‰å组件。</translation> </message> <message> - <source>Update Info: </source> - <translation>æ›´æ–°ä¿¡æ¯:</translation> + <source>Could not open the requested translation file '%1'.</source> + <translation>æ— æ³•æ‰“å¼€è¯·æ±‚çš„ç¿»è¯‘æ–‡ä»¶â€œ%1â€ã€‚</translation> + </message> + <message> + <source>Could not open the requested UI file '%1'. Error: %2</source> + <translation>æ— æ³•æ‰“å¼€è¯·æ±‚çš„UI文件“%1â€ã€‚错误：%2</translation> + </message> + <message> + <source>Could not load the requested UI file '%1'. Error: %2</source> + <translation>æ— æ³•åŠ è½½è¯·æ±‚çš„UI文件“%1â€ã€‚错误：%2</translation> + </message> + <message> + <source>Could not open the requested license file '%1'. Error: %2</source> + <translation>æ— æ³•æ‰“å¼€è¯·æ±‚çš„è®¸å¯æ–‡ä»¶â€œ%1â€ã€‚错误：%2</translation> + </message> + <message> + <source>Cannot resolve isDefault in %1</source> + <translation>æ— æ³•è§£æž %1 ä¸çš„ isDefault</translation> </message> </context> <context> @@ -701,6 +898,30 @@ <source>Size</source> <translation>大å°</translation> </message> + <message> + <source>Component is marked for installation.</source> + <translation>ç»„ä»¶å·²è¢«æ ‡è®°ä¸ºå®‰è£…ã€‚</translation> + </message> + <message> + <source>Component is marked for uninstallation.</source> + <translation>ç»„ä»¶å·²è¢«æ ‡è®°ä¸ºå¸è½½ã€‚</translation> + </message> + <message> + <source>Component is installed.</source> + <translation>组件已被安装。</translation> + </message> + <message> + <source>Component is not installed.</source> + <translation>组件未被安装。</translation> + </message> + <message> + <source>Action</source> + <translation>动作</translation> + </message> + <message> + <source>Release Date</source> + <translation>å‘布日期</translation> + </message> </context> <context> <name>QInstaller::ComponentSelectionPage</name> @@ -766,10 +987,37 @@ </message> </context> <context> + <name>QInstaller::ConsumeOutputOperation</name> + <message> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> + </message> + <message> + <source>at least 2</source> + <translation>至少 2 个</translation> + </message> + <message> + <source>Needed installer object in %1 operation is empty.</source> + <translation>%1 è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> + </message> + <message> + <source>Can not save the output of %1 to an empty installer key value.</source> + <translation>æ— æ³•ä¿å˜ %1 的输出到一个空的安装键值。</translation> + </message> + <message> + <source>File '%1' does not exist or is not an executable binary.</source> + <translation>文件“%1â€ä¸å˜åœ¨æˆ–者ä¸æ˜¯ä¸€ä¸ªå¯æ‰§è¡Œæ–‡ä»¶ã€‚</translation> + </message> + <message> + <source>Running '%1' resulted in a crash.</source> + <translation>è¿è¡Œâ€œ%1â€å¯¼è‡´å´©æºƒã€‚</translation> + </message> +</context> +<context> <name>QInstaller::CopyDirectoryOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>2 or 3</source> @@ -785,7 +1033,7 @@ </message> <message> <source>Invalid arguments in %0: Directories are invalid: %1 %2</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:ç›®å½•æ— æ•ˆ:%1 %2</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:ç›®å½•æ— æ•ˆï¼š%1 %2</translation> </message> <message> <source>Could not create %0</source> @@ -797,7 +1045,7 @@ </message> <message> <source>Could not copy %0 to %1, error was: %3</source> - <translation>æ— æ³•å°† %0 å¤åˆ¶åˆ° %1，错误为:%3</translation> + <translation>æ— æ³•å°† %0 å¤åˆ¶åˆ° %1，错误为：%3</translation> </message> <message> <source>Could not remove %0</source> @@ -805,10 +1053,29 @@ </message> </context> <context> + <name>QInstaller::CopyFileTask</name> + <message> + <source>Invalid task item count.</source> + <translation>æ— æ•ˆçš„ä»»åŠ¡é¡¹æ€»æ•°ã€‚</translation> + </message> + <message> + <source>Could not open source '%1' for read. Error: %2.</source> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶â€œ%1â€è¿›è¡Œè¯»å–。错误：%2。</translation> + </message> + <message> + <source>Could not open target '%1' for write. Error: %2.</source> + <translation>æ— æ³•æ‰“å¼€ç›®æ ‡â€œ%1â€è¿›è¡Œå†™å…¥ã€‚错误：%2。</translation> + </message> + <message> + <source>Writing to target '%1' failed. Error: %2.</source> + <translation>å†™å…¥ç›®æ ‡â€œ%1â€å¤±è´¥ã€‚错误：%2。</translation> + </message> +</context> +<context> <name>QInstaller::CreateDesktopEntryOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>exactly 2</source> @@ -822,17 +1089,29 @@ <source>Could not write Desktop Entry at %1</source> <translation>æ— æ³•å†™å…¥ä½äºŽ %1 çš„æ¡Œé¢æ¡ç›®</translation> </message> + <message> + <source>Could not backup file %1: %2</source> + <translation>æ— æ³•å¤‡ä»½æ–‡ä»¶ %1: %2</translation> + </message> </context> <context> <name>QInstaller::CreateLinkOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>exactly 2</source> <translation>æ°å¥½ 2 个</translation> </message> + <message> + <source>Could not create link from %1 to %2.</source> + <translation>æ— æ³•åˆ›å»ºä»Ž %1 到 %2 的链接。</translation> + </message> + <message> + <source>Could not remove link from %1 to %2.</source> + <translation>æ— æ³•åˆ é™¤ä»Ž %1 到 %2 的链接。</translation> + </message> </context> <context> <name>QInstaller::CreateLocalRepositoryOperation</name> @@ -842,11 +1121,11 @@ </message> <message> <source>Could not move file %1 to %2. Error: %3</source> - <translation>æ— æ³•å°†æ–‡ä»¶ %1 移动到 %2。错误:%3</translation> + <translation>æ— æ³•å°†æ–‡ä»¶ %1 移动到 %2。错误：%3</translation> </message> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>exactly 2</source> @@ -854,31 +1133,31 @@ </message> <message> <source>Installer needs to be an offline version: %1.</source> - <translation>安装程åºå¿…须为离线版本:%1.</translation> + <translation>安装程åºå¿…须为离线版本：%1.</translation> </message> <message> <source>Could not open file: %1</source> - <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶:%1</translation> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ï¼š%1</translation> </message> <message> <source>Could not read: %1. Error: %2</source> - <translation>æ— æ³•è¯»å–:%1.错误:%2</translation> + <translation>æ— æ³•è¯»å–：%1.错误：%2</translation> </message> <message> <source>Could not open file: %1. Error: %2</source> - <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶:%1.错误:%2</translation> + <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ï¼š%1.错误：%2</translation> </message> <message> <source>Could not create target dir: %1.</source> - <translation>æ— æ³•åˆ›å»ºç›®æ ‡ç›®å½•:%1.</translation> + <translation>æ— æ³•åˆ›å»ºç›®æ ‡ç›®å½•ï¼š%1.</translation> </message> <message> <source>Unknown exception caught: %1.</source> - <translation>æ•èŽ·æœªçŸ¥å¼‚常:%1.</translation> + <translation>æ•èŽ·æœªçŸ¥å¼‚常：%1.</translation> </message> <message> <source>Removing file: %0</source> - <translation>æ£åœ¨åˆ 除文件:%0</translation> + <translation>æ£åœ¨åˆ 除文件：%0</translation> </message> <message> <source>Could not remove %0.</source> @@ -886,30 +1165,38 @@ </message> <message> <source>Cannot remove directory %1: %2</source> - <translation>æ— æ³•åˆ é™¤ç›®å½• %1:%2</translation> + <translation>æ— æ³•åˆ é™¤ç›®å½• %1：%2</translation> + </message> + <message> + <source>Could not remove file %1: %2</source> + <translation>æ— æ³•åˆ é™¤æ–‡ä»¶ %1：%2</translation> </message> </context> <context> <name>QInstaller::CreateShortcutOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>2 or 3</source> <translation>2 或 3 个</translation> </message> <message> - <source> (optional: 'workingDirectory=...')</source> - <translation> (å¯é€‰:"workingDirectory=...")</translation> - </message> - <message> <source>Could not create folder %1: %2.</source> - <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ %1:%2.</translation> + <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ %1：%2.</translation> </message> <message> <source>Could not create link %1: %2</source> - <translation>æ— æ³•åˆ›å»ºé“¾æŽ¥ %1:%2</translation> + <translation>æ— æ³•åˆ›å»ºé“¾æŽ¥ %1：%2</translation> + </message> + <message> + <source> (optional: 'workingDirectory=...', 'iconPath=...', 'iconId=...')</source> + <translation> (å¯é€‰ï¼šâ€œworkingDirectory=...â€,“iconPath=...â€ï¼Œâ€œiconId=...â€)</translation> + </message> + <message> + <source>Failed to overwrite %1: %2</source> + <translation>覆盖 %1 失败：%2</translation> </message> </context> <context> @@ -936,74 +1223,119 @@ </message> <message> <source>Could not download archive: %1 : %2</source> - <translation>æ— æ³•ä¸‹è½½å˜æ¡£:%1 :%2</translation> + <translation>æ— æ³•ä¸‹è½½å˜æ¡£ï¼š%1：%2</translation> </message> <message> <source>Could not fetch archives: %1 Error while loading %2</source> - <translation>æ— æ³•æå–å˜æ¡£:%1 + <translation>æ— æ³•æå–å˜æ¡£ï¼š%1 åŠ è½½ %2 时出现错误</translation> </message> <message> - <source>Downloading archive hash for component: %1</source> - <translation>æ£åœ¨ä¸‹è½½ç»„件的å˜æ¡£æ•£åˆ—:%1</translation> + <source>Scheme not supported: %1 (%2)</source> + <translation>ä¸æ”¯æŒçš„方案：%1 (%2)</translation> </message> <message> - <source>Downloading archive for component: %1</source> - <translation>æ£åœ¨ä¸‹è½½ç»„件的å˜æ¡£:%1</translation> + <source>Could not find component for: %1.</source> + <translation>æ— æ³•ä¸‹è½½ä»¥ä¸‹é¡¹ç›®çš„ç»„ä»¶ï¼š%1.</translation> </message> <message> - <source>Scheme not supported: %1 (%2)</source> - <translation>ä¸æ”¯æŒçš„方案:%1 (%2)</translation> + <source>Downloading archive '%1' for component: %2</source> + <translation>æ£åœ¨ä¸ºç»„件 %2 下载å˜æ¡£æ–‡ä»¶â€œ%1â€</translation> </message> +</context> +<context> + <name>QInstaller::Downloader</name> <message> - <source>Could not find component for: %1.</source> - <translation>æ— æ³•ä¸‹è½½ä»¥ä¸‹é¡¹ç›®çš„ç»„ä»¶:%1.</translation> + <source>Target '%1' not open for write. Error: %2.</source> + <extracomment>%2 is a sentence describing the error.</extracomment> + <translation>ç›®æ ‡â€œ%1â€æœªæ‰“开以进行写入。错误：%2。</translation> + </message> + <message> + <source>Writing to target '%1' failed. Error: %2.</source> + <extracomment>%2 is a sentence describing the error.</extracomment> + <translation>å†™å…¥ç›®æ ‡â€œ%1â€å¤±è´¥ã€‚错误：%2。</translation> + </message> + <message> + <source>Redirect loop detected '%1'.</source> + <translation>检测到é‡å®šå‘循环“%1â€ã€‚</translation> + </message> + <message> + <source>Checksum mismatch detected '%1'.</source> + <translation>æ£€æµ‹åˆ°æ ¡éªŒå’Œä¸åŒ¹é…“%1â€ã€‚</translation> + </message> + <message> + <source>Network error while downloading '%1': %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>下载“%1â€æ—¶å‘生网络错误：%2。</translation> + </message> + <message> + <source>Unknown network error while downloading: %1.</source> + <extracomment>%1 is a sentence describing the error</extracomment> + <translation>下载：%1时出现未知网络错误。</translation> + </message> + <message> + <source>Pause and resume not supported by network transfers.</source> + <translation>ç½‘ç»œä¼ è¾“ä¸æ”¯æŒæš‚åœå’Œæ¢å¤ã€‚</translation> + </message> + <message> + <source>Invalid source '%1'. Error: %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>æ— æ•ˆèµ„æºâ€œ%1â€ã€‚错误：%2。</translation> + </message> + <message> + <source>Target file '%1' already exists but is not a file.</source> + <translation>ç›®æ ‡æ–‡ä»¶â€œ%1â€å·²å˜åœ¨ï¼Œä½†å®ƒä¸æ˜¯ä¸€ä¸ªæ–‡ä»¶ã€‚</translation> + </message> + <message> + <source>Could not open target '%1' for write. Error: %2.</source> + <extracomment>%2 is a sentence describing the error</extracomment> + <translation>æ— æ³•æ‰“å¼€ç›®æ ‡â€œ%1â€ä»¥è¿›è¡Œå†™å…¥ã€‚错误：%2。</translation> </message> </context> <context> <name>QInstaller::ElevatedExecuteOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>at least 1</source> <translation>至少 1 个</translation> </message> <message> - <source>Execution failed: Could not start detached: "%1"</source> - <translation>执行失败:æ— æ³•å¼€å§‹åˆ†ç¦»:“%1â€</translation> + <source>Execution failed: Could not start detached: "%1"</source> + <translation>æ‰§è¡Œå¤±è´¥ï¼šæ— æ³•å¼€å§‹åˆ†ç¦»ï¼šâ€œ%1â€</translation> </message> <message> - <source>Execution failed: Could not start: "%1"</source> - <translation>执行失败:æ— æ³•å¼€å§‹:“%1â€</translation> + <source>Execution failed(Crash): "%1"</source> + <translation>执行失败(崩溃)：“%1â€</translation> </message> <message> - <source>Execution failed(Crash): "%1"</source> - <translation>执行失败(崩溃):“%1â€</translation> + <source>Execution failed(Unexpected exit code: %1): "%2"</source> + <translation>执行失败(æ„外退出代ç ：%1)：“%2â€</translation> </message> <message> - <source>Execution failed(Unexpected exit code: %1): "%2"</source> - <translation>执行失败(æ„外退出代ç :%1):“%2â€</translation> + <source>Execution failed: Could not start: "%1"(%2)</source> + <translation>æ‰§è¡Œå¤±è´¥ï¼šæ— æ³•å¯åŠ¨ï¼šâ€œ%1â€ï¼ˆ%2）</translation> </message> </context> <context> <name>QInstaller::EnvironmentVariableOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> - <source>2 or 3</source> - <translation>2 或 3 个</translation> + <source>2 to 4</source> + <translation>2 到 4 个</translation> </message> </context> <context> <name>QInstaller::ExtractArchiveOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>exactly 2</source> @@ -1014,11 +1346,11 @@ Error while loading %2</source> <name>QInstaller::ExtractArchiveOperation::Runnable</name> <message> <source>Could not open %1 for reading: %2.</source> - <translation>æ— æ³•æ‰“å¼€ %1 进行读å–:%2.</translation> + <translation>æ— æ³•æ‰“å¼€ %1 进行读å–：%2.</translation> </message> <message> - <source>Error while extracting '%1': %2</source> - <translation>æå–“%1â€æ—¶å‡ºçŽ°é”™è¯¯:%2</translation> + <source>Error while extracting '%1': %2</source> + <translation>æå–“%1â€æ—¶å‡ºçŽ°é”™è¯¯ï¼š%2</translation> </message> <message> <source>Unknown exception caught while extracting %1.</source> @@ -1026,116 +1358,96 @@ Error while loading %2</source> </message> </context> <context> - <name>QInstaller::FinishedPage</name> - <message> - <source>Completing the %1 Wizard</source> - <translation>æ£åœ¨å®Œæˆ %1 å‘导</translation> - </message> - <message> - <source>Click Done to exit the %1 Wizard.</source> - <translation>å•å‡»â€œå®Œæˆâ€ä»¥é€€å‡º %1 å‘导。</translation> - </message> + <name>QInstaller::FakeStopProcessForUpdateOperation</name> <message> - <source>Click Finish to exit the %1 Wizard.</source> - <translation>å•å‡»â€œå®Œæˆâ€ä»¥é€€å‡º %1 å‘导。</translation> + <source>Number of arguments does not match: one is required</source> + <translation>å‚æ•°æ•°é‡ä¸åŒ¹é…：需è¦ä¸€ä¸ª</translation> </message> <message> - <source>Restart</source> - <translation>é‡æ–°å¯åŠ¨</translation> + <source>Could not get package manager core.</source> + <translation>æ— æ³•èŽ·å¾—åŒ…ç®¡ç†å™¨å†…æ ¸ã€‚</translation> </message> <message> - <source>Run %1 now.</source> - <translation>ç«‹å³è¿è¡Œ %1。</translation> + <source>This process should be stopped before continuing: %1</source> + <translation>必须先åœæ¢æ¤è¿›ç¨‹æ‰èƒ½ç»§ç»æ“作：%1</translation> </message> <message> - <source>The %1 Wizard failed.</source> - <translation>%1 å‘导失败。</translation> + <source>These processes should be stopped before continuing: %1</source> + <translation>必须先åœæ¢ä»¥ä¸‹è¿›ç¨‹æ‰èƒ½ç»§ç»æ“作：%1</translation> </message> </context> <context> - <name>QInstaller::GetRepositoryMetaInfoJob</name> - <message> - <source>Empty repository URL.</source> - <translation>储å˜åº“ URL 为空。</translation> - </message> - <message> - <source>Invalid repository URL: %1</source> - <translation>储å˜åº“ URL æ— æ•ˆ:%1</translation> - </message> - <message> - <source>URL scheme not supported: %1 (%2)</source> - <translation>ä¸æ”¯æŒçš„ URL 方案:%1 (%2)</translation> - </message> - <message> - <source>Retrieving component meta information...</source> - <translation>æ£åœ¨æ£€ç´¢ç»„件元信æ¯...</translation> - </message> - <message> - <source>Could not move Updates.xml to target location. Error: %1</source> - <translation>æ— æ³•å°† Updates.xml ç§»åŠ¨åˆ°ç›®æ ‡ä½ç½®ã€‚错误:%1</translation> - </message> + <name>QInstaller::FileTaskObserver</name> <message> - <source>Could not open Updates.xml for reading. Error: %1</source> - <translation>æ— æ³•æ‰“å¼€ Updates.xml 进行读å–。错误:%1</translation> + <source>%1 of %2</source> + <translation>%2 çš„ %1</translation> </message> <message> - <source>Could not fetch a valid version of Updates.xml from repository: %1. Error: %2</source> - <translation>æ— æ³•ä»Žå‚¨å˜åº“æå–有效版本的 Updates.xml:%1.错误:%2</translation> + <source>%1 received.</source> + <translation>已收到 %1。</translation> </message> <message> - <source>Download Error</source> - <translation>下载错误</translation> + <source>(%1/sec)</source> + <translation>（%1/秒）</translation> </message> - <message> - <source>Parsing component meta information...</source> - <translation>æ£åœ¨è§£æžç»„件元信æ¯...</translation> + <message numerus="yes"> + <source>%n day(s), </source> + <translation> + <numerusform>%n 天， </numerusform> + </translation> </message> - <message> - <source>Repository updates received.</source> - <translation>已接收储å˜åº“更新。</translation> + <message numerus="yes"> + <source>%n hour(s), </source> + <translation> + <numerusform>%n å°æ—¶ </numerusform> + </translation> </message> - <message> - <source>Finished updating component meta information.</source> - <translation>已完æˆç»„件元信æ¯æ›´æ–°ã€‚</translation> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation> + <numerusform>%n 分钟</numerusform> + </translation> </message> - <message> - <source>Could not fetch Updates.xml from repository: %1. Error: %2</source> - <translation>æ— æ³•ä»Žå‚¨å˜åº“æå– Updates.xml:%1.错误:%2</translation> + <message numerus="yes"> + <source>%n second(s)</source> + <translation> + <numerusform>%n 秒</numerusform> + </translation> </message> <message> - <source>Retrieving component information from remote repository...</source> - <translation>æ£åœ¨ä»Žè¿œç¨‹å‚¨å˜åº“检索组件信æ¯...</translation> + <source> - %1%2%3%4 remaining.</source> + <translation> - %1%2%3%4 剩余。</translation> </message> <message> - <source>Could not open meta info archive: %1. Error: %2</source> - <translation>æ— æ³•æ‰“å¼€å…ƒä¿¡æ¯å˜æ¡£:%1.错误:%2</translation> + <source> - unknown time remaining.</source> + <translation> - 剩余时间未知。</translation> </message> +</context> +<context> + <name>QInstaller::FinishedPage</name> <message> - <source>The hash of one component does not match the expected one.</source> - <translation>æŸä¸ªç»„件的散列与预期ä¸ç¬¦ã€‚</translation> + <source>Completing the %1 Wizard</source> + <translation>æ£åœ¨å®Œæˆ %1 å‘导</translation> </message> <message> - <source>Bad hash.</source> - <translation>散列错误。</translation> + <source>Click Done to exit the %1 Wizard.</source> + <translation>å•å‡»â€œå®Œæˆâ€ä»¥é€€å‡º %1 å‘导。</translation> </message> <message> - <source>Could not download meta information for component: %1. Error: %2</source> - <translation>æ— æ³•ä¸‹è½½ä»¥ä¸‹ç»„ä»¶çš„å…ƒä¿¡æ¯:%1.错误:%2</translation> + <source>Click Finish to exit the %1 Wizard.</source> + <translation>å•å‡»â€œå®Œæˆâ€ä»¥é€€å‡º %1 å‘导。</translation> </message> -</context> -<context> - <name>QInstaller::GetRepositoryMetaInfoJob::ZipRunnable</name> <message> - <source>Error while extracting '%1': %2</source> - <translation>æå–“%1â€æ—¶å‡ºçŽ°é”™è¯¯:%2</translation> + <source>Restart</source> + <translation>é‡æ–°å¯åŠ¨</translation> </message> <message> - <source>Unknown exception caught while extracting %1.</source> - <translation>æå– %1 æ—¶æ•èŽ·æœªçŸ¥å¼‚常。</translation> + <source>Run %1 now.</source> + <translation>ç«‹å³è¿è¡Œ %1。</translation> </message> <message> - <source>Could not open %1 for reading. Error: %2</source> - <translation>æ— æ³•æ‰“å¼€ %1 进行读å–。错误:%2</translation> + <source>The %1 Wizard failed.</source> + <translation>%1 å‘导失败。</translation> </message> </context> <context> @@ -1150,18 +1462,18 @@ Error while loading %2</source> </message> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> - <source>3 or 4</source> - <translation>3 或 4 个</translation> + <source>3, 4 or 5</source> + <translation>3，4或5个</translation> </message> </context> <context> <name>QInstaller::InstallIconsOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>1 or 2</source> @@ -1171,6 +1483,26 @@ Error while loading %2</source> <source> (Sourcepath, [Vendorprefix])</source> <translation> (Sourcepathã€[Vendorprefix])</translation> </message> + <message> + <source>Invalid Argument: source folder must not be empty.</source> + <translation>å‚æ•°æ— æ•ˆï¼šæºæ–‡ä»¶å¤¹ä¸å¾—为空。</translation> + </message> + <message> + <source>Could not backup file %1: %2</source> + <translation>æ— æ³•å¤‡ä»½æ–‡ä»¶ %1：%2</translation> + </message> + <message> + <source>Failed to overwrite %1: %2</source> + <translation>覆盖 %1 失败：%2</translation> + </message> + <message> + <source>Failed to copy file %1: %2</source> + <translation>å¤åˆ¶æ–‡ä»¶ %1 失败：%2</translation> + </message> + <message> + <source>Could not create folder at %1: %2</source> + <translation>æ— æ³•åœ¨ %1 创建文件夹：%2</translation> + </message> </context> <context> <name>QInstaller::IntroductionPage</name> @@ -1182,6 +1514,38 @@ Error while loading %2</source> <source>Welcome to the %1 Setup Wizard.</source> <translation>欢迎使用 %1 设置å‘导。</translation> </message> + <message> + <source>Add or remove components</source> + <translation>æ·»åŠ æˆ–ç§»é™¤ç»„ä»¶</translation> + </message> + <message> + <source>Update components</source> + <translation>更新组件</translation> + </message> + <message> + <source>Remove all components</source> + <translation>åˆ é™¤æ‰€æœ‰ç»„ä»¶</translation> + </message> + <message> + <source>Retrieving information from remote installation sources...</source> + <translation>æ£åœ¨ä»Žè¿œç¨‹å®‰è£…æºæ£€ç´¢ä¿¡æ¯...</translation> + </message> + <message> + <source>At least one valid and enabled repository required for this action to succeed.</source> + <translation>è¦ç»§ç»æ¤æ“作，至少需è¦ä¸€ä¸ªæœ‰æ•ˆä¸”å·²å¯ç”¨çš„储å˜åº“。</translation> + </message> + <message> + <source>No updates available.</source> + <translation>æ— æ›´æ–°å¯ç”¨ã€‚</translation> + </message> + <message> + <source> Only local package management available.</source> + <translation> 仅本地包管ç†å¯ç”¨ã€‚</translation> + </message> + <message> + <source>Quit</source> + <translation>退出</translation> + </message> </context> <context> <name>QInstaller::LicenseAgreementPage</name> @@ -1236,7 +1600,7 @@ Error while loading %2</source> </message> <message> <source>Can not write license file: %1.</source> - <translation>æ— æ³•å†™å…¥è®¸å¯æ–‡ä»¶:%1.</translation> + <translation>æ— æ³•å†™å…¥è®¸å¯æ–‡ä»¶ï¼š%1.</translation> </message> <message> <source>No license files found to delete.</source> @@ -1247,43 +1611,79 @@ Error while loading %2</source> <name>QInstaller::LineReplaceOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>exactly 3</source> <translation>æ°å¥½ 3 个</translation> </message> + <message> + <source>Failed to open '%1' for reading.</source> + <translation>打开“%1â€è¯»å–失败。</translation> + </message> + <message> + <source>Failed to open '%1' for writing.</source> + <translation>打开“%1â€å†™å…¥å¤±è´¥ã€‚</translation> + </message> </context> <context> - <name>QInstaller::MacReplaceInstallNamesOperation</name> + <name>QInstaller::MetadataJob</name> <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <source>Missing package manager core engine.</source> + <translation>缺少包管ç†å™¨å†…æ ¸å¼•æ“Žã€‚</translation> + </message> + <message> + <source>Preparing meta information download...</source> + <translation>æ£åœ¨å‡†å¤‡ä¸‹è½½å…ƒä¿¡æ¯...</translation> + </message> + <message> + <source>Meta data download canceled.</source> + <translation>å·²å–消下载元信æ¯ã€‚</translation> + </message> + <message> + <source>Missing proxy credentials.</source> + <translation>缺少代ç†è¯ä¹¦ã€‚</translation> + </message> + <message> + <source>Authentication failed.</source> + <translation>身份认è¯å¤±è´¥ã€‚</translation> + </message> + <message> + <source>Unknown exception during download.</source> + <translation>下载时å‘生异常。</translation> </message> <message> - <source>at least 3</source> - <translation>至少 3 个</translation> + <source>Retrieving meta information from remote repository...</source> + <translation>æ£åœ¨ä»Žè¿œç¨‹å‚¨å˜åº“检索元信æ¯...</translation> </message> <message> - <source>One of the given arguments is empty. Argument1=%1; Argument2=%2, Argument3=%3</source> - <translation>å…¶ä¸ä¸€ä¸ªç»™å®šå‚数为空。å‚æ•°1=%1ï¼›å‚æ•°2=%2ï¼›å‚æ•°3=%3</translation> + <source>Failure to fetch repositories.</source> + <translation>获å–å˜å‚¨åº“失败。</translation> </message> <message> - <source>Can't invoke otool. Is Xcode installed?</source> - <translation>æ— æ³•è°ƒç”¨ otool。是å¦å·²å®‰è£… Xcode?</translation> + <source>Unknown exception during extracting.</source> + <translation>æå–æ—¶å‘生未知异常。</translation> </message> <message> - <source>Can't start process %0.</source> - <translation>æ— æ³•å¯åŠ¨è¿›ç¨‹ %0。</translation> + <source>Extracting meta information...</source> + <translation>æ£åœ¨æå–元信æ¯...</translation> + </message> + <message> + <source>Error while extracting '%1': %2</source> + <translation>æå–“%1â€æ—¶å‡ºçŽ°é”™è¯¯ï¼š%2</translation> + </message> + <message> + <source>Unknown exception caught while extracting %1.</source> + <translation>æå– %1 æ—¶æ•èŽ·æœªçŸ¥å¼‚常。</translation> + </message> + <message> + <source>Could not open %1 for reading. Error: %2</source> + <translation>æ— æ³•æ‰“å¼€ %1 读å–。错误：%2</translation> </message> </context> <context> <name>QInstaller::PackageManagerCore</name> <message> - <source>Error writing Uninstaller</source> - <translation>写入å¸è½½ç¨‹åºæ—¶å‡ºçŽ°é”™è¯¯</translation> - </message> - <message> <source> Downloading packages...</source> <translation> @@ -1307,7 +1707,7 @@ Downloading packages...</source> </message> <message> <source>Some components could not be removed completely because admin rights could not be acquired: %1.</source> - <translation>ç”±äºŽæ— æ³•å–得管ç†å‘˜æƒé™ï¼Œå› æ¤æ— æ³•å®Œå…¨åˆ é™¤æŸäº›ç»„件:%1.</translation> + <translation>ç”±äºŽæ— æ³•å–得管ç†å‘˜æƒé™ï¼Œå› æ¤æ— æ³•å®Œå…¨åˆ é™¤æŸäº›ç»„件：%1.</translation> </message> <message> <source>Unknown error.</source> @@ -1315,7 +1715,7 @@ Downloading packages...</source> </message> <message> <source>Some components could not be removed completely because an unknown error happened.</source> - <translation>由于å‘ç”ŸæœªçŸ¥é”™è¯¯ï¼Œå› æ¤æ— æ³•å®Œå…¨åˆ é™¤æŸäº›ç»„件:</translation> + <translation>由于å‘ç”ŸæœªçŸ¥é”™è¯¯ï¼Œå› æ¤æ— æ³•å®Œå…¨åˆ é™¤æŸäº›ç»„件。</translation> </message> <message> <source>Application not running in Package Manager mode!</source> @@ -1337,28 +1737,24 @@ Downloading packages...</source> <source>invalid</source> <translation>æ— æ•ˆ</translation> </message> -</context> -<context> - <name>QInstaller::PackageManagerCorePrivate</name> - <message> - <source>Error</source> - <translation>错误</translation> - </message> <message> - <source>Component(s) added as automatic dependencies</source> - <translation>å·²æ·»åŠ ä¸ºè‡ªåŠ¨ä¾èµ–项的组件</translation> + <source>Error writing Maintenance Tool</source> + <translation>写入维护工具时å‘生错误</translation> </message> <message> - <source>Added as dependency for %1.</source> - <translation>å·²æ·»åŠ ä¸º %1 çš„ä¾èµ–项。</translation> + <source>There is an important update available, please run the updater first.</source> + <translation>å‘现é‡è¦æ›´æ–°å¯ç”¨ã€‚ 请先è¿è¡Œæ›´æ–°ç¨‹åºã€‚</translation> </message> <message> - <source>Component(s) that have resolved Dependencies</source> - <translation>具有已解æžä¾èµ–项的组件</translation> + <source>Error while elevating access rights.</source> + <translation>å‡çº§è®¿é—®æƒé™æ—¶å‡ºçŽ°é”™è¯¯ã€‚</translation> </message> +</context> +<context> + <name>QInstaller::PackageManagerCorePrivate</name> <message> - <source>Selected Component(s) without Dependencies</source> - <translation>没有ä¾èµ–项的选定组件</translation> + <source>Error</source> + <translation>错误</translation> </message> <message> <source>Access error</source> @@ -1370,7 +1766,7 @@ Downloading packages...</source> </message> <message> <source>Could not write installer configuration to %1: %2</source> - <translation>æ— æ³•å°†å®‰è£…ç¨‹åºé…置写入 %1:%2</translation> + <translation>æ— æ³•å°†å®‰è£…ç¨‹åºé…置写入 %1：%2</translation> </message> <message> <source>Stop Processes</source> @@ -1380,7 +1776,7 @@ Downloading packages...</source> <source>These processes should be stopped to continue: %1</source> - <translation>必须先åœæ¢ä»¥ä¸‹è¿›ç¨‹æ‰èƒ½ç»§ç»æ“作: + <translation>必须先åœæ¢ä»¥ä¸‹è¿›ç¨‹æ‰èƒ½ç»§ç»æ“作： %1</translation> </message> @@ -1389,36 +1785,8 @@ Downloading packages...</source> <translation>安装已被用户å–消</translation> </message> <message> - <source>Writing uninstaller.</source> - <translation>æ£åœ¨å†™å…¥å¸è½½ç¨‹åºã€‚</translation> - </message> - <message> - <source>Uninstaller is not a bundle</source> - <translation>å¸è½½ç¨‹åºä¸æ˜¯æ†ç»‘套件</translation> - </message> - <message> - <source>Could not write uninstaller data to %1: %2</source> - <translation>æ— æ³•å°†å¸è½½ç¨‹åºæ•°æ®å†™å…¥ %1:%2</translation> - </message> - <message> - <source>Could not write uninstaller to %1: %2</source> - <translation>æ— æ³•å°†å¸è½½ç¨‹åºå†™å…¥ %1:%2</translation> - </message> - <message> - <source>Found a binary data file, but we are the installer and we should read the binary resource from our very own binary!</source> - <translation>已找到二进制数æ®æ–‡ä»¶ï¼Œä½†ä½œä¸ºå®‰è£…程åºåº”该从自己的二进制文件ä¸è¯»å–二进制资æº!</translation> - </message> - <message> - <source>Could not write uninstaller binary data to %1: %2</source> - <translation>æ— æ³•å°†å¸è½½ç¨‹åºäºŒè¿›åˆ¶æ•°æ®å†™å…¥ %1:%2</translation> - </message> - <message> - <source>ProductName should be set</source> - <translation>未设置 ProductName</translation> - </message> - <message> - <source>Variable 'TargetDir' not set.</source> - <translation>未设置å˜é‡"TargetDir"。</translation> + <source>Variable 'TargetDir' not set.</source> + <translation>未设置å˜é‡"TargetDir"。</translation> </message> <message> <source>Preparing the installation...</source> @@ -1433,10 +1801,6 @@ Downloading packages...</source> <translation>æ£åœ¨åˆ›å»ºæœ¬åœ°å‚¨å˜åº“</translation> </message> <message> - <source>Creating Uninstaller</source> - <translation>æ£åœ¨åˆ›å»ºå¸è½½ç¨‹åº</translation> - </message> - <message> <source> Installation finished!</source> <translation> @@ -1470,18 +1834,6 @@ Update aborted!</source> </message> <message> <source> -Uninstallation completed successfully!</source> - <translation> -å·²æˆåŠŸå®Œæˆå¸è½½!</translation> - </message> - <message> - <source> -Uninstallation aborted!</source> - <translation> -å¸è½½ä¸æ¢!</translation> - </message> - <message> - <source> Installing component %1</source> <translation> æ£åœ¨å®‰è£…组件 %1</translation> @@ -1493,7 +1845,7 @@ Installing component %1</source> <message> <source>Error during installation process (%1): %2</source> - <translation>安装进程(%1)è¿è¡ŒæœŸé—´å‡ºçŽ°é”™è¯¯: + <translation>安装进程(%1)è¿è¡ŒæœŸé—´å‡ºçŽ°é”™è¯¯ï¼š %2</translation> </message> <message> @@ -1507,7 +1859,7 @@ Installing component %1</source> <message> <source>Error during uninstallation process: %1</source> - <translation>å¸è½½è¿›ç¨‹è¿è¡ŒæœŸé—´å‡ºçŽ°é”™è¯¯: + <translation>å¸è½½è¿›ç¨‹è¿è¡ŒæœŸé—´å‡ºçŽ°é”™è¯¯ï¼š %1</translation> </message> <message> @@ -1516,15 +1868,15 @@ Installing component %1</source> </message> <message> <source>Could not retrieve remote tree: %1.</source> - <translation>æ— æ³•æ£€ç´¢è¿œç¨‹æ ‘:%1.</translation> + <translation>æ— æ³•æ£€ç´¢è¿œç¨‹æ ‘ï¼š%1.</translation> </message> <message> <source>Failure to read packages from: %1.</source> - <translation>未能从以下ä½ç½®è¯»å–包:%1.</translation> + <translation>未能从以下ä½ç½®è¯»å–包：%1.</translation> </message> <message> <source>Could not retrieve meta information: %1</source> - <translation>æ— æ³•æ£€ç´¢å…ƒä¿¡æ¯:%1</translation> + <translation>æ— æ³•æ£€ç´¢å…ƒä¿¡æ¯ï¼š%1</translation> </message> <message> <source>Could not add temporary update source information.</source> @@ -1534,48 +1886,68 @@ Installing component %1</source> <source>Could not find any update source information.</source> <translation>æ— æ³•æ‰¾åˆ°ä»»ä½•æ›´æ–°æºä¿¡æ¯ã€‚</translation> </message> -</context> -<context> - <name>QInstaller::PackageManagerGui</name> <message> - <source>%1 Setup</source> - <translation>%1 设置</translation> + <source>Unresolved dependencies</source> + <translation>æ— æ³•è§£æžä¾èµ–</translation> </message> <message> - <source>Maintain %1</source> - <translation>维护 %1</translation> + <source>Writing maintenance tool.</source> + <translation>写入维护工具。</translation> </message> <message> - <source>Question</source> - <translation>问题</translation> + <source>Failed to seek in file %1: %2</source> + <translation>æ— æ³•åœ¨æ–‡ä»¶ %1 ä¸æ‰¾åˆ°ä»¥ä¸‹å†…容：%2</translation> + </message> + <message> + <source>Maintenance tool is not a bundle</source> + <translation>维护工具ä¸æ˜¯æ†ç»‘套件</translation> + </message> + <message> + <source>Could not write maintenance tool data to %1: %2</source> + <translation>æ— æ³•å°†ç»´æŠ¤å·¥å…·æ•°æ®å†™å…¥åˆ° %1：%2</translation> </message> <message> - <source>Do you want to abort the %1 process?</source> - <translation>您是å¦è¦ä¸æ¢ %1 进程?</translation> + <source>Could not remove data file '%1': %2</source> + <translation>æ— æ³•åˆ é™¤æ•°æ®æ–‡ä»¶â€œ%1â€ï¼š%2</translation> </message> <message> - <source>uninstallation</source> - <translation>å¸è½½</translation> + <source>Could not write maintenance tool to %1: %2</source> + <translation>æ— æ³•å°†ç»´æŠ¤å·¥å…·å†™å…¥åˆ° %1：%2</translation> </message> <message> - <source>installation</source> - <translation>安装</translation> + <source>Could not write maintenance tool binary data to %1: %2</source> + <translation>æ— æ³•å°†ç»´æŠ¤å·¥å…·äºŒè¿›åˆ¶æ•°æ®å†™å…¥ %1：%2</translation> </message> <message> - <source>installer</source> - <translation>安装程åº</translation> + <source>Creating Maintenance Tool</source> + <translation>æ£åœ¨åˆ›å»ºç»´æŠ¤å·¥å…·</translation> </message> <message> - <source>uninstaller</source> - <translation>å¸è½½ç¨‹åº</translation> + <source>Uninstallation completed successfully.</source> + <translation>å·²æˆåŠŸå®Œæˆå¸è½½ã€‚</translation> + </message> + <message> + <source>Uninstallation aborted.</source> + <translation>å¸è½½ä¸æ¢ã€‚</translation> + </message> + <message> + <source>Dependency cycle between components detected: '%1' and '%2'.</source> + <translation>检测到组件间循环ä¾èµ–：“%1â€å’Œâ€œ%2â€ã€‚</translation> + </message> +</context> +<context> + <name>QInstaller::PackageManagerGui</name> + <message> + <source>%1 Setup</source> + <translation>%1 设置</translation> </message> <message> - <source>maintenance</source> - <translation>维护</translation> + <source>Maintain %1</source> + <translation>维护 %1</translation> </message> <message> - <source>Do you want to quit the %1 application?</source> - <translation>您是å¦è¦é€€å‡º %1 应用程åº?</translation> + <source>Question</source> + <translation>问题</translation> </message> <message> <source>Settings</source> @@ -1591,6 +1963,26 @@ Please copy the installer to a local drive</source> <translation>ä¸èƒ½ä»Žç½‘络ä½ç½®è¿›è¡Œå®‰è£…。 请将安装程åºå¤åˆ¶åˆ°æœ¬åœ°ç£ç›˜</translation> </message> + <message> + <source>Do you want to cancel the installation process?</source> + <translation>您是å¦æƒ³è¦å–消安装进程？</translation> + </message> + <message> + <source>Do you want to cancel the uninstallation process?</source> + <translation>您是å¦æƒ³è¦å–消å¸è½½è¿›ç¨‹ï¼Ÿ</translation> + </message> + <message> + <source>Do you want to quit the installer application?</source> + <translation>您是å¦æƒ³è¦é€€å‡ºå®‰è£…程åºï¼Ÿ</translation> + </message> + <message> + <source>Do you want to quit the uninstaller application?</source> + <translation>您是å¦æƒ³è¦é€€å‡ºå¸è½½ç¨‹åºï¼Ÿ</translation> + </message> + <message> + <source>Do you want to quit the maintenance application?</source> + <translation>您是å¦æƒ³è¦é€€å‡ºç»´æŠ¤ç¨‹åºï¼Ÿ</translation> + </message> </context> <context> <name>QInstaller::PerformInstallationForm</name> @@ -1631,65 +2023,35 @@ Please copy the installer to a local drive</source> </message> </context> <context> - <name>QInstaller::QtPatchOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> - </message> + <name>QInstaller::ProxyCredentialsDialog</name> <message> - <source>exactly 3</source> - <translation>æ°å¥½ 3 个</translation> + <source>Dialog</source> + <translation>对è¯æ¡†</translation> </message> <message> - <source>First argument should be 'linux', 'mac' or 'windows'. No other type is supported at this time.</source> - <translation>第一个å‚数应为“linuxâ€ã€â€œmacâ€æˆ–“windowsâ€ã€‚ç›®å‰ä¸æ”¯æŒå…¶ä»–类型。</translation> + <source>The proxy %1 requires a username and password.</source> + <translation>ä»£ç† %1 需è¦ç”¨æˆ·å和密ç 。</translation> </message> <message> - <source>QMake from the current Qt version -(%1)is not existing. Please file a bugreport with this dialog at https://bugreports.qt-project.org.</source> - <translation>æ¥è‡ªå½“å‰ Qt 版本 -(%1)çš„ QMake ä¸å˜åœ¨ã€‚请访问 https://bugreports.qt-project.org，使用æ¤å¯¹è¯æ¡†æ交错误报告。</translation> - </message> - <message> - <source>The output of -%1 -query -is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. -output: "%2"</source> - <translation>有关 -%1 -query 的输出 -ä¸å¯è§£æžã€‚请访问 https://bugreports.qt-project.org，使用æ¤å¯¹è¯æ¡†æ交错误报告。 -输出:“%2â€</translation> + <source>Username:</source> + <translation>用户å：</translation> </message> <message> - <source>Qt patch error: new Qt dir(%1) -needs to be less than 255 characters.</source> - <translation>Qt è¡¥ä¸é”™è¯¯:æ–° Qt 目录(%1) -必须少于 255 个å—符。</translation> + <source>Username</source> + <translation>用户å</translation> </message> <message> - <source>Qt patch error: Can not open %1.(%2)</source> - <translation>Qt è¡¥ä¸é”™è¯¯:æ— æ³•æ‰“å¼€ %1。(%2)</translation> + <source>Password:</source> + <translation>密ç ：</translation> </message> <message> - <source>The installer was not able to get the unpatched path from -%1.(maybe it is broken or removed) -It tried to patch the Qt binaries, but all other files in Qt are unpatched. -This could result in a broken Qt version. -Sometimes it helps to restart the installer with a switched off antivirus software.</source> - <translation>安装程åºæ— 法从 -%1 获å–未打补ä¸çš„路径。(å¯èƒ½å·²æŸåæˆ–åˆ é™¤) -它试图为 Qt 二进制文件打补ä¸ï¼Œä½† Qt ä¸çš„所有其他文件都没有打补ä¸ã€‚ -è¿™å¯èƒ½ä¼šå¯¼è‡´ Qt 版本å—åˆ°ç ´å。 -您å¯ä»¥å…ˆå…³é—æ€æ¯’软件å†é‡æ–°å¯åŠ¨å®‰è£…程åºï¼Œè¿™å¯èƒ½ä¼šæœ‰å¸®åŠ©ã€‚</translation> + <source>Password</source> + <translation>密ç </translation> </message> </context> <context> <name>QInstaller::ReadyForInstallationPage</name> <message> - <source>&Show Details</source> - <translation>显示详细信æ¯(&S)</translation> - </message> - <message> <source>U&ninstall</source> <translation>å¸è½½(&U)</translation> </message> @@ -1698,8 +2060,8 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <translation>å·²åšå¥½å¸è½½å‡†å¤‡</translation> </message> <message> - <source>Setup is now ready to begin removing %1 from your computer.<br><font color="red">The program directory %2 will be deleted completely</font>, including all content in that directory!</source> - <translation>设置程åºçŽ°å·²å‡†å¤‡å°±ç»ªï¼Œå¯ä»¥å¼€å§‹ä»Žæ‚¨çš„计算机ä¸åˆ 除 %1。<br><font color="red">程åºç›®å½• %2 å°†è¢«å®Œå…¨åˆ é™¤</font>，包括该目录ä¸çš„所有内容!</translation> + <source>Setup is now ready to begin removing %1 from your computer.<br><font color="red">The program directory %2 will be deleted completely</font>, including all content in that directory!</source> + <translation>设置程åºçŽ°å·²å‡†å¤‡å°±ç»ªï¼Œå¯ä»¥å¼€å§‹ä»Žæ‚¨çš„计算机ä¸åˆ 除 %1。<br><font color="red">程åºç›®å½• %2 å°†è¢«å®Œå…¨åˆ é™¤</font>，包括该目录ä¸çš„所有内容!</translation> </message> <message> <source>U&pdate</source> @@ -1727,18 +2089,18 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa </message> <message> <source>Not enough disk space to store temporary files and the installation! Available space: %1, at least required %2.</source> - <translation>ç£ç›˜ç©ºé—´ä¸è¶³ï¼Œæ— 法å˜å‚¨ä¸´æ—¶æ–‡ä»¶å’Œå®‰è£…文件!å¯ç”¨ç©ºé—´:%1ï¼Œè‡³å°‘éœ€è¦ %2。</translation> + <translation>ç£ç›˜ç©ºé—´ä¸è¶³ï¼Œæ— 法å˜å‚¨ä¸´æ—¶æ–‡ä»¶å’Œå®‰è£…文件!å¯ç”¨ç©ºé—´ï¼š%1ï¼Œè‡³å°‘éœ€è¦ %2。</translation> </message> <message> <source>Not enough disk space to store all selected components! Available space: %1, at least required: %2.</source> - <translation>ç£ç›˜ç©ºé—´ä¸è¶³ï¼Œæ— 法å˜å‚¨æ‰€æœ‰é€‰å®šçš„组件!å¯ç”¨ç©ºé—´:%1，至少需è¦:%2.</translation> + <translation>ç£ç›˜ç©ºé—´ä¸è¶³ï¼Œæ— 法å˜å‚¨æ‰€æœ‰é€‰å®šçš„组件!å¯ç”¨ç©ºé—´ï¼š%1，至少需è¦ï¼š%2。</translation> </message> <message> <source>Not enough disk space to store temporary files! Available space: %1, at least required: %2.</source> - <translation>ç£ç›˜ç©ºé—´ä¸è¶³ï¼Œæ— 法å˜å‚¨ä¸´æ—¶æ–‡ä»¶!å¯ç”¨ç©ºé—´:%1，至少需è¦:%2.</translation> + <translation>ç£ç›˜ç©ºé—´ä¸è¶³ï¼Œæ— 法å˜å‚¨ä¸´æ—¶æ–‡ä»¶!å¯ç”¨ç©ºé—´ï¼š%1，至少需è¦ï¼š%2。</translation> </message> <message> - <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 1% of the volume's space available afterwards. %1</source> + <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 1% of the volume's space available afterwards. %1</source> <translation>您选定用于安装文件的å·ä¼¼ä¹Žæœ‰è¶³å¤Ÿçš„空间å˜å‚¨å®‰è£…文件，但å˜å‚¨åŽè¯¥å·çš„å¯ç”¨ç©ºé—´å°†ä¸åˆ° 1%。%1</translation> </message> <message> @@ -1746,43 +2108,16 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <translation>您选定用于安装文件的å·ä¼¼ä¹Žæœ‰è¶³å¤Ÿçš„空间å˜å‚¨å®‰è£…文件，但å˜å‚¨åŽè¯¥å·çš„å¯ç”¨ç©ºé—´å°†ä¸åˆ° 100 MB。%1</translation> </message> <message> - <source>Can not resolve all dependencies!</source> - <translation>æ— æ³•è§£æžæ‰€æœ‰ä¾èµ–项!</translation> - </message> - <message> <source>Components about to be removed.</source> <translation>组件å³å°†è¢«åˆ 除。</translation> </message> <message> - <source>&Hide Details</source> - <translation>éšè—详细信æ¯(&H)</translation> - </message> -</context> -<context> - <name>QInstaller::RegisterDefaultDebuggerOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> - </message> - <message> - <source>exactly 2</source> - <translation>æ°å¥½ 2 个</translation> - </message> - <message> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>“%1â€è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> - </message> - <message> - <source>There is no value set for %1 on the installer object.</source> - <translation>没有为安装程åºå¯¹è±¡ä¸Šçš„ %1 设定值。</translation> - </message> - <message> - <source>Can't read from tool chains xml file(%1) correctly.</source> - <translation>æ— æ³•ä»Žå·¥å…·é“¾ xml 文件(%1)ä¸æ£ç¡®è¯»å–。</translation> + <source>Installation will use %1 of disk space.</source> + <translation>安装将å 用 %1 ç£ç›˜ç©ºé—´ã€‚</translation> </message> <message> - <source>Invalid arguments in %0: %1 arguments given, 2 expected.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，应为 2 个。</translation> + <source>Cannot resolve all dependencies.</source> + <translation>æ— æ³•è§£æžæ‰€æœ‰ä¾èµ–。</translation> </message> </context> <context> @@ -1797,255 +2132,153 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa </message> <message> <source>Register File Type: Invalid arguments</source> - <translation>寄å˜å™¨æ–‡ä»¶ç±»åž‹:å‚æ•°æ— æ•ˆ</translation> - </message> -</context> -<context> - <name>QInstaller::RegisterQtInCreatorQNXOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> - </message> - <message> - <source>at least 5</source> - <translation>至少 5 个</translation> + <translation>寄å˜å™¨æ–‡ä»¶ç±»åž‹ï¼šå‚æ•°æ— æ•ˆ</translation> </message> <message> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>“%1â€è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> - </message> - <message> - <source>There is no value set for %1 on the installer object.</source> - <translation>没有为安装程åºå¯¹è±¡ä¸Šçš„ %1 设定值。</translation> - </message> - <message> - <source>Invalid arguments in %0: %1 arguments given, minimum 4 expected.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，至少应为 4 个。</translation> + <source>Registering file types is only supported on Windows.</source> + <translation>仅支æŒåœ¨ Windows 上注册文件类型。</translation> </message> </context> <context> - <name>QInstaller::RegisterToolChainOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> - </message> - <message> - <source>at least 4</source> - <translation>至少 4 个</translation> - </message> - <message> - <source>Needed installer object in '%1' operation is empty.</source> - <translation>“%1â€è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> - </message> - <message> - <source>There is no value set for '%1' on the installer object.</source> - <translation>没有为安装程åºå¯¹è±¡ä¸Šçš„“%1â€è®¾å®šå€¼ã€‚</translation> - </message> - <message> - <source>Can't read from tool chains xml file(%1) correctly.</source> - <translation>æ— æ³•ä»Žå·¥å…·é“¾ xml 文件(%1)ä¸æ£ç¡®è¯»å–。</translation> - </message> + <name>QInstaller::RemoteObject</name> <message> - <source>Some arguments are not right in %1 operation.</source> - <translation>%1 è¿ç®—ä¸çš„æŸäº›å‚æ•°ä¸æ£ç¡®ã€‚</translation> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>å‘é€å‘½ä»¤ï¼š %1 åŽæ— 法读å–所有数æ®ã€‚ 期望： %2å—节， 收到： %3å—节。 错误： %4</translation> </message> +</context> +<context> + <name>QInstaller::RemoteServerConnection</name> <message> - <source>Invalid arguments in %0: %1 arguments given, minimum 4 expected.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，至少应为 4 个。</translation> - </message> - <message> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>“%1â€è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> + <source>Could not read all data after sending command: %1. Bytes expected: %2, Bytes received: %3. Error: %4</source> + <translation>å‘é€å‘½ä»¤ï¼š %1 åŽæ— 法读å–所有数æ®ã€‚ 期望： %2å—节， 收到： %3å—节。 错误： %4</translation> </message> </context> <context> <name>QInstaller::ReplaceOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>exactly 3</source> <translation>æ°å¥½ 3 个</translation> </message> -</context> -<context> - <name>QInstaller::RestartPage</name> - <message> - <source>Completing the %1 Setup Wizard</source> - <translation>æ£åœ¨å®Œæˆ %1 设置å‘导。</translation> - </message> -</context> -<context> - <name>QInstaller::SelfRestartOperation</name> - <message> - <source>Installer object needed in '%1' operation is empty.</source> - <translation>“%1â€è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> - </message> <message> - <source>Self Restart: Only valid within updater or packagemanager mode.</source> - <translation>自é‡å¯:仅在更新程åºæˆ–包管ç†å™¨æ¨¡å¼ä¸‹æœ‰æ•ˆã€‚</translation> + <source>Failed to open %1 for reading</source> + <translation>打开 %1 读å–失败</translation> </message> <message> - <source>Self Restart: Invalid arguments</source> - <translation>自é‡å¯:å‚æ•°æ— æ•ˆ</translation> + <source>Failed to open %1 for writing</source> + <translation>打开 %1 写入失败</translation> </message> </context> <context> - <name>QInstaller::SetDemosPathOnQtOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> - </message> + <name>QInstaller::Resource</name> <message> - <source>exactly 2</source> - <translation>æ°å¥½ 2 个</translation> + <source>Could not open Resource '%1' read-only.</source> + <translation>æ— æ³•ä»¥åªè¯»æ–¹å¼æ‰“开资æºâ€œ%1â€ã€‚</translation> </message> <message> - <source>The output of -'%1 -query' -is not parseable. Please file a bugreport with this dialog at https://bugreports.qt-project.org. -output: %2</source> - <translation>有关 -“%1 -queryâ€çš„输出 -ä¸å¯è§£æžã€‚请访问 https://bugreports.qt-project.org，使用æ¤å¯¹è¯æ¡†æ交错误报告。 -输出:%2</translation> + <source>Read failed after %1 bytes: %2</source> + <translation>è¯»å– %1 å—节åŽå¤±è´¥ï¼š%2</translation> </message> <message> - <source>Qt patch error: new Qt demo path '%1' -needs to be less than 255 characters.</source> - <translation>Qt è¡¥ä¸é”™è¯¯:æ–° Qt 演示路径“%1†-必须少于 255 个å—符。</translation> + <source>Write failed after %1 bytes: %2</source> + <translation>写入 %1 å—节åŽå¤±è´¥ï¼š%2</translation> </message> </context> <context> - <name>QInstaller::SetExamplesPathOnQtOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> - </message> - <message> - <source>exactly 2</source> - <translation>æ°å¥½ 2 个</translation> - </message> - <message> - <source>The output of -'%1 -query' -is not parseable. Please file a bugreport with this dialog at https://bugreports.qt-project.org. -output: %2</source> - <translation>有关 -“%1 -queryâ€çš„输出 -ä¸å¯è§£æžã€‚请访问 https://bugreports.qt-project.org，使用æ¤å¯¹è¯æ¡†æ交错误报告。 -输出:%2</translation> - </message> + <name>QInstaller::RestartPage</name> <message> - <source>Qt patch error: new Qt example path '%1' -needs to be less than 255 characters.</source> - <translation>Qt è¡¥ä¸é”™è¯¯:æ–° Qt 示例路径“%1†-必须少于 255 个å—符。</translation> + <source>Completing the %1 Setup Wizard</source> + <translation>æ£åœ¨å®Œæˆ %1 设置å‘导</translation> </message> </context> <context> - <name>QInstaller::SetImportsPathOnQtCoreOperation</name> + <name>QInstaller::ScriptEngine</name> <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> - </message> - <message> - <source>exactly 2</source> - <translation>æ°å¥½ 2 个</translation> + <source>Could not open the requested script file at %1: %2.</source> + <translation>æ— æ³•æ‰“å¼€ä½äºŽ %1 的请求脚本文件：%2。</translation> </message> <message> - <source>Qt patch error: new Qt imports path '%1' -needs to be less than 255 characters.</source> - <translation>Qt è¡¥ä¸é”™è¯¯:æ–° Qt 导入路径“%1†-必须少于 255 个å—符。</translation> + <source>Exception while loading the component script '%1'. (%2)</source> + <translation>åŠ è½½ç»„ä»¶è„šæœ¬æ—¶å‡ºçŽ°å¼‚å¸¸ï¼šâ€œ%1â€ã€‚（%2）</translation> </message> </context> <context> - <name>QInstaller::SetPathOnQtCoreOperation</name> + <name>QInstaller::SelfRestartOperation</name> <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <source>Installer object needed in '%1' operation is empty.</source> + <translation>“%1â€è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> </message> <message> - <source>exactly 3</source> - <translation>æ°å¥½ 3 个</translation> + <source>Self Restart: Only valid within updater or packagemanager mode.</source> + <translation>自é‡å¯ï¼šä»…在更新程åºæˆ–包管ç†å™¨æ¨¡å¼ä¸‹æœ‰æ•ˆã€‚</translation> </message> <message> - <source>The second type/value needs to be one of: %1</source> - <translation>第二个类型/值必须是下列之一:%1</translation> + <source>Self Restart: Invalid arguments</source> + <translation>自é‡å¯ï¼šå‚æ•°æ— æ•ˆ</translation> </message> </context> <context> - <name>QInstaller::SetPluginPathOnQtCoreOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> - </message> + <name>QInstaller::ServerAuthenticationDialog</name> <message> - <source>exactly 2</source> - <translation>æ°å¥½ 2 个</translation> + <source>Server Requires Authentication</source> + <translation>æœåŠ¡å™¨éœ€è¦èº«ä»½éªŒè¯</translation> </message> <message> - <source>Qt patch error: new Qt plugin path '%1' -needs to be less than 255 characters.</source> - <translation>Qt è¡¥ä¸é”™è¯¯:æ–° Qt æ’件路径“%1†-必须少于 255 个å—符。</translation> - </message> -</context> -<context> - <name>QInstaller::SetQtCreatorValueOperation</name> - <message> - <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <source>You need to supply a username and password to access this site.</source> + <translation>您需è¦æ供用户å和密ç æ¥è®¿é—®æ¤ç«™ç‚¹ã€‚</translation> </message> <message> - <source>exactly 4</source> - <translation>æ°å¥½ 4 个</translation> + <source>Username:</source> + <translation>用户å：</translation> </message> <message> - <source> (rootInstallPath, group, key, value)</source> - <translation> (rootInstallPathã€groupã€keyã€value)</translation> + <source>Password:</source> + <translation>密ç ：</translation> </message> <message> - <source>Needed installer object in "%1" operation is empty.</source> - <translation>“%1â€è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> + <source>%1 at %2</source> + <translation>ä½äºŽ %2 çš„ %1</translation> </message> +</context> +<context> + <name>QInstaller::SettingsOperation</name> <message> - <source>There is no value set for '%1' on the installer object.</source> - <translation>没有为安装程åºå¯¹è±¡ä¸Šçš„“%1â€è®¾å®šå€¼ã€‚</translation> + <source>Missing argument(s) '%1' calling '%2' with arguments '%3'.</source> + <translation>缺少å‚数“%1â€ä½¿ç”¨å‚数“%3â€æ¥è°ƒç”¨â€œ%2â€ã€‚</translation> </message> <message> - <source>Needed installer object in '%1' operation is empty.</source> - <translation>“%1â€è¿ç®—ä¸æ‰€éœ€çš„安装程åºå¯¹è±¡ä¸ºç©ºã€‚</translation> + <source>Current method argument calling '%1' with arguments '%2' is not supported. Please use set, remove, add_array_value or remove_array_value.</source> + <translation>ä¸æ”¯æŒå½“å‰å¸¦æœ‰å‚数“%2â€çš„方法å‚数调用“%1â€ã€‚请使用set，remove，add_array_value或者remove_array_value。</translation> </message> </context> <context> <name>QInstaller::SimpleMoveFileOperation</name> <message> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>%0 ä¸å˜åœ¨æ— 效的å‚æ•°:已给定 %1 个å‚数，%2 应为 %3 个。</translation> + <translation>%0 ä¸å˜åœ¨æ— 效的å‚数：已给定 %1 个å‚数，%2 应为 %3 个。</translation> </message> <message> <source>exactly 2</source> <translation>æ°å¥½ 2 个</translation> </message> <message> - <source>None of the arguments can be empty: source '%1', target '%2'.</source> - <translation>å‚æ•°å‡ä¸å¾—为空:æºâ€œ%1â€ï¼Œç›®æ ‡â€œ%2â€ã€‚</translation> + <source>None of the arguments can be empty: source '%1', target '%2'.</source> + <translation>å‚æ•°å‡ä¸å¾—为空：æºâ€œ%1â€ï¼Œç›®æ ‡â€œ%2â€ã€‚</translation> </message> <message> - <source>Can not move source '%1' to target '%2', because target exists and is not removable.</source> - <translation>æ— æ³•å°†æºâ€œ%1â€ç§»åŠ¨åˆ°ç›®æ ‡â€œ%2â€ï¼Œå› ä¸ºç›®æ ‡å·²ç»å˜åœ¨ä¸”ä¸å¯åˆ 除。</translation> + <source>Move '%1' to '%2'.</source> + <translation>将“%1â€ç§»åŠ¨åˆ°â€œ%2â€ã€‚</translation> </message> <message> - <source>Can not move source '%1' to target '%2': %3</source> - <translation>æ— æ³•å°†æºâ€œ%1â€ç§»åŠ¨åˆ°ç›®æ ‡â€œ%2â€:%3</translation> + <source>Cannot move source '%1' to target '%2', because target exists and is not removable.</source> + <translation>æ— æ³•å°†æºâ€œ%1â€ç§»åŠ¨åˆ°ç›®æ ‡â€œ%2â€ï¼Œå› ä¸ºç›®æ ‡å·²ç»å˜åœ¨ä¸”ä¸å¯åˆ 除。</translation> </message> <message> - <source>Move '%1' to '%2'.</source> - <translation>将“%1â€ç§»åŠ¨åˆ°â€œ%2â€</translation> + <source>Cannot move source '%1' to target '%2': %3</source> + <translation>æ— æ³•å°†æºâ€œ%1â€ç§»åŠ¨åˆ°ç›®æ ‡â€œ%2â€ï¼š%3</translation> </message> </context> <context> @@ -2055,7 +2288,7 @@ needs to be less than 255 characters.</source> <translation>开始èœå•å¿«æ·æ–¹å¼</translation> </message> <message> - <source>Select the Start Menu in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.</source> + <source>Select the Start Menu in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.</source> <translation>选择您希望在其ä¸åˆ›å»ºç¨‹åºå¿«æ·æ–¹å¼çš„开始èœå•ã€‚您还å¯ä»¥è¾“å…¥å称以创建新文件夹。</translation> </message> </context> @@ -2083,10 +2316,6 @@ needs to be less than 255 characters.</source> <translation>错误</translation> </message> <message> - <source>The install directory cannot be empty, please specify a valid folder.</source> - <translation>安装文件夹ä¸èƒ½ä¸ºç©ºï¼Œè¯·æŒ‡å®šä¸€ä¸ªæœ‰æ•ˆçš„文件夹。</translation> - </message> - <message> <source>As the install directory is completely deleted, installing in %1 is forbidden.</source> <translation>ç”±äºŽå®‰è£…ç›®å½•å·²å®Œå…¨åˆ é™¤ï¼Œå› æ¤ç¦æ¢åœ¨ %1 ä¸è¿›è¡Œå®‰è£…。</translation> </message> @@ -2095,419 +2324,134 @@ needs to be less than 255 characters.</source> <translation>è¦å‘Š</translation> </message> <message> - <source>You have selected an existing, non-empty folder for installation. Note that it will be completely wiped on uninstallation of this application. It is not advisable to install into this folder as installation might fail. Do you want to continue?</source> - <translation>您已为安装文件选择了一个现有的éžç©ºæ–‡ä»¶å¤¹ã€‚请注æ„，å¸è½½æ¤åº”用程åºæ—¶ä¼šå°†è¯¥æ–‡ä»¶å¤¹å®Œå…¨æ“¦é™¤ã€‚ä¸å»ºè®®æ‚¨åœ¨è¯¥æ–‡ä»¶å¤¹ä¸å®‰è£…应用程åºï¼Œå› 为安装å¯èƒ½ä¼šå¤±è´¥ã€‚您是å¦è¦ç»§ç»?</translation> - </message> - <message> <source>Select Installation Folder</source> <translation>选择安装文件夹</translation> </message> -</context> -<context> - <name>QInstallerCreator::Archive</name> - <message> - <source>Could not create %1: %2</source> - <translation>æ— æ³•åˆ›å»º %1:%2</translation> - </message> - <message> - <source>Could not open archive file %1 for reading.</source> - <translation>æ— æ³•æ‰“å¼€å˜æ¡£æ–‡ä»¶ %1 进行读å–。</translation> - </message> - <message> - <source>Could not create archive from %1: Not a file.</source> - <translation>æ— æ³•ä»Ž %1 创建å˜æ¡£:ä¸æ˜¯æœ‰æ•ˆæ–‡ä»¶ã€‚</translation> - </message> - <message> - <source>Error while packing directory at %1</source> - <translation>打包ä½äºŽ %1 的目录时出现错误</translation> - </message> -</context> -<context> - <name>QObject</name> - <message> - <source>Authorization required</source> - <translation>需è¦æŽˆæƒ</translation> - </message> - <message> - <source>Enter your password to authorize for sudo:</source> - <translation>输入您的 sudo 密ç 以进行授æƒ:</translation> - </message> - <message> - <source>Error acquiring admin rights</source> - <translation>获å–管ç†å‘˜æƒé™æ—¶å‡ºçŽ°é”™è¯¯</translation> - </message> - <message> - <source>Searched whole file, no marker found</source> - <translation>å·²æœç´¢æ•´ä¸ªæ–‡ä»¶ï¼Œæœªæ‰¾åˆ°æ ‡è®°</translation> - </message> - <message> - <source>Could not seek to %1 in file %2: %3</source> - <translation>æ— æ³•åœ¨æ–‡ä»¶ %2 ä¸æ‰¾åˆ° %1:%3</translation> - </message> - <message> - <source>No marker found, stopped after %1.</source> - <translation>æœªæ‰¾åˆ°æ ‡è®°ï¼Œå·²åœ¨ %1 åŽåœæ¢ã€‚</translation> - </message> - <message> - <source>No marker found, unknown exception caught.</source> - <translation>æœªæ‰¾åˆ°æ ‡è®°ï¼Œæ•èŽ·æœªçŸ¥å¼‚常。</translation> - </message> - <message> - <source>Cannot create zipped file for path %1: %2</source> - <translation>æ— æ³•ä¸ºè·¯å¾„ %1 创建压缩文件:%2</translation> - </message> - <message> - <source>Could not seek to in-binary resource. (offset: %1, length: %2)</source> - <translation>æ— æ³•æ‰¾åˆ°äºŒè¿›åˆ¶å†…èµ„æºã€‚(å移:%1，长度:%2)</translation> - </message> - <message> - <source>Could not register in-binary resource.</source> - <translation>æ— æ³•æ³¨å†ŒäºŒè¿›åˆ¶å†…èµ„æºã€‚</translation> - </message> - <message> - <source>Could not open binary %1: %2</source> - <translation>æ— æ³•æ‰“å¼€äºŒè¿›åˆ¶æ–‡ä»¶ %1:%2</translation> - </message> - <message> - <source>Could not seek to binary layout section.</source> - <translation>æ— æ³•æ‰¾åˆ°äºŒè¿›åˆ¶å¸ƒå±€éƒ¨åˆ†ã€‚</translation> - </message> - <message> - <source>Could not seek to metadata index.</source> - <translation>æ— æ³•æ‰¾åˆ°å…ƒæ•°æ®ç´¢å¼•ã€‚</translation> - </message> - <message> - <source>Could not seek to operation list.</source> - <translation>æ— æ³•æ‰¾åˆ°è¿ç®—列表。</translation> - </message> <message> - <source>Could not seek to component index information.</source> - <translation>æ— æ³•æ‰¾åˆ°ç»„ä»¶ç´¢å¼•ä¿¡æ¯ã€‚</translation> - </message> - <message> - <source>Could not seek to component index.</source> - <translation>æ— æ³•æ‰¾åˆ°ç»„ä»¶ç´¢å¼•ã€‚</translation> - </message> - <message> - <source>Could not backup file %1</source> - <translation>æ— æ³•å¤‡ä»½æ–‡ä»¶ %1</translation> - </message> - <message> - <source>Could not delete file %1</source> - <translation>æ— æ³•åˆ é™¤æ–‡ä»¶ %1</translation> - </message> - <message> - <source>Could not restore backup file into %1</source> - <translation>æ— æ³•å°†å¤‡ä»½æ–‡ä»¶æ¢å¤åˆ° %1 ä¸</translation> - </message> - <message> - <source>Could not create link from %1 to %2.</source> - <translation>æ— æ³•åˆ›å»ºä»Ž %1 到 %2 的链接。</translation> - </message> - <message> - <source>Could not remove link from %1 to %2.</source> - <translation>æ— æ³•åˆ é™¤ä»Ž %1 到 %2 的链接。</translation> - </message> - <message> - <source>Could not remove file %1: %2</source> - <translation>æ— æ³•åˆ é™¤æ–‡ä»¶ %1:%2</translation> - </message> - <message> - <source>Failed to overwrite %1: %2</source> - <translation>覆盖 %1 失败:%2</translation> + <source>The folder you selected already exists and contains an installation. Choose a different target for installation.</source> + <translation>您选择的文件夹已ç»å˜åœ¨å¹¶åŒ…å«å®‰è£…文件。 +è¯·é€‰æ‹©å…¶ä»–å®‰è£…ç›®æ ‡ã€‚</translation> </message> <message> - <source>Registry path %1 is not writable</source> - <translation>注册路径 %1 ä¸å¯å†™å…¥</translation> + <source>You have selected an existing, non-empty folder for installation. +Note that it will be completely wiped on uninstallation of this application. +It is not advisable to install into this folder as installation might fail. +Do you want to continue?</source> + <translation>您已为安装文件选择了一个现有的éžç©ºæ–‡ä»¶å¤¹ã€‚ +请注æ„，å¸è½½æ¤åº”用程åºæ—¶ä¼šå°†è¯¥æ–‡ä»¶å¤¹å®Œå…¨æ“¦é™¤ã€‚ +ä¸å»ºè®®æ‚¨åœ¨è¯¥æ–‡ä»¶å¤¹ä¸å®‰è£…应用程åºï¼Œå› 为安装å¯èƒ½ä¼šå¤±è´¥ã€‚ +您是å¦è¦ç»§ç»?</translation> </message> <message> - <source>Could not write to registry path %1</source> - <translation>æ— æ³•å†™å…¥æ³¨å†Œè·¯å¾„ %1</translation> + <source>You have selected an existing file or symlink, please choose a different target for installation.</source> + <translation>您已为安装文件选择了一个现有的文件或符å·é“¾æŽ¥ï¼Œè¯·é€‰æ‹©å…¶ä»–å®‰è£…ç›®æ ‡ã€‚</translation> </message> <message> - <source>Number of arguments does not match: one is required</source> - <translation>å‚æ•°æ•°é‡ä¸åŒ¹é…:需è¦ä¸€ä¸ª</translation> + <source>The installation path cannot be empty, please specify a valid folder.</source> + <translation>安装路径ä¸èƒ½ä¸ºç©ºï¼Œè¯·æŒ‡å®šä¸€ä¸ªæœ‰æ•ˆçš„文件夹。</translation> </message> <message> - <source>Could not get package manager core.</source> - <translation>æ— æ³•èŽ·å¾—åŒ…ç®¡ç†å™¨å†…æ ¸ã€‚</translation> + <source>The installation path cannot be relative, please specify an absolute path.</source> + <translation>安装路径ä¸èƒ½æ˜¯ç›¸å¯¹è·¯å¾„，请指定一个ç»å¯¹è·¯å¾„。</translation> </message> <message> - <source>This process should be stopped before continuing: %1</source> - <translation>必须先åœæ¢æ¤è¿›ç¨‹æ‰èƒ½ç»§ç»æ“作:%1</translation> + <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> + <translation>路径或安装目录包å«éž ASCII å—符。目å‰ä¸æ”¯æŒæ¤ç±»å—符!请选择其他路径或安装目录。</translation> </message> <message> - <source>These processes should be stopped before continuing: %1</source> - <translation>必须先åœæ¢ä»¥ä¸‹è¿›ç¨‹æ‰èƒ½ç»§ç»æ“作:%1</translation> + <source>The path you have entered is too long, please make sure to specify a valid path.</source> + <translation>您输入的路径过长，请务必指定一个有效的路径。</translation> </message> <message> - <source>Cannot open file %1 for reading: %2</source> - <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行读å–:%2</translation> + <source>The path you have entered is not valid, please make sure to specify a valid target.</source> + <translation>æ‚¨è¾“å…¥çš„è·¯å¾„æ— æ•ˆï¼Œè¯·åŠ¡å¿…æŒ‡å®šä¸€ä¸ªæœ‰æ•ˆçš„ç›®æ ‡ã€‚</translation> </message> <message> - <source>Cannot open file %1 for writing: %2</source> - <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶ %1 进行写入:%2</translation> + <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> + <translation>æ‚¨è¾“å…¥çš„è·¯å¾„æ— æ•ˆï¼Œè¯·åŠ¡å¿…æŒ‡å®šä¸€ä¸ªæœ‰æ•ˆçš„ç£ç›˜ã€‚</translation> </message> <message> - <source>Write failed after %1 bytes: %2</source> - <translation>写入 %1 å—节åŽå¤±è´¥:%2</translation> + <source>The installation path must not end with '.', please specify a valid folder.</source> + <translation>安装路径ä¸èƒ½ä»¥â€œ.â€ç»“æŸã€‚ 请指定一个有效的文件夹。</translation> </message> <message> - <source>Read failed after %1 bytes: %2</source> - <translation>è¯»å– %1 å—节åŽå¤±è´¥:%2</translation> + <source>The installation path must not contain '%1', please specify a valid folder.</source> + <translation>安装路径ä¸å¾—包å«â€œ%1â€ï¼Œè¯·æŒ‡å®šä¸€ä¸ªæœ‰æ•ˆçš„文件夹。</translation> </message> +</context> +<context> + <name>QInstaller::TestRepository</name> <message> - <source>Could not remove folder %1: %2</source> - <translation>æ— æ³•åˆ é™¤æ–‡ä»¶å¤¹ %1:%2</translation> + <source>Empty repository URL.</source> + <translation>储å˜åº“ URL 为空。</translation> </message> <message> - <source>Could not create folder %1</source> - <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ %1</translation> + <source>URL scheme not supported: %1 (%2).</source> + <translation>ä¸æ”¯æŒçš„ URL 方案：%1 (%2)。</translation> </message> <message> - <source>Could not copy file from %1 to %2: %3</source> - <translation>æ— æ³•å°†æ–‡ä»¶ä»Ž %1 å¤åˆ¶åˆ° %2:%3</translation> + <source>Got a timeout while testing: '%1'</source> + <translation>测试：“%1â€æ—¶è¶…æ—¶</translation> </message> <message> - <source>Could not move file from %1 to %2: %3</source> - <translation>æ— æ³•å°†æ–‡ä»¶ä»Ž %1 移动到 %2:%3</translation> + <source>Could not parse Updates.xml! Error: %1.</source> + <translation>æ— æ³•è§£æž Updates.xml! 错误：%1。</translation> </message> <message> - <source>Could not create folder %1: %2</source> - <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹ %1:%2</translation> + <source>Updates.xml could not be opened for reading!</source> + <translation>æ— æ³•æ‰“å¼€ Updates.xml 进行读å–!</translation> </message> <message> - <source>Could not open temporary file: %1</source> - <translation>æ— æ³•æ‰“å¼€ä¸´æ—¶æ–‡ä»¶:%1</translation> + <source>Updates.xml could not be found on server!</source> + <translation>æ— æ³•åœ¨æœåŠ¡å™¨ä¸Šæ‰¾åˆ° Updates.xml!</translation> </message> +</context> +<context> + <name>QObject</name> <message> - <source>Could not open temporary file for template %1: %2</source> - <translation>æ— æ³•æ‰“å¼€æ¨¡æ¿ %1 的临时文件:%2</translation> + <source>Authorization required</source> + <translation>需è¦æŽˆæƒ</translation> </message> <message> - <source>Could not create temporary folder for template %1: %2</source> - <translation>æ— æ³•ä¸ºæ¨¡æ¿ %1 创建临时文件夹:%2</translation> + <source>Enter your password to authorize for sudo:</source> + <translation>输入您的 sudo 密ç 以进行授æƒï¼š</translation> </message> <message> - <source>Authorization Error</source> - <translation>授æƒé”™è¯¯</translation> + <source>Error acquiring admin rights</source> + <translation>获å–管ç†å‘˜æƒé™æ—¶å‡ºçŽ°é”™è¯¯</translation> </message> +</context> +<context> + <name>RemoteClient</name> <message> - <source>Couldn't get authorization.</source> + <source>Could not get authorization.</source> <translation>æ— æ³•èŽ·å¾—æŽˆæƒã€‚</translation> </message> <message> - <source>Couldn't get authorization that is needed for continuing the installation. -Either abort the installation or use the fallback solution by running + <source>Could not get authorization that is needed for continuing the installation. + Either abort the installation or use the fallback solution by running + %1 -as root and then clicking ok.</source> + +as root and then clicking OK.</source> <translation>æ— æ³•èŽ·å¾—ç»§ç»å®‰è£…所需的授æƒã€‚ 您å¯ä»¥ä¸æ¢å®‰è£…，也å¯ä»¥ä½¿ç”¨å¤‡ç”¨è§£å†³æ–¹æ¡ˆï¼Œä»¥æ ¹ç”¨æˆ·èº«ä»½è¿è¡Œ %1 ，然åŽå•å‡»â€œç¡®å®šâ€ã€‚</translation> </message> +</context> +<context> + <name>ResourceCollectionManager</name> <message> - <source>Invalid Argument: source folder must not be empty.</source> - <translation>å‚æ•°æ— æ•ˆ:æºæ–‡ä»¶å¤¹ä¸å¾—为空。</translation> - </message> - <message> - <source>Could not backup file %1: %2</source> - <translation>æ— æ³•å¤‡ä»½æ–‡ä»¶ %1:%2</translation> - </message> - <message> - <source>Failed to copy file %1: %2</source> - <translation>å¤åˆ¶æ–‡ä»¶ %1 失败:%2</translation> - </message> - <message> - <source>Could not create folder at %1: %2</source> - <translation>æ— æ³•åœ¨ %1 创建文件夹:%2</translation> - </message> - <message> - <source>Path exists but is not a folder: %1</source> - <translation>路径å˜åœ¨ï¼Œä½†ä¸æ˜¯æ–‡ä»¶å¤¹:%1</translation> - </message> - <message> - <source>Could not create folder: %1</source> - <translation>æ— æ³•åˆ›å»ºæ–‡ä»¶å¤¹:%1</translation> - </message> - <message> - <source>Could not create temporary file</source> - <translation>æ— æ³•åˆ›å»ºä¸´æ—¶æ–‡ä»¶</translation> - </message> - <message> - <source>Could not retrieve property %1 for item %2</source> - <translation>æ— æ³•æ£€ç´¢ %2 项目的 %1 属性</translation> - </message> - <message> - <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> - <translation>%2 项目的 %1 属性ä¸å±žäºŽ VT_FILETIME 类型，而是 %3</translation> - </message> - <message> - <source>Could not convert file time to local time</source> - <translation>æ— æ³•å°†æ–‡ä»¶æ—¶é—´è½¬æ¢ä¸ºæœ¬åœ°æ—¶é—´</translation> - </message> - <message> - <source>Could not convert local file time to system time</source> - <translation>æ— æ³•å°†æœ¬åœ°æ–‡ä»¶æ—¶é—´è½¬æ¢ä¸ºç³»ç»Ÿæ—¶é—´</translation> - </message> - <message> - <source>No device set for output stream</source> - <translation>没有为输出æµè®¾ç½®è®¾å¤‡</translation> - </message> - <message> - <source>Could not load codecs</source> - <translation>æ— æ³•åŠ è½½è§£ç 器</translation> - </message> - <message> - <source>Could not retrieve default format</source> - <translation>æ— æ³•æ£€ç´¢é»˜è®¤æ ¼å¼</translation> - </message> - <message> - <source>Could not open archive</source> - <translation>æ— æ³•æ‰“å¼€å˜æ¡£</translation> - </message> - <message> - <source>No CArc found</source> - <translation>未找到 CArc</translation> - </message> - <message> - <source>Could not retrieve number of items in archive</source> - <translation>æ— æ³•æ£€ç´¢å˜æ¡£ä¸çš„项目数é‡</translation> - </message> - <message> - <source>Could not retrieve path of archive item %1</source> - <translation>æ— æ³•æ£€ç´¢å˜æ¡£é¡¹ç›® %1 的路径</translation> - </message> - <message> - <source>Unknown exception caught (%1)</source> - <translation>æ•èŽ·æœªçŸ¥å¼‚常(%1)</translation> - </message> - <message> - <source>Failed</source> - <translation>失败</translation> - </message> - <message> - <source>Could not remove already existing symlink. %1</source> - <translation>æ— æ³•åˆ é™¤å·²ç»å˜åœ¨çš„符å·é“¾æŽ¥ã€‚%1</translation> - </message> - <message> - <source>Could not open file: %1 (%2)</source> - <translation>æ— æ³•æ‰“å¼€æ–‡ä»¶:%1 (%2)</translation> - </message> - <message> - <source>Could not create symlink at '%1'. Another one is already existing.</source> - <translation>æ— æ³•åœ¨â€œ%1â€åˆ›å»ºç¬¦å·é“¾æŽ¥ã€‚å¦ä¸€ä¸ªç¬¦å·é“¾æŽ¥å·²ç»å˜åœ¨ã€‚</translation> - </message> - <message> - <source>Could not read symlink target from file '%1'.</source> - <translation>æ— æ³•ä»Žæ–‡ä»¶â€œ%1â€ä¸è¯»å–符å·é“¾æŽ¥ç›®æ ‡ã€‚</translation> - </message> - <message> - <source>Could not create symlink at %1. %2</source> - <translation>æ— æ³•åœ¨ %1 创建符å·é“¾æŽ¥ã€‚%2</translation> - </message> - <message> - <source>internal code: %1</source> - <translation>内部代ç :%1</translation> - </message> - <message> - <source>not enough memory</source> - <translation>内å˜ä¸è¶³</translation> - </message> - <message> - <source>Error: %1</source> - <translation>错误:%1</translation> - </message> - <message> - <source>Could not create archive %1. %2</source> - <translation>æ— æ³•åˆ›å»ºå˜æ¡£ %1。%2</translation> - </message> - <message> - <source>CArc index %1 out of bounds [0, %2]</source> - <translation>CArc 索引 %1 超出 [0, %2] 的范围</translation> - </message> - <message> - <source>Item index %1 out of bounds [0, %2]</source> - <translation>项目索引 %1 超出 [0, %2] 的范围</translation> - </message> - <message> - <source>Could not create output file for writing: %1</source> - <translation>æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶è¿›è¡Œå†™å…¥:%1</translation> - </message> - <message> - <source>Error while extracting '%1': %2</source> - <translation>æå–“%1â€æ—¶å‡ºçŽ°é”™è¯¯:%2</translation> - </message> - <message> - <source>Failed to open '%1' for reading.</source> - <translation>打开“%1â€è¯»å–失败。</translation> - </message> - <message> - <source>Failed to open '%1' for writing.</source> - <translation>打开“%1â€å†™å…¥å¤±è´¥ã€‚</translation> - </message> - <message> - <source>Invalid arguments: %1 arguments given, %2 to %3 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 %2 到 %3 个。</translation> - </message> - <message> - <source>Invalid arguments: %1 arguments given, %2 expected.</source> - <translation>å‚æ•°æ— æ•ˆ:已给定 %1 个å‚数，应为 %2 个。</translation> - </message> - <message> - <source>Error while elevating access rights.</source> - <translation>å‡çº§è®¿é—®æƒé™æ—¶å‡ºçŽ°é”™è¯¯ã€‚</translation> - </message> - <message> - <source>Failed to seek in file %1: %2</source> - <translation>æ— æ³•åœ¨æ–‡ä»¶ %1 ä¸æ‰¾åˆ°ä»¥ä¸‹å†…容:%2</translation> - </message> - <message> - <source>Could not open the requested script file at %1: %2</source> - <translation>æ— æ³•æ‰“å¼€ä½äºŽ %1 的请求脚本文件:%2</translation> - </message> - <message> - <source>Exception while loading the control script %1</source> - <translation>åŠ è½½æŽ§åˆ¶è„šæœ¬ %1 时出现异常</translation> - </message> - <message> - <source>Registering file types is only supported on Windows.</source> - <translation>仅在 Windows 上支æŒæ³¨å†Œæ–‡ä»¶ç±»åž‹ã€‚</translation> - </message> - <message> - <source>Failed to open %1 for reading</source> - <translation>打开 %1 读å–失败</translation> - </message> - <message> - <source>Failed to open %1 for writing</source> - <translation>打开 %1 写入失败</translation> - </message> - <message> - <source>Could not create lock file %1: %2</source> - <translation>æ— æ³•åˆ›å»ºé”定文件 %1:%2</translation> - </message> - <message> - <source>Could not write PID to lock file %1: %2</source> - <translation>æ— æ³•å°† PID 写入é”定文件 %1:%2</translation> - </message> - <message> - <source>Could not lock lock file %1: %2</source> - <translation>æ— æ³•é”定é”定文件 %1:%2</translation> - </message> - <message> - <source>Could not unlock lock file %1: %2</source> - <translation>æ— æ³•è§£é”é”定文件 %1:%2</translation> - </message> - <message> - <source>Failed to seek in file %1. Reason: %2.</source> - <translation>æ— æ³•åœ¨æ–‡ä»¶ %1 ä¸æ‰¾åˆ°ã€‚åŽŸå› :%2.</translation> + <source>Could not open resource %1: %2</source> + <translation>æ— æ³•æ‰“å¼€èµ„æº %1：%2</translation> </message> </context> <context> <name>Settings</name> <message> <source>Could not open settings file %1 for reading: %2</source> - <translation>æ— æ³•æ‰“å¼€è®¾ç½®æ–‡ä»¶ %1 进行读å–:%2</translation> + <translation>æ— æ³•æ‰“å¼€è®¾ç½®æ–‡ä»¶ %1 进行读å–：%2</translation> </message> </context> <context> @@ -2534,31 +2478,15 @@ as root and then clicking ok.</source> </message> <message> <source>HTTP proxy:</source> - <translation>HTTP 代ç†:</translation> + <translation>HTTP 代ç†ï¼š</translation> </message> <message> <source>Port:</source> - <translation>端å£:</translation> - </message> - <message> - <source>HTTP proxy requires authentication</source> - <translation>HTTP 代ç†éœ€è¦èº«ä»½éªŒè¯</translation> - </message> - <message> - <source>Username:</source> - <translation>用户å:</translation> - </message> - <message> - <source>Password:</source> - <translation>密ç :</translation> + <translation>端å£ï¼š</translation> </message> <message> <source>FTP proxy:</source> - <translation>FTP 代ç†:</translation> - </message> - <message> - <source>FTP proxy requires authentication</source> - <translation>FTP 代ç†éœ€è¦èº«ä»½éªŒè¯</translation> + <translation>FTP 代ç†ï¼š</translation> </message> <message> <source>Repositories</source> @@ -2646,85 +2574,18 @@ as root and then clicking ok.</source> </message> </context> <context> - <name>TargetDirectoryPageImpl</name> - <message> - <source>The installation path cannot be empty, please specify a valid folder.</source> - <translation>安装路径ä¸èƒ½ä¸ºç©ºï¼Œè¯·æŒ‡å®šä¸€ä¸ªæœ‰æ•ˆçš„文件夹。</translation> - </message> - <message> - <source>The installation path cannot be relative, please specify an absolute path.</source> - <translation>安装路径ä¸èƒ½æ˜¯ç›¸å¯¹è·¯å¾„，请指定一个ç»å¯¹è·¯å¾„。</translation> - </message> - <message> - <source>The path you have entered is too long, please make sure to specify a valid path.</source> - <translation>您输入的路径过长，请务必指定一个有效的路径。</translation> - </message> - <message> - <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> - <translation>æ‚¨è¾“å…¥çš„è·¯å¾„æ— æ•ˆï¼Œè¯·åŠ¡å¿…æŒ‡å®šä¸€ä¸ªæœ‰æ•ˆçš„ç£ç›˜ã€‚</translation> - </message> - <message> - <source>The installation path must not contain %1, please specify a valid folder.</source> - <translation>安装路径ä¸å¾—åŒ…å« %1，请指定一个有效的文件夹。</translation> - </message> - <message> - <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> - <translation>路径或安装目录包å«éž ASCII å—符。目å‰ä¸æ”¯æŒæ¤ç±»å—符!请选择其他路径或安装目录。</translation> - </message> - <message> - <source>Warning</source> - <translation>è¦å‘Š</translation> - </message> - <message> - <source>Error</source> - <translation>错误</translation> - </message> - <message> - <source>As the install directory is completely deleted installing in %1 is forbidden.</source> - <translation>ç”±äºŽå®‰è£…ç›®å½•å·²å®Œå…¨åˆ é™¤ï¼Œå› æ¤ç¦æ¢åœ¨ %1 ä¸è¿›è¡Œå®‰è£…。</translation> - </message> + <name>UpdateOperation</name> <message> - <source>The folder you selected exists already and contains an installation. -Do you want to overwrite it?</source> - <translation>您选择的文件夹已ç»å˜åœ¨å¹¶åŒ…å«å®‰è£…文件。 -您是å¦è¦è¦†ç›–它?</translation> - </message> - <message> - <source>You have selected an existing, non-empty folder for installation. -Note that it will be completely wiped on uninstallation of this application. -It is not advisable to install into this folder as installation might fail. -Do you want to continue?</source> - <translation>您已为安装文件选择了一个现有的éžç©ºæ–‡ä»¶å¤¹ã€‚ -请注æ„，å¸è½½æ¤åº”用程åºæ—¶ä¼šå°†è¯¥æ–‡ä»¶å¤¹å®Œå…¨æ“¦é™¤ã€‚ -ä¸å»ºè®®æ‚¨åœ¨è¯¥æ–‡ä»¶å¤¹ä¸å®‰è£…应用程åºï¼Œå› 为安装å¯èƒ½ä¼šå¤±è´¥ã€‚ -您是å¦è¦ç»§ç»?</translation> - </message> - <message> - <source>You have selected an existing file or symlink, please choose a different target for installation.</source> - <translation>您已为安装文件选择了一个现有的文件或符å·é“¾æŽ¥ï¼Œè¯·é€‰æ‹©å…¶ä»–å®‰è£…ç›®æ ‡ã€‚</translation> - </message> -</context> -<context> - <name>TestRepository</name> - <message> - <source>Empty repository URL.</source> - <translation>储å˜åº“ URL 为空。</translation> - </message> - <message> - <source>URL scheme not supported: %1 (%2).</source> - <translation>ä¸æ”¯æŒçš„ URL 方案:%1 (%2).</translation> - </message> - <message> - <source>Could not parse Updates.xml! Error: %1.</source> - <translation>æ— æ³•è§£æž Updates.xml!错误:%1.</translation> + <source>Registry path %1 is not writable</source> + <translation>注册路径 %1 ä¸å¯å†™å…¥</translation> </message> <message> - <source>Updates.xml could not be opened for reading!</source> - <translation>æ— æ³•æ‰“å¼€ Updates.xml 进行读å–!</translation> + <source>Could not write to registry path %1</source> + <translation>æ— æ³•å†™å…¥æ³¨å†Œè·¯å¾„ %1</translation> </message> <message> - <source>Updates.xml could not be found on server!</source> - <translation>æ— æ³•åœ¨æœåŠ¡å™¨ä¸Šæ‰¾åˆ° Updates.xml!</translation> + <source>Renaming %1 into %2 failed with %3.</source> + <translation>é‡å‘½å %1 为 %2 å¤±è´¥å› ä¸º %3。</translation> </message> </context> </TS> diff --git a/src/sdk/updatechecker.cpp b/src/sdk/updatechecker.cpp index 7f2e50275..d0b571606 100644 --- a/src/sdk/updatechecker.cpp +++ b/src/sdk/updatechecker.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/sdk/updatechecker.h b/src/sdk/updatechecker.h index 134ef704b..6fe1a911f 100644 --- a/src/sdk/updatechecker.h +++ b/src/sdk/updatechecker.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/src.pro b/src/src.pro index 0f9a83338..50023527f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,9 +1,10 @@ CONFIG += ordered TEMPLATE = subdirs SUBDIRS += libs sdk -TRANSLATIONS += sdk/translations/de_de.ts \ - sdk/translations/en_us.ts \ - sdk/translations/fr_fr.ts \ - sdk/translations/ja_jp.ts \ - sdk/translations/ru_ru.ts \ +TRANSLATIONS += sdk/translations/de.ts \ + sdk/translations/en.ts \ + sdk/translations/fr.ts \ + sdk/translations/ja.ts \ + sdk/translations/pl.ts \ + sdk/translations/ru.ts \ sdk/translations/zh_cn.ts diff --git a/tests/auto/installer/binaryformat/tst_binaryformat.cpp b/tests/auto/installer/binaryformat/tst_binaryformat.cpp index b3025b87b..af32dddc6 100644 --- a/tests/auto/installer/binaryformat/tst_binaryformat.cpp +++ b/tests/auto/installer/binaryformat/tst_binaryformat.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/clientserver/tst_clientserver.cpp b/tests/auto/installer/clientserver/tst_clientserver.cpp index a0652bcdd..e5be5a8a0 100644 --- a/tests/auto/installer/clientserver/tst_clientserver.cpp +++ b/tests/auto/installer/clientserver/tst_clientserver.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -39,11 +39,14 @@ #include <remotefileengine.h> #include <remoteserver.h> +#include <QBuffer> #include <QSettings> -#include <QTcpSocket> -#include <QTemporaryFile> +#include <QLocalSocket> #include <QTest> #include <QSignalSpy> +#include <QTemporaryFile> +#include <QUuid> +#include <QLocalServer> using namespace QInstaller; @@ -51,89 +54,232 @@ class tst_ClientServer : public QObject { Q_OBJECT +private: + template<typename T> + void sendCommand(QIODevice *device, const QByteArray &cmd, T t) + { + QByteArray data; + QDataStream stream(&data, QIODevice::WriteOnly); + stream << t; + sendPacket(device, cmd, data); + } + + template<typename T> + void receiveCommand(QIODevice *device, QByteArray *cmd, T *t) + { + QByteArray data; + while (!receivePacket(device, cmd, &data)) + device->waitForReadyRead(-1); + QDataStream stream(&data, QIODevice::ReadOnly); + stream >> *t; + QCOMPARE(stream.status(), QDataStream::Ok); + QVERIFY(stream.atEnd()); + } + private slots: void initTestCase() { RemoteClient::instance().setActive(true); } + void sendReceivePacket() + { + QByteArray validPackage; + typedef qint32 PackageSize; + + // first try sendPacket ... + { + QBuffer device(&validPackage); + device.open(QBuffer::WriteOnly); + + const QByteArray cmd = "say"; + const QByteArray data = "hello" ; + QInstaller::sendPacket(&device, cmd, data); + + // 1 is delimiter (\0) + QCOMPARE(device.buffer().size(), (int)sizeof(PackageSize) + cmd.size() + 1 + data.size()); + QCOMPARE(device.buffer().right(data.size()), data); + QCOMPARE(device.buffer().mid(sizeof(PackageSize), cmd.size()), cmd); + } + + // now try successful receivePacket ... + { + QBuffer device(&validPackage); + device.open(QBuffer::ReadOnly); + + QByteArray cmd; + QByteArray data; + QCOMPARE(QInstaller::receivePacket(&device, &cmd, &data), true); + + QCOMPARE(device.pos(), device.size()); + QCOMPARE(cmd, QByteArray("say")); + QCOMPARE(data, QByteArray("hello")); + } + + + // now try read of incomplete packet ... + { + QByteArray incompletePackage = validPackage; + char toStrip = validPackage.at(validPackage.size() - 1); + incompletePackage.resize(incompletePackage.size() - 1); + QBuffer device(&incompletePackage); + device.open(QBuffer::ReadOnly); + + QByteArray cmd; + QByteArray data; + QCOMPARE(QInstaller::receivePacket(&device, &cmd, &data), false); + + QCOMPARE(device.pos(), 0); + QCOMPARE(cmd, QByteArray()); + QCOMPARE(data, QByteArray()); + + // make packet complete again, retry + device.buffer().append(toStrip); + QCOMPARE(device.buffer(), validPackage); + + QCOMPARE(QInstaller::receivePacket(&device, &cmd, &data), true); + + QCOMPARE(device.pos(), device.size()); + QCOMPARE(cmd, QByteArray("say")); + QCOMPARE(data, QByteArray("hello")); + } + } + + void localSocket() + { + // + // test roundtrip of a (big) packet via QLocalSocket + // + const QString socketName(__FUNCTION__); + QLocalServer::removeServer(socketName); + + QEventLoop loop; + + const QByteArray command = "HELLO"; + const QByteArray message(10905, '0'); + + QLocalServer server; + { // server + QLocalSocket *rcv = 0; + auto srvDataArrived = [&]() { + QByteArray command, message; + if (!receivePacket(rcv, &command, &message)) + return; + sendPacket(rcv, command, message); + }; + + connect(&server, &QLocalServer::newConnection, [&,srvDataArrived]() { + rcv = server.nextPendingConnection(); + connect(rcv, &QLocalSocket::readyRead, srvDataArrived); + }); + + server.listen(socketName); + } + + + QLocalSocket snd; + { // client + auto clientDataArrived = [&]() { + QByteArray cmd, msg; + if (!receivePacket(&snd, &cmd, &msg)) + return; + QCOMPARE(cmd, command); + QCOMPARE(msg, message); + loop.exit(); + }; + + connect(&snd, &QLocalSocket::readyRead, clientDataArrived); + + QTimer::singleShot(0, [&]() { + snd.connect(&snd, &QLocalSocket::connected, [&](){ + sendPacket(&snd, command, message); + }); + snd.connectToServer(socketName); + }); + } + + loop.exec(); + } + + void testServerConnectDebug() { RemoteServer server; - server.init(Protocol::DefaultPort, QString(Protocol::DefaultAuthorizationKey), + QString socketName = QUuid::createUuid().toString(); + + server.init(socketName, QString(Protocol::DefaultAuthorizationKey), Protocol::Mode::Debug); server.start(); - QTcpSocket socket; - socket.connectToHost(QLatin1String(Protocol::DefaultHostAddress), Protocol::DefaultPort); + QLocalSocket socket; + socket.connectToServer(socketName); QVERIFY2(socket.waitForConnected(), "Could not connect to server."); - QCOMPARE(socket.state() == QAbstractSocket::ConnectedState, true); - - QDataStream stream; - stream.setDevice(&socket); - stream << QString::fromLatin1(Protocol::Authorize) << QString(Protocol::DefaultAuthorizationKey); - - socket.waitForBytesWritten(-1); - if (!socket.bytesAvailable()) - socket.waitForReadyRead(-1); - - quint32 size; stream >> size; - bool authorized; - stream >> authorized; - QCOMPARE(authorized, true); - - socket.flush(); - stream << QString::fromLatin1(Protocol::Authorize) << QString("SomeKey"); - socket.waitForBytesWritten(-1); - if (!socket.bytesAvailable()) - socket.waitForReadyRead(-1); - - stream >> size; - stream >> authorized; - QCOMPARE(authorized, false); + QCOMPARE(socket.state() == QLocalSocket::ConnectedState, true); + + sendCommand(&socket, Protocol::Authorize, QString(Protocol::DefaultAuthorizationKey)); + + { + QByteArray command; + bool authorized; + receiveCommand(&socket, &command, &authorized); + QCOMPARE(command, QByteArray(Protocol::Reply)); + QCOMPARE(authorized, true); + } + + sendCommand(&socket, Protocol::Authorize, QString::fromLatin1("Some Key")); + + { + QByteArray command; + bool authorized; + receiveCommand(&socket, &command, &authorized); + QCOMPARE(command, QByteArray(Protocol::Reply)); + QCOMPARE(authorized, false); + } } void testServerConnectRelease() { RemoteServer server; - quint16 port = (30000 + qrand() % 100); - server.init(port, QString("SomeKey"), Protocol::Mode::Production); + QString socketName = QUuid::createUuid().toString(); + server.init(socketName, QString("SomeKey"), Protocol::Mode::Production); server.start(); - QTcpSocket socket; - socket.connectToHost(QLatin1String(Protocol::DefaultHostAddress), port); + QLocalSocket socket; + socket.connectToServer(socketName); QVERIFY2(socket.waitForConnected(), "Could not connect to server."); - QCOMPARE(socket.state() == QAbstractSocket::ConnectedState, true); - - QDataStream stream; - stream.setDevice(&socket); - stream << QString::fromLatin1(Protocol::Authorize) << QString("SomeKey"); - - socket.waitForBytesWritten(-1); - if (!socket.bytesAvailable()) - socket.waitForReadyRead(-1); - - quint32 size; stream >> size; - bool authorized; - stream >> authorized; - QCOMPARE(authorized, true); - - socket.flush(); - stream << QString::fromLatin1(Protocol::Authorize) << QString(Protocol::DefaultAuthorizationKey); - socket.waitForBytesWritten(-1); - if (!socket.bytesAvailable()) - socket.waitForReadyRead(-1); - - stream >> size; - stream >> authorized; - QCOMPARE(authorized, false); + QCOMPARE(socket.state() == QLocalSocket::ConnectedState, true); + + sendCommand(&socket, Protocol::Authorize, QString::fromLatin1("SomeKey")); + + { + QByteArray command; + bool authorized; + receiveCommand(&socket, &command, &authorized); + QCOMPARE(command, QByteArray(Protocol::Reply)); + QCOMPARE(authorized, true); + } + + sendCommand(&socket, Protocol::Authorize, QString::fromLatin1(Protocol::DefaultAuthorizationKey)); + + { + QByteArray command; + bool authorized; + receiveCommand(&socket, &command, &authorized); + QCOMPARE(command, QByteArray(Protocol::Reply)); + QCOMPARE(authorized, false); + } } void testQSettingsWrapper() { RemoteServer server; + QString socketName = QUuid::createUuid().toString(); + server.init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Production); server.start(); + RemoteClient::instance().init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Debug, + Protocol::StartAs::User); + QSettingsWrapper wrapper("digia", "clientserver"); QCOMPARE(wrapper.isConnectedToServer(), false); wrapper.clear(); @@ -247,8 +393,12 @@ private slots: void testQProcessWrapper() { RemoteServer server; + QString socketName = QUuid::createUuid().toString(); + server.init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Production); server.start(); + RemoteClient::instance().init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Debug, + Protocol::StartAs::User); { QProcess process; QProcessWrapper wrapper; @@ -343,8 +493,13 @@ private slots: void testRemoteFileEngine() { RemoteServer server; + QString socketName = QUuid::createUuid().toString(); + server.init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Production); server.start(); + RemoteClient::instance().init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Debug, + Protocol::StartAs::User); + QString filename; { QTemporaryFile file; diff --git a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp index ec595bdd7..f2e05979d 100644 --- a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp +++ b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/copyoperationtest/tst_copyoperationtest.cpp b/tests/auto/installer/copyoperationtest/tst_copyoperationtest.cpp index b7296eb71..f528b5f39 100644 --- a/tests/auto/installer/copyoperationtest/tst_copyoperationtest.cpp +++ b/tests/auto/installer/copyoperationtest/tst_copyoperationtest.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp b/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp index 1dd42d225..e101b96e5 100644 --- a/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp +++ b/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp index f4702e039..815afb0a2 100644 --- a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp +++ b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/mkdiroperationtest/tst_mkdiroperationtest.cpp b/tests/auto/installer/mkdiroperationtest/tst_mkdiroperationtest.cpp index 7df4bf448..8267c9de0 100644 --- a/tests/auto/installer/mkdiroperationtest/tst_mkdiroperationtest.cpp +++ b/tests/auto/installer/mkdiroperationtest/tst_mkdiroperationtest.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp index a71ca6ac5..4740b60dd 100644 --- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp +++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/scriptengine/data/broken_connect.qs b/tests/auto/installer/scriptengine/data/broken_connect.qs index 2fe873b63..9c7c2b864 100644 --- a/tests/auto/installer/scriptengine/data/broken_connect.qs +++ b/tests/auto/installer/scriptengine/data/broken_connect.qs @@ -6,6 +6,6 @@ function BrokenConnect() function receive() { print("function receive()"); - // this should throw an exception, "foo" does not exist + // this will print an error. foo.bar = "test"; } diff --git a/tests/auto/installer/scriptengine/data/dynamicpage.qs b/tests/auto/installer/scriptengine/data/dynamicpage.qs index 576d5816e..4c56e32a2 100644 --- a/tests/auto/installer/scriptengine/data/dynamicpage.qs +++ b/tests/auto/installer/scriptengine/data/dynamicpage.qs @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/scriptengine/data/enteringpage.qs b/tests/auto/installer/scriptengine/data/enteringpage.qs new file mode 100644 index 000000000..84b5dbed3 --- /dev/null +++ b/tests/auto/installer/scriptengine/data/enteringpage.qs @@ -0,0 +1,44 @@ +/************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** 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 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ + +function Controller() +{ +} + +Controller.prototype.EnteringPageCallback = function() +{ + var page = gui.pageWidgetByObjectName("EnteringPage"); + page.callbackInvoked(); +} + diff --git a/tests/auto/installer/scriptengine/scriptengine.qrc b/tests/auto/installer/scriptengine/scriptengine.qrc index 06829326e..d630f3196 100644 --- a/tests/auto/installer/scriptengine/scriptengine.qrc +++ b/tests/auto/installer/scriptengine/scriptengine.qrc @@ -5,6 +5,7 @@ <file>data/component2.qs</file> <file>data/broken_connect.qs</file> <file>data/dynamicpage.qs</file> + <file>data/enteringpage.qs</file> <file>data/form.ui</file> <file>data/userinterface.qs</file> </qresource> diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp index 12915e30a..23c4b2c4c 100644 --- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp +++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -96,6 +96,55 @@ private: QWidget *m_widget; }; +class EnteringPage : public PackageManagerPage +{ + Q_OBJECT + Q_PROPERTY(QStringList invocationOrder READ invocationOrder) +public: + explicit EnteringPage(PackageManagerCore *core) + : PackageManagerPage(core) + { + setObjectName(QLatin1String("EnteringPage")); + } + QStringList invocationOrder() const { + return m_invocationOrder; + } +public slots: + Q_INVOKABLE void enteringInvoked() { + m_invocationOrder << QLatin1String("Entering"); + } + Q_INVOKABLE void callbackInvoked() { + m_invocationOrder << QLatin1String("Callback"); + } + +protected: + void entering() { + enteringInvoked(); + } +private: + QStringList m_invocationOrder; +}; + +class EnteringGui : public PackageManagerGui +{ + Q_OBJECT +public: + explicit EnteringGui(PackageManagerCore *core) + : PackageManagerGui(core) + {} + + EnteringPage *enteringPage() const { + return m_enteringPage; + } + + void init() { + m_enteringPage = new EnteringPage(packageManagerCore()); + setPage(0, m_enteringPage); + } +private: + EnteringPage *m_enteringPage; +}; + class EmitSignalObject : public QObject { Q_OBJECT @@ -183,6 +232,9 @@ private slots: void testBrokenJSMethodConnect() { +#if QT_VERSION <= 0x50400 + QSKIP("Behavior changed from 5.4.1 onwards"); +#endif EmitSignalObject emiter; m_scriptEngine->globalObject().setProperty(QLatin1String("emiter"), m_scriptEngine->newQObject(&emiter)); @@ -199,11 +251,11 @@ private slots: // ignore Output from script setExpectedScriptOutput("\"function receive()\""); + QTest::ignoreMessage(QtWarningMsg, ":10: ReferenceError: foo is not defined"); emiter.produceSignal(); const QJSValue value = m_scriptEngine->evaluate(""); - QCOMPARE(value.isError(), true); - QCOMPARE(value.toString(), QLatin1String("ReferenceError: foo is not defined")); + QCOMPARE(value.isError(), false); } void testScriptPrint() @@ -377,6 +429,21 @@ private slots: QCOMPARE(gui.widget()->property("complete").toString(), QString("true")); } + void checkEnteringCalledBeforePageCallback() + { + EnteringGui gui(&m_core); + gui.init(); + setExpectedScriptOutput("Loaded control script \":///data/enteringpage.qs\" "); + gui.loadControlScript(":///data/enteringpage.qs"); + gui.show(); + + EnteringPage *enteringPage = gui.enteringPage(); + + QStringList expectedOrder; + expectedOrder << QLatin1String("Entering") << QLatin1String("Callback"); + QCOMPARE(enteringPage->invocationOrder(), expectedOrder); + } + private: void setExpectedScriptOutput(const char *message) { diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 018650b1c..6deea6093 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -70,7 +70,7 @@ void tst_Settings::loadTutorialConfig() QCOMPARE(settings.configurationFileName(), QLatin1String("components.xml")); QCOMPARE(settings.dependsOnLocalInstallerBinary(), false); QCOMPARE(settings.repositorySettingsPageVisible(), true); - QCOMPARE(settings.allowSpaceInPath(), false); + QCOMPARE(settings.allowSpaceInPath(), true); QCOMPARE(settings.allowNonAsciiCharacters(), false); QCOMPARE(settings.createLocalRepository(), false); diff --git a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp index e12bb89c5..1b434ecb3 100644 --- a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp +++ b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/solver/tst_solver.cpp b/tests/auto/installer/solver/tst_solver.cpp index fb22e8077..b661d3158 100644 --- a/tests/auto/installer/solver/tst_solver.cpp +++ b/tests/auto/installer/solver/tst_solver.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/auto/installer/task/tst_task.cpp b/tests/auto/installer/task/tst_task.cpp index 327b077a1..d14f4d4d0 100644 --- a/tests/auto/installer/task/tst_task.cpp +++ b/tests/auto/installer/task/tst_task.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/downloadspeed/main.cpp b/tests/downloadspeed/main.cpp index d510eb0fa..5b66df051 100644 --- a/tests/downloadspeed/main.cpp +++ b/tests/downloadspeed/main.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/environmentvariable/environmentvariabletest.cpp b/tests/environmentvariable/environmentvariabletest.cpp index 395e436a7..806b8f736 100644 --- a/tests/environmentvariable/environmentvariabletest.cpp +++ b/tests/environmentvariable/environmentvariabletest.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/environmentvariable/environmentvariabletest.h b/tests/environmentvariable/environmentvariabletest.h index e032fac68..c3b3ee279 100644 --- a/tests/environmentvariable/environmentvariabletest.h +++ b/tests/environmentvariable/environmentvariabletest.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tests/test-framework/checker/run.py b/tests/test-framework/checker/run.py index 3f13548d9..8ae844cd8 100644 --- a/tests/test-framework/checker/run.py +++ b/tests/test-framework/checker/run.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/checker/scripts/generate-filelist.py b/tests/test-framework/checker/scripts/generate-filelist.py index 1cf685b0f..89be19474 100644 --- a/tests/test-framework/checker/scripts/generate-filelist.py +++ b/tests/test-framework/checker/scripts/generate-filelist.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/checker/testrunner/files.py b/tests/test-framework/checker/testrunner/files.py index 0af6a5456..20a39e597 100644 --- a/tests/test-framework/checker/testrunner/files.py +++ b/tests/test-framework/checker/testrunner/files.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/checker/testrunner/registry.py b/tests/test-framework/checker/testrunner/registry.py index f11c7ff14..efb2ea3d6 100644 --- a/tests/test-framework/checker/testrunner/registry.py +++ b/tests/test-framework/checker/testrunner/registry.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/checker/testrunner/testexception.py b/tests/test-framework/checker/testrunner/testexception.py index 001ebd5d2..72fd99cd7 100644 --- a/tests/test-framework/checker/testrunner/testexception.py +++ b/tests/test-framework/checker/testrunner/testexception.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/checker/testrunner/testrunner.py b/tests/test-framework/checker/testrunner/testrunner.py index d7608bd92..20974c720 100644 --- a/tests/test-framework/checker/testrunner/testrunner.py +++ b/tests/test-framework/checker/testrunner/testrunner.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/site/listVMs.sh b/tests/test-framework/site/listVMs.sh index c2fd1e2c3..d94ecf068 100644 --- a/tests/test-framework/site/listVMs.sh +++ b/tests/test-framework/site/listVMs.sh @@ -1,7 +1,7 @@ ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -10,9 +10,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/tests/simpletest.py b/tests/test-framework/tests/simpletest.py index 477585c89..99c042b1e 100644 --- a/tests/test-framework/tests/simpletest.py +++ b/tests/test-framework/tests/simpletest.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/cdashreporter.py b/tests/test-framework/vmware/cdashreporter.py index 895418b32..4d4381287 100644 --- a/tests/test-framework/vmware/cdashreporter.py +++ b/tests/test-framework/vmware/cdashreporter.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/control.py b/tests/test-framework/vmware/control.py index 575b949b6..097a2aceb 100644 --- a/tests/test-framework/vmware/control.py +++ b/tests/test-framework/vmware/control.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/ftpsource.py b/tests/test-framework/vmware/ftpsource.py index 6ec47c8ec..b310e4d26 100644 --- a/tests/test-framework/vmware/ftpsource.py +++ b/tests/test-framework/vmware/ftpsource.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/guest.py b/tests/test-framework/vmware/guest.py index 88913ccce..faded2fea 100644 --- a/tests/test-framework/vmware/guest.py +++ b/tests/test-framework/vmware/guest.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/guestconfig.py b/tests/test-framework/vmware/guestconfig.py index 92a900a21..49f6adafb 100644 --- a/tests/test-framework/vmware/guestconfig.py +++ b/tests/test-framework/vmware/guestconfig.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/reporter.py b/tests/test-framework/vmware/reporter.py index 6accd1e3f..fc8ba29b9 100644 --- a/tests/test-framework/vmware/reporter.py +++ b/tests/test-framework/vmware/reporter.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/result.py b/tests/test-framework/vmware/result.py index 4689014d4..b8e2decb1 100644 --- a/tests/test-framework/vmware/result.py +++ b/tests/test-framework/vmware/result.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/run-test.py b/tests/test-framework/vmware/run-test.py index 6b302f706..16325e97a 100644 --- a/tests/test-framework/vmware/run-test.py +++ b/tests/test-framework/vmware/run-test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/run.py b/tests/test-framework/vmware/run.py index 98cbddacb..c861c7a3d 100644 --- a/tests/test-framework/vmware/run.py +++ b/tests/test-framework/vmware/run.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/source.py b/tests/test-framework/vmware/source.py index bba836052..84f92b2dd 100644 --- a/tests/test-framework/vmware/source.py +++ b/tests/test-framework/vmware/source.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/testcase.py b/tests/test-framework/vmware/testcase.py index 6a0c0b462..539da7c8b 100644 --- a/tests/test-framework/vmware/testcase.py +++ b/tests/test-framework/vmware/testcase.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/utils.py b/tests/test-framework/vmware/utils.py index d7c6b75bc..d4dd5bd91 100644 --- a/tests/test-framework/vmware/utils.py +++ b/tests/test-framework/vmware/utils.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/virtualmachine.py b/tests/test-framework/vmware/virtualmachine.py index 77b32ceef..37dcf5342 100644 --- a/tests/test-framework/vmware/virtualmachine.py +++ b/tests/test-framework/vmware/virtualmachine.py @@ -2,8 +2,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -12,9 +12,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-framework/vmware/xmlutils.py b/tests/test-framework/vmware/xmlutils.py index 0ead434d8..fad011273 100644 --- a/tests/test-framework/vmware/xmlutils.py +++ b/tests/test-framework/vmware/xmlutils.py @@ -1,8 +1,8 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/test-installer/BatchSubstitute.bat b/tests/test-installer/BatchSubstitute.bat index 9b7dc1515..e0f24751e 100644 --- a/tests/test-installer/BatchSubstitute.bat +++ b/tests/test-installer/BatchSubstitute.bat @@ -1,7 +1,7 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -:: Contact: http://www.qt-project.org/legal +:: Copyright (C) 2015 The Qt Company Ltd. +:: Contact: http://www.qt.io/licensing/ :: :: This file is part of the Qt Installer Framework. :: @@ -10,9 +10,9 @@ :: Licensees holding valid commercial Qt licenses may use this file in :: accordance with the commercial license agreement provided with the :: Software or, alternatively, in accordance with the terms contained in -:: a written agreement between you and Digia. For licensing terms and -:: conditions see http://qt.digia.com/licensing. For further information -:: use the contact form at http://qt.digia.com/contact-us. +:: a written agreement between you and The Qt Company. For licensing terms +:: and conditions see http://qt.io/terms-conditions. For further +:: information use the contact form at http://www.qt.io/contact-us. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ :: requirements will be met: https://www.gnu.org/licenses/lgpl.html and :: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: -:: In addition, as a special exception, Digia gives you certain additional -:: rights. These rights are described in the Digia Qt LGPL Exception +:: As a special exception, The Qt Company gives you certain additional +:: rights. These rights are described in The Qt Company LGPL Exception :: version 1.1, included in the file LGPL_EXCEPTION.txt in this package. :: :: diff --git a/tests/test-installer/create-test-installer.bat b/tests/test-installer/create-test-installer.bat index 5aa1b0c1b..9bce051f0 100644 --- a/tests/test-installer/create-test-installer.bat +++ b/tests/test-installer/create-test-installer.bat @@ -1,7 +1,7 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -:: Contact: http://www.qt-project.org/legal +:: Copyright (C) 2015 The Qt Company Ltd. +:: Contact: http://www.qt.io/licensing/ :: :: This file is part of the Qt Installer Framework. :: @@ -10,9 +10,9 @@ :: Licensees holding valid commercial Qt licenses may use this file in :: accordance with the commercial license agreement provided with the :: Software or, alternatively, in accordance with the terms contained in -:: a written agreement between you and Digia. For licensing terms and -:: conditions see http://qt.digia.com/licensing. For further information -:: use the contact form at http://qt.digia.com/contact-us. +:: a written agreement between you and The Qt Company. For licensing terms +:: and conditions see http://qt.io/terms-conditions. For further +:: information use the contact form at http://www.qt.io/contact-us. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ :: requirements will be met: https://www.gnu.org/licenses/lgpl.html and :: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: -:: In addition, as a special exception, Digia gives you certain additional -:: rights. These rights are described in the Digia Qt LGPL Exception +:: As a special exception, The Qt Company gives you certain additional +:: rights. These rights are described in The Qt Company LGPL Exception :: version 1.1, included in the file LGPL_EXCEPTION.txt in this package. :: :: diff --git a/tests/test-installer/create-test-installer.sh b/tests/test-installer/create-test-installer.sh index e8b93d19a..afb1714cf 100755 --- a/tests/test-installer/create-test-installer.sh +++ b/tests/test-installer/create-test-installer.sh @@ -1,7 +1,7 @@ ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -10,9 +10,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tests/testreturn/main.cpp b/tests/testreturn/main.cpp index e5aee9518..dc2c450be 100644 --- a/tests/testreturn/main.cpp +++ b/tests/testreturn/main.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/archivegen/archive.cpp b/tools/archivegen/archive.cpp index e03848a5b..43a267e1b 100644 --- a/tools/archivegen/archive.cpp +++ b/tools/archivegen/archive.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 749edbbef..b5df76601 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/binarycreator/rcc/qcorecmdlineargs_p.h b/tools/binarycreator/rcc/qcorecmdlineargs_p.h index 9bf1a6bbc..d9dc80291 100644 --- a/tools/binarycreator/rcc/qcorecmdlineargs_p.h +++ b/tools/binarycreator/rcc/qcorecmdlineargs_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/binarycreator/rcc/rcc.cpp b/tools/binarycreator/rcc/rcc.cpp index 526f6a746..965c48f2e 100644 --- a/tools/binarycreator/rcc/rcc.cpp +++ b/tools/binarycreator/rcc/rcc.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/binarycreator/rcc/rcc.h b/tools/binarycreator/rcc/rcc.h index ee15ca139..576d8a81d 100644 --- a/tools/binarycreator/rcc/rcc.h +++ b/tools/binarycreator/rcc/rcc.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/binarycreator/rcc/rccmain.cpp b/tools/binarycreator/rcc/rccmain.cpp index 9f24703b9..6d8a3bbd0 100644 --- a/tools/binarycreator/rcc/rccmain.cpp +++ b/tools/binarycreator/rcc/rccmain.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/binarycreator/resources/copylibsintobundle.sh b/tools/binarycreator/resources/copylibsintobundle.sh index 041c373b9..d7e7a5b62 100644 --- a/tools/binarycreator/resources/copylibsintobundle.sh +++ b/tools/binarycreator/resources/copylibsintobundle.sh @@ -1,8 +1,8 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tools/binarycreator/resources/mkdmg.sh b/tools/binarycreator/resources/mkdmg.sh index 103eb877d..c651ec618 100644 --- a/tools/binarycreator/resources/mkdmg.sh +++ b/tools/binarycreator/resources/mkdmg.sh @@ -1,8 +1,8 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## @@ -11,9 +11,9 @@ ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index 7f4be26ec..1863286cf 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/common/repositorygen.h b/tools/common/repositorygen.h index 2e6886453..ac53b6329 100644 --- a/tools/common/repositorygen.h +++ b/tools/common/repositorygen.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/devtool/binarydump.cpp b/tools/devtool/binarydump.cpp index 046d41d25..a0ff4f74e 100644 --- a/tools/devtool/binarydump.cpp +++ b/tools/devtool/binarydump.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/devtool/binarydump.h b/tools/devtool/binarydump.h index 16f95505f..c596d3646 100644 --- a/tools/devtool/binarydump.h +++ b/tools/devtool/binarydump.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/devtool/binaryreplace.cpp b/tools/devtool/binaryreplace.cpp index 3333ed957..8d246dc84 100644 --- a/tools/devtool/binaryreplace.cpp +++ b/tools/devtool/binaryreplace.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/devtool/binaryreplace.h b/tools/devtool/binaryreplace.h index 1c5a305a6..7fa7086e1 100644 --- a/tools/devtool/binaryreplace.h +++ b/tools/devtool/binaryreplace.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/devtool/main.cpp b/tools/devtool/main.cpp index aa057c3e4..47acc9e0e 100644 --- a/tools/devtool/main.cpp +++ b/tools/devtool/main.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -60,8 +60,8 @@ int main(int argc, char *argv[]) QCommandLineOption verbose(QLatin1String("verbose"), QLatin1String("Verbose mode. Prints out more information.")); QCommandLineOption dump(QLatin1String("dump"), - QLatin1String("Dumps the binary content attached to an installer into target."), - QLatin1String("folder")); + QLatin1String("Dumps the binary content that belongs to an installer or maintenance tool " + "into target."), QLatin1String("folder")); QCommandLineOption run(QLatin1String("operation"), QLatin1String("Executes an operation with a list of arguments. Mode can be DO or UNDO."), QLatin1String("mode,name,args,...")); @@ -154,8 +154,6 @@ int main(int argc, char *argv[]) if (parser.isSet(dump)) { // To dump the content we do not need the binary format engine. - if (magicMarker != QInstaller::BinaryContent::MagicInstallerMarker) - throw QInstaller::Error(QLatin1String("Source file is not an installer.")); BinaryDump bd; result = bd.dump(manager, parser.value(dump)); } else if (parser.isSet(run)) { diff --git a/tools/devtool/operationrunner.cpp b/tools/devtool/operationrunner.cpp index e28ce6d2f..723d65cdf 100644 --- a/tools/devtool/operationrunner.cpp +++ b/tools/devtool/operationrunner.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/devtool/operationrunner.h b/tools/devtool/operationrunner.h index 33f0f5a04..bd8670cd2 100644 --- a/tools/devtool/operationrunner.h +++ b/tools/devtool/operationrunner.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/repocompare/main.cpp b/tools/repocompare/main.cpp index fab79757f..8ebb49146 100644 --- a/tools/repocompare/main.cpp +++ b/tools/repocompare/main.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/repocompare/mainwindow.cpp b/tools/repocompare/mainwindow.cpp index e32286d6a..0c9a2ccb1 100644 --- a/tools/repocompare/mainwindow.cpp +++ b/tools/repocompare/mainwindow.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/repocompare/mainwindow.h b/tools/repocompare/mainwindow.h index 282701b7b..827c02298 100644 --- a/tools/repocompare/mainwindow.h +++ b/tools/repocompare/mainwindow.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/repocompare/repositorymanager.cpp b/tools/repocompare/repositorymanager.cpp index 0feec88ce..24a41a63c 100644 --- a/tools/repocompare/repositorymanager.cpp +++ b/tools/repocompare/repositorymanager.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/repocompare/repositorymanager.h b/tools/repocompare/repositorymanager.h index 85b4e1dac..c30088de6 100644 --- a/tools/repocompare/repositorymanager.h +++ b/tools/repocompare/repositorymanager.h @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp index 77a981561..cdd3f779a 100644 --- a/tools/repogen/repogen.cpp +++ b/tools/repogen/repogen.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** |
