diff -Nru artikulate-20.12.3/autotests/integrationtests/iresourcerepository_integration/test_iresourcerepository.cpp artikulate-21.04.0/autotests/integrationtests/iresourcerepository_integration/test_iresourcerepository.cpp --- artikulate-20.12.3/autotests/integrationtests/iresourcerepository_integration/test_iresourcerepository.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/integrationtests/iresourcerepository_integration/test_iresourcerepository.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_iresourcerepository.h" #include diff -Nru artikulate-20.12.3/autotests/integrationtests/iresourcerepository_integration/test_iresourcerepository.h artikulate-21.04.0/autotests/integrationtests/iresourcerepository_integration/test_iresourcerepository.h --- artikulate-20.12.3/autotests/integrationtests/iresourcerepository_integration/test_iresourcerepository.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/integrationtests/iresourcerepository_integration/test_iresourcerepository.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TEST_IRESOURCEREPOSITORY_H #define TEST_IRESOURCEREPOSITORY_H diff -Nru artikulate-20.12.3/autotests/mocks/coursestub.cpp artikulate-21.04.0/autotests/mocks/coursestub.cpp --- artikulate-20.12.3/autotests/mocks/coursestub.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/coursestub.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "coursestub.h" diff -Nru artikulate-20.12.3/autotests/mocks/coursestub.h artikulate-21.04.0/autotests/mocks/coursestub.h --- artikulate-20.12.3/autotests/mocks/coursestub.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/coursestub.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef COURSESTUB_H #define COURSESTUB_H diff -Nru artikulate-20.12.3/autotests/mocks/editablecoursestub.cpp artikulate-21.04.0/autotests/mocks/editablecoursestub.cpp --- artikulate-20.12.3/autotests/mocks/editablecoursestub.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/editablecoursestub.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "editablecoursestub.h" diff -Nru artikulate-20.12.3/autotests/mocks/editablecoursestub.h artikulate-21.04.0/autotests/mocks/editablecoursestub.h --- artikulate-20.12.3/autotests/mocks/editablecoursestub.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/editablecoursestub.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef EDITABLECOURSESTUB_H #define EDITABLECOURSESTUB_H diff -Nru artikulate-20.12.3/autotests/mocks/editablerepositorystub.cpp artikulate-21.04.0/autotests/mocks/editablerepositorystub.cpp --- artikulate-20.12.3/autotests/mocks/editablerepositorystub.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/editablerepositorystub.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "editablerepositorystub.h" diff -Nru artikulate-20.12.3/autotests/mocks/editablerepositorystub.h artikulate-21.04.0/autotests/mocks/editablerepositorystub.h --- artikulate-20.12.3/autotests/mocks/editablerepositorystub.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/editablerepositorystub.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef EDITABLEREPOSITORYSTUB_H #define EDITABLEREPOSITORYSTUB_H diff -Nru artikulate-20.12.3/autotests/mocks/languagestub.cpp artikulate-21.04.0/autotests/mocks/languagestub.cpp --- artikulate-20.12.3/autotests/mocks/languagestub.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/languagestub.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "languagestub.h" diff -Nru artikulate-20.12.3/autotests/mocks/languagestub.h artikulate-21.04.0/autotests/mocks/languagestub.h --- artikulate-20.12.3/autotests/mocks/languagestub.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/languagestub.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef LANGUAGESTUB_H #define LANGUAGESTUB_H diff -Nru artikulate-20.12.3/autotests/mocks/resourcerepositorystub.cpp artikulate-21.04.0/autotests/mocks/resourcerepositorystub.cpp --- artikulate-20.12.3/autotests/mocks/resourcerepositorystub.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/resourcerepositorystub.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "resourcerepositorystub.h" diff -Nru artikulate-20.12.3/autotests/mocks/resourcerepositorystub.h artikulate-21.04.0/autotests/mocks/resourcerepositorystub.h --- artikulate-20.12.3/autotests/mocks/resourcerepositorystub.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/mocks/resourcerepositorystub.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef RESOURCEREPOSITORYSTUB_H #define RESOURCEREPOSITORYSTUB_H diff -Nru artikulate-20.12.3/autotests/resourcetests/languageresources/testlanguagefiles.cpp artikulate-21.04.0/autotests/resourcetests/languageresources/testlanguagefiles.cpp --- artikulate-20.12.3/autotests/resourcetests/languageresources/testlanguagefiles.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/resourcetests/languageresources/testlanguagefiles.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Oindrila Gupta - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013 Oindrila Gupta + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "testlanguagefiles.h" #include "core/language.h" diff -Nru artikulate-20.12.3/autotests/resourcetests/languageresources/testlanguagefiles.h artikulate-21.04.0/autotests/resourcetests/languageresources/testlanguagefiles.h --- artikulate-20.12.3/autotests/resourcetests/languageresources/testlanguagefiles.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/resourcetests/languageresources/testlanguagefiles.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,9 +1,9 @@ /* - * SPDX-FileCopyrightText: 2013 Oindrila Gupta - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013 Oindrila Gupta + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TESTLANGUAGEFILES_H #define TESTLANGUAGEFILES_H diff -Nru artikulate-20.12.3/autotests/resourcetests/xsdschemes/testxsdschemes.cpp artikulate-21.04.0/autotests/resourcetests/xsdschemes/testxsdschemes.cpp --- artikulate-20.12.3/autotests/resourcetests/xsdschemes/testxsdschemes.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/resourcetests/xsdschemes/testxsdschemes.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Oindrila Gupta - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013 Oindrila Gupta + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "testxsdschemes.h" diff -Nru artikulate-20.12.3/autotests/resourcetests/xsdschemes/testxsdschemes.h artikulate-21.04.0/autotests/resourcetests/xsdschemes/testxsdschemes.h --- artikulate-20.12.3/autotests/resourcetests/xsdschemes/testxsdschemes.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/resourcetests/xsdschemes/testxsdschemes.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TESTXSDSCHEMES_H #define TESTXSDSCHEMES_H diff -Nru artikulate-20.12.3/autotests/unittests/coursemodel/test_coursemodel.cpp artikulate-21.04.0/autotests/unittests/coursemodel/test_coursemodel.cpp --- artikulate-20.12.3/autotests/unittests/coursemodel/test_coursemodel.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/coursemodel/test_coursemodel.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_coursemodel.h" #include "../mocks/coursestub.h" diff -Nru artikulate-20.12.3/autotests/unittests/coursemodel/test_coursemodel.h artikulate-21.04.0/autotests/unittests/coursemodel/test_coursemodel.h --- artikulate-20.12.3/autotests/unittests/coursemodel/test_coursemodel.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/coursemodel/test_coursemodel.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TEST_COURSEMODEL_H #define TEST_COURSEMODEL_H diff -Nru artikulate-20.12.3/autotests/unittests/courseresource/test_courseresource.cpp artikulate-21.04.0/autotests/unittests/courseresource/test_courseresource.cpp --- artikulate-20.12.3/autotests/unittests/courseresource/test_courseresource.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/courseresource/test_courseresource.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_courseresource.h" #include "../mocks/languagestub.h" diff -Nru artikulate-20.12.3/autotests/unittests/courseresource/test_courseresource.h artikulate-21.04.0/autotests/unittests/courseresource/test_courseresource.h --- artikulate-20.12.3/autotests/unittests/courseresource/test_courseresource.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/courseresource/test_courseresource.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013-2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TESTCOURSERESOURCE_H #define TESTCOURSERESOURCE_H diff -Nru artikulate-20.12.3/autotests/unittests/editablecourseresource/test_editablecourseresource.cpp artikulate-21.04.0/autotests/unittests/editablecourseresource/test_editablecourseresource.cpp --- artikulate-20.12.3/autotests/unittests/editablecourseresource/test_editablecourseresource.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/editablecourseresource/test_editablecourseresource.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013-2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_editablecourseresource.h" #include "../mocks/coursestub.h" diff -Nru artikulate-20.12.3/autotests/unittests/editablecourseresource/test_editablecourseresource.h artikulate-21.04.0/autotests/unittests/editablecourseresource/test_editablecourseresource.h --- artikulate-20.12.3/autotests/unittests/editablecourseresource/test_editablecourseresource.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/editablecourseresource/test_editablecourseresource.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013-2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TESTEDITABLECOURSERESOURCE_H #define TESTEDITABLECOURSERESOURCE_H diff -Nru artikulate-20.12.3/autotests/unittests/editorsession/test_editorsession.cpp artikulate-21.04.0/autotests/unittests/editorsession/test_editorsession.cpp --- artikulate-20.12.3/autotests/unittests/editorsession/test_editorsession.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/editorsession/test_editorsession.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_editorsession.h" #include "../mocks/editablecoursestub.h" diff -Nru artikulate-20.12.3/autotests/unittests/editorsession/test_editorsession.h artikulate-21.04.0/autotests/unittests/editorsession/test_editorsession.h --- artikulate-20.12.3/autotests/unittests/editorsession/test_editorsession.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/editorsession/test_editorsession.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TEST_EDITORSESSION_H #define TEST_EDITORSESSION_H diff -Nru artikulate-20.12.3/autotests/unittests/resourcerepository/test_resourcerepository.cpp artikulate-21.04.0/autotests/unittests/resourcerepository/test_resourcerepository.cpp --- artikulate-20.12.3/autotests/unittests/resourcerepository/test_resourcerepository.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/resourcerepository/test_resourcerepository.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_resourcerepository.h" #include "src/core/language.h" diff -Nru artikulate-20.12.3/autotests/unittests/resourcerepository/test_resourcerepository.h artikulate-21.04.0/autotests/unittests/resourcerepository/test_resourcerepository.h --- artikulate-20.12.3/autotests/unittests/resourcerepository/test_resourcerepository.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/resourcerepository/test_resourcerepository.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TEST_RESOURCEREPOSITORY_H #define TEST_RESOURCEREPOSITORY_H diff -Nru artikulate-20.12.3/autotests/unittests/skeletonmodel/test_skeletonmodel.cpp artikulate-21.04.0/autotests/unittests/skeletonmodel/test_skeletonmodel.cpp --- artikulate-20.12.3/autotests/unittests/skeletonmodel/test_skeletonmodel.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/skeletonmodel/test_skeletonmodel.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_skeletonmodel.h" #include "../mocks/editablecoursestub.h" diff -Nru artikulate-20.12.3/autotests/unittests/skeletonmodel/test_skeletonmodel.h artikulate-21.04.0/autotests/unittests/skeletonmodel/test_skeletonmodel.h --- artikulate-20.12.3/autotests/unittests/skeletonmodel/test_skeletonmodel.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/skeletonmodel/test_skeletonmodel.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TEST_SKELETONMODEL_H #define TEST_SKELETONMODEL_H diff -Nru artikulate-20.12.3/autotests/unittests/skeletonresource/test_skeletonresource.cpp artikulate-21.04.0/autotests/unittests/skeletonresource/test_skeletonresource.cpp --- artikulate-20.12.3/autotests/unittests/skeletonresource/test_skeletonresource.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/skeletonresource/test_skeletonresource.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_skeletonresource.h" #include "../mocks/languagestub.h" diff -Nru artikulate-20.12.3/autotests/unittests/skeletonresource/test_skeletonresource.h artikulate-21.04.0/autotests/unittests/skeletonresource/test_skeletonresource.h --- artikulate-20.12.3/autotests/unittests/skeletonresource/test_skeletonresource.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/skeletonresource/test_skeletonresource.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013-2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TESTSKELETONRESOURCE_H #define TESTSKELETONRESOURCE_H diff -Nru artikulate-20.12.3/autotests/unittests/trainingsession/test_trainingsession.cpp artikulate-21.04.0/autotests/unittests/trainingsession/test_trainingsession.cpp --- artikulate-20.12.3/autotests/unittests/trainingsession/test_trainingsession.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/trainingsession/test_trainingsession.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_trainingsession.h" #include "../mocks/coursestub.h" diff -Nru artikulate-20.12.3/autotests/unittests/trainingsession/test_trainingsession.h artikulate-21.04.0/autotests/unittests/trainingsession/test_trainingsession.h --- artikulate-20.12.3/autotests/unittests/trainingsession/test_trainingsession.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/trainingsession/test_trainingsession.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TEST_TRAININGSESSION_H #define TEST_TRAININGSESSION_H diff -Nru artikulate-20.12.3/autotests/unittests/unit/test_unit.cpp artikulate-21.04.0/autotests/unittests/unit/test_unit.cpp --- artikulate-20.12.3/autotests/unittests/unit/test_unit.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/unit/test_unit.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "test_unit.h" #include "../mocks/languagestub.h" diff -Nru artikulate-20.12.3/autotests/unittests/unit/test_unit.h artikulate-21.04.0/autotests/unittests/unit/test_unit.h --- artikulate-20.12.3/autotests/unittests/unit/test_unit.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/autotests/unittests/unit/test_unit.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2019 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TESTUNIT_H #define TESTUNIT_H diff -Nru artikulate-20.12.3/CMakeLists.txt artikulate-21.04.0/CMakeLists.txt --- artikulate-20.12.3/CMakeLists.txt 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/CMakeLists.txt 2021-02-07 18:47:15.000000000 +0000 @@ -62,7 +62,7 @@ if (KF5DocTools_FOUND) kdoctools_install(po) endif() -install(PROGRAMS org.kde.artikulate.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(PROGRAMS org.kde.artikulate.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.artikulate.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru artikulate-20.12.3/data/schemes/course.xsd artikulate-21.04.0/data/schemes/course.xsd --- artikulate-20.12.3/data/schemes/course.xsd 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/data/schemes/course.xsd 2021-02-07 18:47:15.000000000 +0000 @@ -1,6 +1,6 @@ diff -Nru artikulate-20.12.3/data/schemes/language.xsd artikulate-21.04.0/data/schemes/language.xsd --- artikulate-20.12.3/data/schemes/language.xsd 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/data/schemes/language.xsd 2021-02-07 18:47:15.000000000 +0000 @@ -1,6 +1,6 @@ diff -Nru artikulate-20.12.3/data/schemes/skeleton.xsd artikulate-21.04.0/data/schemes/skeleton.xsd --- artikulate-20.12.3/data/schemes/skeleton.xsd 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/data/schemes/skeleton.xsd 2021-02-07 18:47:15.000000000 +0000 @@ -1,6 +1,6 @@ diff -Nru artikulate-20.12.3/debian/changelog artikulate-21.04.0/debian/changelog --- artikulate-20.12.3/debian/changelog 2021-03-04 15:14:18.000000000 +0000 +++ artikulate-21.04.0/debian/changelog 2021-04-29 00:28:34.000000000 +0000 @@ -1,3 +1,9 @@ +artikulate (4:21.04.0-0ubuntu1) impish; urgency=medium + + * New upstream release (21.04.0) + + -- Rik Mills Thu, 29 Apr 2021 01:28:34 +0100 + artikulate (4:20.12.3-0ubuntu1) hirsute; urgency=medium * New upstream release (20.12.3) diff -Nru artikulate-20.12.3/doc/CMakeLists.txt artikulate-21.04.0/doc/CMakeLists.txt --- artikulate-20.12.3/doc/CMakeLists.txt 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/doc/CMakeLists.txt 2021-02-07 18:47:15.000000000 +0000 @@ -1,4 +1,4 @@ # SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr # SPDX-License-Identifier: BSD-2-Clause -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR artikulate) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR artikulate) diff -Nru artikulate-20.12.3/icons/CMakeLists.txt artikulate-21.04.0/icons/CMakeLists.txt --- artikulate-20.12.3/icons/CMakeLists.txt 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/icons/CMakeLists.txt 2021-02-07 18:47:15.000000000 +0000 @@ -9,7 +9,7 @@ 64-apps-artikulate.png sc-apps-artikulate.svg - DESTINATION ${ICON_INSTALL_DIR} + DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor ) diff -Nru artikulate-20.12.3/liblearnerprofile/autotests/testlearnerstorage.cpp artikulate-21.04.0/liblearnerprofile/autotests/testlearnerstorage.cpp --- artikulate-20.12.3/liblearnerprofile/autotests/testlearnerstorage.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/autotests/testlearnerstorage.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #include "testlearnerstorage.h" #include "learner.h" diff -Nru artikulate-20.12.3/liblearnerprofile/autotests/testlearnerstorage.h artikulate-21.04.0/liblearnerprofile/autotests/testlearnerstorage.h --- artikulate-20.12.3/liblearnerprofile/autotests/testlearnerstorage.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/autotests/testlearnerstorage.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ #ifndef TESTLEARNERSTORAGE_H #define TESTLEARNERSTORAGE_H diff -Nru artikulate-20.12.3/liblearnerprofile/src/CMakeLists.txt artikulate-21.04.0/liblearnerprofile/src/CMakeLists.txt --- artikulate-20.12.3/liblearnerprofile/src/CMakeLists.txt 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/CMakeLists.txt 2021-02-07 18:47:15.000000000 +0000 @@ -36,5 +36,5 @@ install( TARGETS artikulatelearnerprofile LIBRARY NAMELINK_SKIP - ${INSTALL_TARGETS_DEFAULT_ARGS} + ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) diff -Nru artikulate-20.12.3/liblearnerprofile/src/learner.cpp artikulate-21.04.0/liblearnerprofile/src/learner.cpp --- artikulate-20.12.3/liblearnerprofile/src/learner.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/learner.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #include "learner.h" #include "learner_p.h" diff -Nru artikulate-20.12.3/liblearnerprofile/src/learner.h artikulate-21.04.0/liblearnerprofile/src/learner.h --- artikulate-20.12.3/liblearnerprofile/src/learner.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/learner.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #ifndef LEARNER_H #define LEARNER_H diff -Nru artikulate-20.12.3/liblearnerprofile/src/learner_p.h artikulate-21.04.0/liblearnerprofile/src/learner_p.h --- artikulate-20.12.3/liblearnerprofile/src/learner_p.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/learner_p.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #ifndef LEARNER_P_H #define LEARNER_P_H diff -Nru artikulate-20.12.3/liblearnerprofile/src/learninggoal.cpp artikulate-21.04.0/liblearnerprofile/src/learninggoal.cpp --- artikulate-20.12.3/liblearnerprofile/src/learninggoal.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/learninggoal.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #include "learninggoal.h" diff -Nru artikulate-20.12.3/liblearnerprofile/src/learninggoal.h artikulate-21.04.0/liblearnerprofile/src/learninggoal.h --- artikulate-20.12.3/liblearnerprofile/src/learninggoal.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/learninggoal.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #ifndef LEARNINGGOAL_H #define LEARNINGGOAL_H diff -Nru artikulate-20.12.3/liblearnerprofile/src/liblearner_debug.cpp artikulate-21.04.0/liblearnerprofile/src/liblearner_debug.cpp --- artikulate-20.12.3/liblearnerprofile/src/liblearner_debug.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/liblearner_debug.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2015 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2015 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #include "liblearner_debug.h" Q_LOGGING_CATEGORY(LIBLEARNER_LOG, "log_liblearner") diff -Nru artikulate-20.12.3/liblearnerprofile/src/liblearner_debug.h artikulate-21.04.0/liblearnerprofile/src/liblearner_debug.h --- artikulate-20.12.3/liblearnerprofile/src/liblearner_debug.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/liblearner_debug.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2015 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2015 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #ifndef LIBLEARNER_DEBUG_H #define LIBLEARNER_DEBUG_H diff -Nru artikulate-20.12.3/liblearnerprofile/src/models/learninggoalmodel.cpp artikulate-21.04.0/liblearnerprofile/src/models/learninggoalmodel.cpp --- artikulate-20.12.3/liblearnerprofile/src/models/learninggoalmodel.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/models/learninggoalmodel.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #include "learninggoalmodel.h" #include "learner.h" diff -Nru artikulate-20.12.3/liblearnerprofile/src/models/learninggoalmodel.h artikulate-21.04.0/liblearnerprofile/src/models/learninggoalmodel.h --- artikulate-20.12.3/liblearnerprofile/src/models/learninggoalmodel.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/models/learninggoalmodel.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #ifndef LEARNINGGOALMODEL_H #define LEARNINGGOALMODEL_H diff -Nru artikulate-20.12.3/liblearnerprofile/src/profilemanager.cpp artikulate-21.04.0/liblearnerprofile/src/profilemanager.cpp --- artikulate-20.12.3/liblearnerprofile/src/profilemanager.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/profilemanager.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #include "profilemanager.h" #include "learner.h" diff -Nru artikulate-20.12.3/liblearnerprofile/src/profilemanager.h artikulate-21.04.0/liblearnerprofile/src/profilemanager.h --- artikulate-20.12.3/liblearnerprofile/src/profilemanager.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/profilemanager.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #ifndef PROFILEMANAGER_H #define PROFILEMANAGER_H diff -Nru artikulate-20.12.3/liblearnerprofile/src/storage.cpp artikulate-21.04.0/liblearnerprofile/src/storage.cpp --- artikulate-20.12.3/liblearnerprofile/src/storage.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/storage.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #include "storage.h" #include "learner.h" diff -Nru artikulate-20.12.3/liblearnerprofile/src/storage.h artikulate-21.04.0/liblearnerprofile/src/storage.h --- artikulate-20.12.3/liblearnerprofile/src/storage.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/liblearnerprofile/src/storage.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - */ + SPDX-FileCopyrightText: 2013-2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #ifndef STORAGE_H #define STORAGE_H diff -Nru artikulate-20.12.3/libsound/src/backendinterface.cpp artikulate-21.04.0/libsound/src/backendinterface.cpp --- artikulate-20.12.3/libsound/src/backendinterface.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/backendinterface.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "backendinterface.h" diff -Nru artikulate-20.12.3/libsound/src/backendinterface.h artikulate-21.04.0/libsound/src/backendinterface.h --- artikulate-20.12.3/libsound/src/backendinterface.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/backendinterface.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef BACKENDINTERFACE_H #define BACKENDINTERFACE_H diff -Nru artikulate-20.12.3/libsound/src/capturebackendinterface.cpp artikulate-21.04.0/libsound/src/capturebackendinterface.cpp --- artikulate-20.12.3/libsound/src/capturebackendinterface.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/capturebackendinterface.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "capturebackendinterface.h" diff -Nru artikulate-20.12.3/libsound/src/capturebackendinterface.h artikulate-21.04.0/libsound/src/capturebackendinterface.h --- artikulate-20.12.3/libsound/src/capturebackendinterface.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/capturebackendinterface.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef CAPTUREBACKENDINTERFACE_H #define CAPTUREBACKENDINTERFACE_H diff -Nru artikulate-20.12.3/libsound/src/capturedevicecontroller.cpp artikulate-21.04.0/libsound/src/capturedevicecontroller.cpp --- artikulate-20.12.3/libsound/src/capturedevicecontroller.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/capturedevicecontroller.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "capturedevicecontroller.h" #include "backendinterface.h" diff -Nru artikulate-20.12.3/libsound/src/capturedevicecontroller.h artikulate-21.04.0/libsound/src/capturedevicecontroller.h --- artikulate-20.12.3/libsound/src/capturedevicecontroller.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/capturedevicecontroller.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef CAPTUREDEVICECONTROLLER_H #define CAPTUREDEVICECONTROLLER_H diff -Nru artikulate-20.12.3/libsound/src/CMakeLists.txt artikulate-21.04.0/libsound/src/CMakeLists.txt --- artikulate-20.12.3/libsound/src/CMakeLists.txt 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/CMakeLists.txt 2021-02-07 18:47:15.000000000 +0000 @@ -34,7 +34,7 @@ install( TARGETS artikulatesound LIBRARY NAMELINK_SKIP - ${INSTALL_TARGETS_DEFAULT_ARGS} + ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) if (BUILD_GSTREAMER_PLUGIN) diff -Nru artikulate-20.12.3/libsound/src/libsound_debug.cpp artikulate-21.04.0/libsound/src/libsound_debug.cpp --- artikulate-20.12.3/libsound/src/libsound_debug.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/libsound_debug.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2015 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2015 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "libsound_debug.h" Q_LOGGING_CATEGORY(LIBSOUND_LOG, "log_libsound") diff -Nru artikulate-20.12.3/libsound/src/libsound_debug.h artikulate-21.04.0/libsound/src/libsound_debug.h --- artikulate-20.12.3/libsound/src/libsound_debug.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/libsound_debug.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2015 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2015 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef LIBSOUND_DEBUG_H #define LIBSOUND_DEBUG_H diff -Nru artikulate-20.12.3/libsound/src/outputbackendinterface.cpp artikulate-21.04.0/libsound/src/outputbackendinterface.cpp --- artikulate-20.12.3/libsound/src/outputbackendinterface.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/outputbackendinterface.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "outputbackendinterface.h" diff -Nru artikulate-20.12.3/libsound/src/outputbackendinterface.h artikulate-21.04.0/libsound/src/outputbackendinterface.h --- artikulate-20.12.3/libsound/src/outputbackendinterface.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/outputbackendinterface.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef OUTPUTBACKENDINTERFACE_H #define OUTPUTBACKENDINTERFACE_H diff -Nru artikulate-20.12.3/libsound/src/outputdevicecontroller.cpp artikulate-21.04.0/libsound/src/outputdevicecontroller.cpp --- artikulate-20.12.3/libsound/src/outputdevicecontroller.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/outputdevicecontroller.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "outputdevicecontroller.h" #include "backendinterface.h" diff -Nru artikulate-20.12.3/libsound/src/outputdevicecontroller.h artikulate-21.04.0/libsound/src/outputdevicecontroller.h --- artikulate-20.12.3/libsound/src/outputdevicecontroller.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/outputdevicecontroller.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef OUTPUTDEVICECONTROLLER_H #define OUTPUTDEVICECONTROLLER_H @@ -37,7 +37,6 @@ void play(const QUrl &filePath); OutputDeviceController::State state() const; void stop(); - QString currentSource() const; void setVolume(int volume); int volume() const; diff -Nru artikulate-20.12.3/libsound/src/qtgstreamerbackend/CMakeLists.txt artikulate-21.04.0/libsound/src/qtgstreamerbackend/CMakeLists.txt --- artikulate-20.12.3/libsound/src/qtgstreamerbackend/CMakeLists.txt 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtgstreamerbackend/CMakeLists.txt 2021-02-07 18:47:15.000000000 +0000 @@ -25,4 +25,4 @@ ${QTGSTREAMER_LIBRARIES} ) -install(TARGETS qtgstreamerbackend DESTINATION ${PLUGIN_INSTALL_DIR}/artikulate/libsound) +install(TARGETS qtgstreamerbackend DESTINATION ${KDE_INSTALL_PLUGINDIR}/artikulate/libsound) diff -Nru artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamerbackend.cpp artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamerbackend.cpp --- artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamerbackend.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamerbackend.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "qtgstreamerbackend.h" #include "qtgstreamercapturebackend.h" diff -Nru artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamerbackend.h artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamerbackend.h --- artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamerbackend.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamerbackend.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef GSTREAMERBACKEND_H #define GSTREAMERBACKEND_H diff -Nru artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamerbackend.json artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamerbackend.json --- artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamerbackend.json 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamerbackend.json 2021-02-07 18:47:15.000000000 +0000 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Sound backend for GStreamer.", + "Description[az]": "GStreamer üçün Səs modulu.", "Description[ca@valencia]": "Dorsal de so pel GStreamer.", "Description[ca]": "Dorsal de so pel GStreamer.", "Description[cs]": "Podpůrná vrstva zvuku pro GStreamer.", @@ -36,6 +37,7 @@ "Id": "artikulate_gstreamer_backend", "License": "GPL", "Name": "GStreamer Backend", + "Name[az]": "GStreamer Modulu", "Name[ca@valencia]": "Dorsal GStreamer", "Name[ca]": "Dorsal GStreamer", "Name[cs]": "Podpůrná vrstva GStreamer", diff -Nru artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.cpp artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.cpp --- artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2013-2014 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "qtgstreamercapturebackend.h" diff -Nru artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.h artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.h --- artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2013 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef QTGSTREAMERCAPTUREBACKEND_H #define QTGSTREAMERCAPTUREBACKEND_H diff -Nru artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp --- artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,11 +1,11 @@ /* - * SPDX-FileCopyrightText: 2010 Marco Ballesio - * SPDX-FileCopyrightText: 2011 Collabora Ltd. - * @author George Kiagiadakis - * SPDX-FileCopyrightText: 2014 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2010 Marco Ballesio + SPDX-FileCopyrightText: 2011 Collabora Ltd. + SPDX-FileContributor: George Kiagiadakis + SPDX-FileCopyrightText: 2014 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "qtgstreameroutputbackend.h" #include diff -Nru artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.h artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.h --- artikulate-20.12.3/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,11 +1,11 @@ /* - * SPDX-FileCopyrightText: 2010 Marco Ballesio - * SPDX-FileCopyrightText: 2011 Collabora Ltd. - * SPDX-FileContributor: George Kiagiadakis - * SPDX-FileCopyrightText: 2014 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2010 Marco Ballesio + SPDX-FileCopyrightText: 2011 Collabora Ltd. + SPDX-FileContributor: George Kiagiadakis + SPDX-FileCopyrightText: 2014 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef QTGSTREAMEROUTPUTBACKEND_H #define QTGSTREAMEROUTPUTBACKEND_H diff -Nru artikulate-20.12.3/libsound/src/qtmultimediabackend/CMakeLists.txt artikulate-21.04.0/libsound/src/qtmultimediabackend/CMakeLists.txt --- artikulate-20.12.3/libsound/src/qtmultimediabackend/CMakeLists.txt 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtmultimediabackend/CMakeLists.txt 2021-02-07 18:47:15.000000000 +0000 @@ -20,4 +20,4 @@ KF5::CoreAddons ) -install(TARGETS qtmultimediabackend DESTINATION ${PLUGIN_INSTALL_DIR}/artikulate/libsound) +install(TARGETS qtmultimediabackend DESTINATION ${KDE_INSTALL_PLUGINDIR}/artikulate/libsound) diff -Nru artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediabackend.cpp artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediabackend.cpp --- artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediabackend.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediabackend.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "qtmultimediabackend.h" #include "qtmultimediacapturebackend.h" diff -Nru artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediabackend.h artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediabackend.h --- artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediabackend.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediabackend.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef QTMULTIMEDIABACKEND_H #define QTMULTIMEDIABACKEND_H diff -Nru artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediabackend.json artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediabackend.json --- artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediabackend.json 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediabackend.json 2021-02-07 18:47:15.000000000 +0000 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Sound backend for QtMultimedia.", + "Description[az]": "QtMultimedia üçün Səs modulu.", "Description[ca@valencia]": "Dorsal de so pel QtMultimedia.", "Description[ca]": "Dorsal de so pel QtMultimedia.", "Description[cs]": "Podpůrná vrstva zvuku pro QtMultimedia.", @@ -36,6 +37,7 @@ "Id": "artikulate_qtmultimedia_backend", "License": "GPL", "Name": "QtMultimedia Backend", + "Name[az]": "QtMultimedia Modulu", "Name[ca@valencia]": "Dorsal QtMultimedia", "Name[ca]": "Dorsal QtMultimedia", "Name[cs]": "Podpůrná vrstva QtMultimedia", diff -Nru artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediacapturebackend.cpp artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediacapturebackend.cpp --- artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediacapturebackend.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediacapturebackend.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "qtmultimediacapturebackend.h" diff -Nru artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediacapturebackend.h artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediacapturebackend.h --- artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediacapturebackend.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediacapturebackend.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef QTMULTIMEDIACAPTUREBACKEND_H #define QTMULTIMEDIACAPTUREBACKEND_H diff -Nru artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediaoutputbackend.cpp artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediaoutputbackend.cpp --- artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediaoutputbackend.cpp 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediaoutputbackend.cpp 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #include "qtmultimediaoutputbackend.h" #include diff -Nru artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediaoutputbackend.h artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediaoutputbackend.h --- artikulate-20.12.3/libsound/src/qtmultimediabackend/qtmultimediaoutputbackend.h 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/libsound/src/qtmultimediabackend/qtmultimediaoutputbackend.h 2021-02-07 18:47:15.000000000 +0000 @@ -1,8 +1,8 @@ /* - * SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ + SPDX-FileCopyrightText: 2016 Andreas Cord-Landwehr + + SPDX-License-Identifier: LGPL-2.1-or-later +*/ #ifndef QTMULTIMEDIAOUTPUTBACKEND_H #define QTMULTIMEDIAOUTPUTBACKEND_H diff -Nru artikulate-20.12.3/org.kde.artikulate.appdata.xml artikulate-21.04.0/org.kde.artikulate.appdata.xml --- artikulate-20.12.3/org.kde.artikulate.appdata.xml 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/org.kde.artikulate.appdata.xml 2021-02-07 18:47:15.000000000 +0000 @@ -9,6 +9,7 @@ CC0-1.0 GPL-2.0+ Artikulate + Artikulate Artikulate Artikulate Artikulate @@ -46,6 +47,7 @@ Artikulate Artikulate Artikulate Pronunciation Trainer + Artikulate Tələffüz Təlimi Artikulate vježba izgovora Entrenador de la pronunciació Artikulate Entrenador de la pronunciació Artikulate @@ -84,6 +86,7 @@ Artikulate 發音訓練器

Artikulate is a pronunciation trainer that helps improving and perfecting a learner's pronunciation skills for a foreign language. It provides courses with native speaker recordings for several training languages. The learner downloads those courses, selects a category of phrases to train, then starts with recording her/his own voice when speaking the phrases and comparing the results to the native speaker's recordings by listening to both. By adjusting and repeating the own pronunciation, the learner can improve his/her skill.

+

Artikulate, xarici dil öyrənmək üçün bir şagirdin tələffüz bacarıqlarını inkişaf etdirməyə və təkmilləşdirməyə kömək edən bir tələffüz təlimçisidir. Bir neçə təlim dili üçün dil daşıyıcılarının qeydləri ilə kurslar təqdim edir. Şagird bu kursları yükləyir, məşq etmək üçün bir cümlə kateqoriyasını seçir, sonra ifadələri danışarkən öz səsini yazır və nəticələrin hər ikisini dinləməklə dil daşıyıcısının səsyazmaları ilə müqayisə etməyə başlayır. Öz tələffüzünü düzəldərək təkrarlayaraq, şagird bacarıqlarını artıra bilər.

Artikulate je trener izgovora koji poboljšava i usavršava izgovorne vještine za učenike stranih jezik. Ona pruža kurseve sa snimcima na maternjem jeziku za nekoliko jezika obuke. Učenik preuzima ove kurseve, bira kategoriju fraza za obuku, a zatim počinje sa snimanjem njegovog/njenog glasa pri izgovoru fraze.i Porede se rezultati snimaka na maternji i slušaju oba. Podešavanjem i ponavljanja sopstvenog izgovora, učenik može da poboljša njegovu / njenu vještinu.

L'Artikulate és un entrenador de pronunciació que ajuda a millor i perfeccionar les habilitats de pronunciació d'un alumne d'un idioma estranger. Proporciona cursos amb enregistraments d'un parlant natiu. L'alumne baixa aquests cursos, selecciona una categoria de frases per a entrenar, després comença enregistrant la seva pròpia veu en pronunciar les frases i compara els resultats amb els enregistraments del parlant natiu escoltant els dos. Ajustant i repetint la pronunciació pròpia, l'alumne pot millorar la seva habilitat.

L'Artikulate és un entrenador de pronunciació que ajuda a millor i perfeccionar les habilitats de pronunciació d'un alumne d'un idioma estranger. Proporciona cursos amb enregistraments d'un parlant natiu. L'alumne baixa aquests cursos, selecciona una categoria de frases per a entrenar, després comença enregistrant la seua pròpia veu en pronunciar les frases i compara els resultats amb els enregistraments del parlant natiu escoltant els dos. Ajustant i repetint la pronunciació pròpia, l'alumne pot millorar la seua habilitat.

@@ -124,6 +127,7 @@ Training in Artikulate + Artikulate-də Təlim Entrenament a l'Artikulate Entrenament a l'Artikulate Trénink v Artikulate @@ -145,7 +149,6 @@ Exercício no Artikulate Treinando no Artikulate Тренировка в Artikulate - Tréning v Artikulate Vaje v Artikulate Övning i Artikulate Вправляння в Artikulate diff -Nru artikulate-20.12.3/org.kde.artikulate.desktop artikulate-21.04.0/org.kde.artikulate.desktop --- artikulate-20.12.3/org.kde.artikulate.desktop 2021-01-27 13:46:05.000000000 +0000 +++ artikulate-21.04.0/org.kde.artikulate.desktop 2021-02-07 18:47:15.000000000 +0000 @@ -8,6 +8,7 @@ Icon=artikulate X-DocPath=artikulate/index.html GenericName=Artikulate Pronunciation Trainer +GenericName[az]=Artikulate Tələffüz Təlimi GenericName[bs]=Artikulate vježba izgovora GenericName[ca]=Entrenador de la pronunciació Artikulate GenericName[ca@valencia]=Entrenador de la pronunciació Artikulate @@ -48,6 +49,7 @@ GenericName[zh_TW]=Artikulate 發音訓練師 Terminal=false Name=Artikulate +Name[az]=Artikulate Name[bs]=Artikulate Name[ca]=Artikulate Name[ca@valencia]=Artikulate diff -Nru artikulate-20.12.3/po/es/docs/artikulate/index.docbook artikulate-21.04.0/po/es/docs/artikulate/index.docbook --- artikulate-20.12.3/po/es/docs/artikulate/index.docbook 2021-03-02 00:34:31.000000000 +0000 +++ artikulate-21.04.0/po/es/docs/artikulate/index.docbook 2021-04-16 08:36:11.000000000 +0000 @@ -1,9 +1,4 @@ - - @@ -682,6 +677,32 @@ >. &underFDL; &underGPL; + +Instalación + + +Cómo obtener &artikulate;&install.intro.documentation; + + +Compilación e instalación&install.compile.documentation; +Instrucciones específicas para &artikulate; +Hay más información sobre como compilar &artikulate; en la documetnación técnica de &artikulate; en &kde; TechBase. + + + + + &documentation.index;