Hello community, here is the log from the commit of package kdevelop5-plugin-php for openSUSE:Factory checked in at 2019-10-23 15:50:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdevelop5-plugin-php (Old) and /work/SRC/openSUSE:Factory/.kdevelop5-plugin-php.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdevelop5-plugin-php" Wed Oct 23 15:50:48 2019 rev:18 rq:741847 version:5.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kdevelop5-plugin-php/kdevelop5-plugin-php.changes 2019-09-05 12:35:18.835561617 +0200 +++ /work/SRC/openSUSE:Factory/.kdevelop5-plugin-php.new.2352/kdevelop5-plugin-php.changes 2019-10-23 15:50:59.218703468 +0200 @@ -1,0 +2,7 @@ +Tue Oct 22 10:55:15 UTC 2019 - wba...@tmo.at + +- Update to 5.4.3 + * Fix expressions using array constants (kde#405719) + * Don't mark class constants as normal members + +------------------------------------------------------------------- Old: ---- kdev-php-5.4.2.tar.xz New: ---- kdev-php-5.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop5-plugin-php.spec ++++++ --- /var/tmp/diff_new_pack.p9yn9g/_old 2019-10-23 15:51:00.206704536 +0200 +++ /var/tmp/diff_new_pack.p9yn9g/_new 2019-10-23 15:51:00.210704540 +0200 @@ -18,7 +18,7 @@ %define rname kdev-php Name: kdevelop5-plugin-php -Version: 5.4.2 +Version: 5.4.3 Release: 0 Summary: PHP plugin for Kdevelop5 Integrated Development Environment License: GPL-2.0-or-later ++++++ kdev-php-5.4.2.tar.xz -> kdev-php-5.4.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/CMakeLists.txt new/kdev-php-5.4.3/CMakeLists.txt --- old/kdev-php-5.4.2/CMakeLists.txt 2019-09-02 21:50:33.000000000 +0200 +++ new/kdev-php-5.4.3/CMakeLists.txt 2019-10-21 18:22:19.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) cmake_policy(SET CMP0048 NEW) -project(kdev-php VERSION "5.4.2") +project(kdev-php VERSION "5.4.3") find_package(Threads) find_package (ECM "5.28.0" REQUIRED NO_MODULE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/duchain/builders/typebuilder.cpp new/kdev-php-5.4.3/duchain/builders/typebuilder.cpp --- old/kdev-php-5.4.2/duchain/builders/typebuilder.cpp 2019-09-02 21:49:53.000000000 +0200 +++ new/kdev-php-5.4.3/duchain/builders/typebuilder.cpp 2019-10-21 18:22:00.000000000 +0200 @@ -319,6 +319,9 @@ } closeContextType(); closeType(); + } else if (node->constsSequence) { + //class constant + TypeBuilderBase::visitClassStatement(node); } else { //member-variable parseDocComment(node, QStringLiteral("var")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/duchain/tests/duchain.cpp new/kdev-php-5.4.3/duchain/tests/duchain.cpp --- old/kdev-php-5.4.2/duchain/tests/duchain.cpp 2019-09-02 21:49:53.000000000 +0200 +++ new/kdev-php-5.4.3/duchain/tests/duchain.cpp 2019-10-21 18:22:00.000000000 +0200 @@ -1673,6 +1673,29 @@ QCOMPARE(top->findDeclarations(QualifiedIdentifier("a::C")).first()->context(), top->childContexts().last()); } +void TestDUChain::classConstWithTypeHint() +{ + // 0 1 2 3 4 5 6 7 + // 01234567890123456789012345678901234567890123456789012345678901234567890123456789 + QByteArray method("<? class A { /**\n* @var integer\n**/\nconst C = 1; } "); + + TopDUContext* top = parse(method, DumpNone); + DUChainReleaser releaseTop(top); + DUChainWriteLocker lock(DUChain::lock()); + + QCOMPARE(top->childContexts().count(), 1); + QCOMPARE(top->problems().count(), 0); + + QList< Declaration* > decs = top->findDeclarations(QualifiedIdentifier("a::C")); + QCOMPARE(decs.count(), 1); + QCOMPARE(decs.first()->context(), top->childContexts().last()); + + IntegralType::Ptr type = decs.first()->abstractType().cast<IntegralType>(); + QVERIFY(type); + QCOMPARE(type->dataType(), IntegralType::TypeInt); + QVERIFY(type->modifiers() & AbstractType::ConstModifier); +} + void TestDUChain::semiReservedClassConst() { // 0 1 2 3 4 5 6 7 @@ -3978,6 +4001,29 @@ { QFETCH(QString, code); + TopDUContext* top = parse(code.toUtf8(), DumpNone); + QVERIFY(top); + DUChainReleaser releaseTop(top); + DUChainWriteLocker lock(DUChain::lock()); + + QVERIFY(top->problems().isEmpty()); +} + +void TestDUChain::simpleExpression_data() +{ + QTest::addColumn<QString>("code"); + + QTest::newRow("string concat") << QStringLiteral("<? $var = 'string ' . 'concat';\n"); + QTest::newRow("variable concat") << QStringLiteral("<? $foo = 'concat'; $var = 'string ' . $foo;\n"); + QTest::newRow("variable array concat") << QStringLiteral("<? $arr = [ 'concat' ]; $var = 'string ' . $arr[1];\n"); + QTest::newRow("constant concat") << QStringLiteral("<? const FOO = 'concat'; $var = 'string ' . FOO;\n"); + QTest::newRow("constant array concat") << QStringLiteral("<? const ARR = [ 'concat' ]; $var = 'string ' . ARR[1];\n"); +} + +void TestDUChain::simpleExpression() +{ + QFETCH(QString, code); + TopDUContext* top = parse(code.toUtf8(), DumpNone); QVERIFY(top); DUChainReleaser releaseTop(top); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/duchain/tests/duchain.h new/kdev-php-5.4.3/duchain/tests/duchain.h --- old/kdev-php-5.4.2/duchain/tests/duchain.h 2019-09-02 21:49:53.000000000 +0200 +++ new/kdev-php-5.4.3/duchain/tests/duchain.h 2019-10-21 18:22:00.000000000 +0200 @@ -86,6 +86,7 @@ void ownStaticMemberVariable(); void classConst(); void classConst_data(); + void classConstWithTypeHint(); void semiReservedClassConst(); void fileConst(); void fileConst_data(); @@ -192,6 +193,8 @@ void illegalExpression(); void printExpression_data(); void printExpression(); + void simpleExpression_data(); + void simpleExpression(); void generatorAssignment(); void generatorClosure(); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/org.kde.kdev-php.metainfo.xml new/kdev-php-5.4.3/org.kde.kdev-php.metainfo.xml --- old/kdev-php-5.4.2/org.kde.kdev-php.metainfo.xml 2019-09-02 21:49:53.000000000 +0200 +++ new/kdev-php-5.4.3/org.kde.kdev-php.metainfo.xml 2019-10-21 18:22:00.000000000 +0200 @@ -22,6 +22,7 @@ <name xml:lang="uk">Підтримка PHP KDevelop</name> <name xml:lang="x-test">xxKDevelop PHP Supportxx</name> <name xml:lang="zh-CN">KDevelop PHP 支持</name> + <name xml:lang="zh-TW">KDevelop PHP 支援</name> <summary>PHP language support for KDevelop</summary> <summary xml:lang="ca">Implementació del llenguatge PHP al KDevelop</summary> <summary xml:lang="ca-valencia">Implementació del llenguatge PHP al KDevelop</summary> @@ -42,6 +43,7 @@ <summary xml:lang="uk">Підтримка мови PHP у KDevelop</summary> <summary xml:lang="x-test">xxPHP language support for KDevelopxx</summary> <summary xml:lang="zh-CN">KDevelop 的 PHP 语言支持</summary> + <summary xml:lang="zh-TW">適用於 KDevelop 的 PHP 語言支援</summary> <project_license>GPL-2.0+</project_license> <metadata_license>CC0-1.0</metadata_license> <url type="homepage">https://kdevelop.org</url> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/parser/php.g new/kdev-php-5.4.3/parser/php.g --- old/kdev-php-5.4.2/parser/php.g 2019-09-02 21:49:53.000000000 +0200 +++ new/kdev-php-5.4.3/parser/php.g 2019-10-21 18:22:00.000000000 +0200 @@ -838,7 +838,7 @@ -> variableName ;; commonScalar=commonScalar - | constantOrClassConst=constantOrClassConst + | constantOrClassConst=constantOrClassConst #offsetItem=dimListItem* | varname=STRING_VARNAME | DOUBLE_QUOTE encapsList=encapsList DOUBLE_QUOTE stringIndex=stringIndexSpecifier* | START_HEREDOC encapsList=encapsList END_HEREDOC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/po/ast/kdevphp.po new/kdev-php-5.4.3/po/ast/kdevphp.po --- old/kdev-php-5.4.2/po/ast/kdevphp.po 2019-09-02 21:50:08.000000000 +0200 +++ new/kdev-php-5.4.3/po/ast/kdevphp.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,411 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# enolp <en...@softastur.org>, 2015. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:39+0200\n" -"PO-Revision-Date: 2015-04-06 02:27+0100\n" -"Last-Translator: enolp <en...@softastur.org>\n" -"Language-Team: Asturian <kde-i18n-...@kde.org>\n" -"Language: ast\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" - -#, fuzzy, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Softastur" - -#, fuzzy, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "alministrado...@softastur.org" - -#: completion/implementationitem.cpp:73 -#, kde-format -msgid "Override" -msgstr "" - -#: completion/implementationitem.cpp:76 -#, kde-format -msgid "Implement" -msgstr "" - -#: completion/implementationitem.cpp:88 -#, kde-format -msgid "From %1" -msgstr "" - -#. i18n: ectx: property (title), widget (QGroupBox, PhpDoc) -#: docs/phpdocsconfig.ui:20 -#, kde-format -msgid "PHP Manual Integration" -msgstr "" - -#. i18n: ectx: property (text), widget (QLabel, PhpDocNote) -#: docs/phpdocsconfig.ui:36 -#, kde-format -msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/" -"REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css" -"\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-" -"weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" -"right:0px; -qt-block-indent:0; text-indent:0px;\">By default the online <a " -"href=\"http://php.net\"><span style=\" text-decoration: underline; color:" -"#0000ff;\">PHP documentation</span></a> is used remotely. Alternatively you " -"can set the location to a local copy of the documentation in the language of " -"your choice. Make sure you downloaded the <span style=\" font-style:italic;" -"\">\"Many HTML files\"</span> package.</p></body></html>" -msgstr "" - -#. i18n: ectx: property (text), widget (QLabel, PhpDocLocationLabel) -#: docs/phpdocsconfig.ui:57 -#, kde-format -msgid "Location:" -msgstr "" - -#: docs/phpdocsmodel.cpp:110 -#, kde-format -msgid "<lost declaration>" -msgstr "" - -#: docs/phpdocsplugin.cpp:221 -#, kde-format -msgid "PHP Documentation" -msgstr "" - -#. i18n: ectx: label, entry (phpDocLocation), group (PHP Documentation) -#: docs/phpdocssettings.kcfg:10 -#, kde-format -msgid "Specifies the location of the PHP documentation to use." -msgstr "" - -#. i18n: ectx: tooltip, entry (phpDocLocation), group (PHP Documentation) -#: docs/phpdocssettings.kcfg:13 -#, kde-format -msgid "" -"The location of the PHP documentation to use. You can either use a remote\n" -" location like http://php.net or a local directory which " -"contains the\n" -" PHP documentation in HTML format with many files." -msgstr "" - -#. i18n: ectx: whatsthis, entry (phpDocLocation), group (PHP Documentation) -#: docs/phpdocssettings.kcfg:15 -#, kde-format -msgid "" -"Make sure local copies are downloaded in HTML format with many files.\n" -" " -msgstr "" - -#: docs/phpdocumentationwidget.cpp:74 -#, kde-format -msgid "...loading documentation..." -msgstr "" - -#: duchain/builders/contextbuilder.cpp:461 -#, kde-format -msgid "Circular inheritance of %1 and %2" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:199 -#: duchain/builders/declarationbuilder.cpp:214 -#: duchain/builders/declarationbuilder.cpp:230 -#: duchain/builders/declarationbuilder.cpp:845 -#: duchain/builders/declarationbuilder.cpp:884 -#, kde-format -msgid "Cannot use '%1' as class name as it is reserved" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:353 -#, kde-format -msgid "Access type for interface method %1 must be omitted." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:357 -#, kde-format -msgid "Interface function %1 cannot contain body." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:369 -#, kde-format -msgid "" -"Class %1 contains abstract method %2 and must therefore be declared abstract " -"or implement the method." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:375 -#, kde-format -msgid "Abstract function %1 cannot contain body." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:378 -#, kde-format -msgid "Cannot use the final modifier on an abstract class member." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:388 -#, kde-format -msgid "Non-abstract method %1 must contain body." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:406 -#, kde-format -msgid "Properties cannot be declared final." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:409 -#, kde-format -msgid "Properties cannot be declared abstract." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:455 -#, kde-format -msgid "" -"Trait method %1 has not been applied, because there are collisions with " -"other trait methods on %2" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:648 -#, kde-format -msgid "Traits cannot have constants." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:655 -#, kde-format -msgid "" -"A class constant must not be called 'class'; it is reserved for class name " -"fetching" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:730 -#: duchain/builders/declarationbuilder.cpp:756 -#, kde-format -msgid "Cannot use 'abstract' as method modifier" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:733 -#: duchain/builders/declarationbuilder.cpp:759 -#, kde-format -msgid "Cannot use 'final' as method modifier" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:736 -#: duchain/builders/declarationbuilder.cpp:762 -#, kde-format -msgid "Cannot use 'static' as method modifier" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:811 -#, kde-format -msgid "Variadic parameter cannot have a default value" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:814 -#, kde-format -msgid "Default value for parameters with a class type hint can only be NULL." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:822 -#, kde-format -msgid "Default value for parameters with an object type can only be NULL." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:850 -#, kde-format -msgid "Only the last parameter can be variadic." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:964 -#, kde-format -msgid "Cannot redeclare PHP internal %1." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:967 -#, kde-format -msgid "" -"%1 and %2 define the same property (%3) in the composition of %1. This might " -"be incompatible, to improve maintainability consider using accessor methods " -"in traits instead." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:975 -#, kde-format -msgid "Cannot redeclare %1, already declared in %2 on line %3." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1061 -#, kde-format -msgid "" -"Class %1 contains %2 abstract methods and must therefore be declared " -"abstract or implement the remaining methods." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1068 -#, kde-format -msgid "Cannot re-assign $this." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1262 -#, kde-format -msgid "Cannot access private property %1" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1265 -#, kde-format -msgid "Cannot access protected property %1" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1411 -#, kde-format -msgid "Cannot use positional argument after argument unpacking" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1608 -#, kde-format -msgid "The use statement with non-compound name '%1' has no effect." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1636 -#, kde-format -msgid "Cannot use '%1' as '%2' because the name is already in use." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1662 -#, kde-format -msgid "Cannot use %1 as %2 because '%2' is a special class name" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1672 -#, kde-format -msgid "The 'yield' expression can only be used inside a function" -msgstr "" - -#: duchain/builders/usebuilder.cpp:207 -#, kde-format -msgid "Usage of %1 is deprecated." -msgstr "" - -#: duchain/builders/usebuilder.cpp:209 -#, kde-format -msgid "Declaration not found: %1" -msgstr "" - -#: duchain/declarations/traitmemberaliasdeclaration.cpp:68 -#: duchain/declarations/traitmethodaliasdeclaration.cpp:101 -#, kde-format -msgid "Lost trait alias %1" -msgstr "" - -#: duchain/navigation/declarationnavigationcontext.cpp:129 -#: duchain/navigation/declarationnavigationcontext.cpp:142 -#, kde-format -msgid "Use of %1 from %2<br />" -msgstr "" - -#: duchain/navigation/declarationnavigationcontext.cpp:152 -#, kde-format -msgid "Broken member alias trait." -msgstr "" - -#: duchain/navigation/declarationnavigationcontext.cpp:243 -#, kde-format -msgid "PHP internal" -msgstr "" - -#: duchain/navigation/declarationnavigationcontext.cpp:253 -#, kde-format -msgctxt "kind of a php-constant, as shown in the declaration tooltip" -msgid "Constant" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:60 -#, kde-format -msgid "magic constant" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:77 -#, kde-format -msgid "empty (not inside a class)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:83 -#, kde-format -msgid "empty (not inside a trait)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:102 -#, kde-format -msgid "empty (not inside a method)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:112 -#, kde-format -msgid "empty (not inside a function)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:121 -#, kde-format -msgid "empty (not inside a namespace)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:125 -#, kde-format -msgid "current value: %1" -msgstr "" - -#: duchain/types/indexedcontainer.cpp:89 -#, kde-format -msgctxt "as in list of int, set of string" -msgid "%1 of %2" -msgstr "" - -#: parser/main.cpp:38 -#, kde-format -msgid "php-parser" -msgstr "" - -#: parser/main.cpp:39 -#, kde-format -msgid "KDevelop PHP parser debugging utility" -msgstr "" - -#: parser/main.cpp:40 -#, kde-format -msgid "(c) 2008 Niko Sams, 2009 Milian Wolff" -msgstr "" - -#: parser/parsesession.cpp:80 -#, kde-format -msgid "Could not open file '%1'" -msgstr "" - -#: parser/parsesession.cpp:83 -#, kde-format -msgid "File could not be read from." -msgstr "" - -#: parser/parsesession.cpp:86 -#, kde-format -msgid "File could not be opened." -msgstr "" - -#: parser/parsesession.cpp:89 -#, kde-format -msgid "File permissions prevent opening for read." -msgstr "" - -#: testprovider/phpunitrunjob.cpp:85 -#, kde-format -msgid "PHPUnit" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/po/lt/kdevphp.po new/kdev-php-5.4.3/po/lt/kdevphp.po --- old/kdev-php-5.4.2/po/lt/kdevphp.po 2019-09-02 21:50:21.000000000 +0200 +++ new/kdev-php-5.4.3/po/lt/kdevphp.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,412 +0,0 @@ -# Lithuanian translations for kdevphp package. -# Copyright (C) 2009 This_file_is_part_of_KDE -# This file is distributed under the same license as the kdevphp package. -# Andrius Štikonas <andr...@stikonas.eu>, 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: kdevphp\n" -"Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:39+0200\n" -"PO-Revision-Date: 2009-01-25 22:33+0200\n" -"Last-Translator: Andrius Štikonas <andr...@stikonas.eu>\n" -"Language-Team: Lithuanian <kde-i18n...@kde.org>\n" -"Language: lt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" -"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" - -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "" - -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "" - -#: completion/implementationitem.cpp:73 -#, kde-format -msgid "Override" -msgstr "" - -#: completion/implementationitem.cpp:76 -#, kde-format -msgid "Implement" -msgstr "" - -#: completion/implementationitem.cpp:88 -#, kde-format -msgid "From %1" -msgstr "" - -#. i18n: ectx: property (title), widget (QGroupBox, PhpDoc) -#: docs/phpdocsconfig.ui:20 -#, kde-format -msgid "PHP Manual Integration" -msgstr "" - -#. i18n: ectx: property (text), widget (QLabel, PhpDocNote) -#: docs/phpdocsconfig.ui:36 -#, kde-format -msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/" -"REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css" -"\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-" -"weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" -"right:0px; -qt-block-indent:0; text-indent:0px;\">By default the online <a " -"href=\"http://php.net\"><span style=\" text-decoration: underline; color:" -"#0000ff;\">PHP documentation</span></a> is used remotely. Alternatively you " -"can set the location to a local copy of the documentation in the language of " -"your choice. Make sure you downloaded the <span style=\" font-style:italic;" -"\">\"Many HTML files\"</span> package.</p></body></html>" -msgstr "" - -#. i18n: ectx: property (text), widget (QLabel, PhpDocLocationLabel) -#: docs/phpdocsconfig.ui:57 -#, kde-format -msgid "Location:" -msgstr "" - -#: docs/phpdocsmodel.cpp:110 -#, kde-format -msgid "<lost declaration>" -msgstr "" - -#: docs/phpdocsplugin.cpp:221 -#, kde-format -msgid "PHP Documentation" -msgstr "" - -#. i18n: ectx: label, entry (phpDocLocation), group (PHP Documentation) -#: docs/phpdocssettings.kcfg:10 -#, kde-format -msgid "Specifies the location of the PHP documentation to use." -msgstr "" - -#. i18n: ectx: tooltip, entry (phpDocLocation), group (PHP Documentation) -#: docs/phpdocssettings.kcfg:13 -#, kde-format -msgid "" -"The location of the PHP documentation to use. You can either use a remote\n" -" location like http://php.net or a local directory which " -"contains the\n" -" PHP documentation in HTML format with many files." -msgstr "" - -#. i18n: ectx: whatsthis, entry (phpDocLocation), group (PHP Documentation) -#: docs/phpdocssettings.kcfg:15 -#, kde-format -msgid "" -"Make sure local copies are downloaded in HTML format with many files.\n" -" " -msgstr "" - -#: docs/phpdocumentationwidget.cpp:74 -#, kde-format -msgid "...loading documentation..." -msgstr "" - -#: duchain/builders/contextbuilder.cpp:461 -#, kde-format -msgid "Circular inheritance of %1 and %2" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:199 -#: duchain/builders/declarationbuilder.cpp:214 -#: duchain/builders/declarationbuilder.cpp:230 -#: duchain/builders/declarationbuilder.cpp:845 -#: duchain/builders/declarationbuilder.cpp:884 -#, kde-format -msgid "Cannot use '%1' as class name as it is reserved" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:353 -#, kde-format -msgid "Access type for interface method %1 must be omitted." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:357 -#, kde-format -msgid "Interface function %1 cannot contain body." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:369 -#, kde-format -msgid "" -"Class %1 contains abstract method %2 and must therefore be declared abstract " -"or implement the method." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:375 -#, kde-format -msgid "Abstract function %1 cannot contain body." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:378 -#, kde-format -msgid "Cannot use the final modifier on an abstract class member." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:388 -#, kde-format -msgid "Non-abstract method %1 must contain body." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:406 -#, kde-format -msgid "Properties cannot be declared final." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:409 -#, kde-format -msgid "Properties cannot be declared abstract." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:455 -#, kde-format -msgid "" -"Trait method %1 has not been applied, because there are collisions with " -"other trait methods on %2" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:648 -#, kde-format -msgid "Traits cannot have constants." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:655 -#, kde-format -msgid "" -"A class constant must not be called 'class'; it is reserved for class name " -"fetching" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:730 -#: duchain/builders/declarationbuilder.cpp:756 -#, kde-format -msgid "Cannot use 'abstract' as method modifier" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:733 -#: duchain/builders/declarationbuilder.cpp:759 -#, kde-format -msgid "Cannot use 'final' as method modifier" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:736 -#: duchain/builders/declarationbuilder.cpp:762 -#, kde-format -msgid "Cannot use 'static' as method modifier" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:811 -#, kde-format -msgid "Variadic parameter cannot have a default value" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:814 -#, kde-format -msgid "Default value for parameters with a class type hint can only be NULL." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:822 -#, kde-format -msgid "Default value for parameters with an object type can only be NULL." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:850 -#, kde-format -msgid "Only the last parameter can be variadic." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:964 -#, kde-format -msgid "Cannot redeclare PHP internal %1." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:967 -#, kde-format -msgid "" -"%1 and %2 define the same property (%3) in the composition of %1. This might " -"be incompatible, to improve maintainability consider using accessor methods " -"in traits instead." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:975 -#, kde-format -msgid "Cannot redeclare %1, already declared in %2 on line %3." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1061 -#, kde-format -msgid "" -"Class %1 contains %2 abstract methods and must therefore be declared " -"abstract or implement the remaining methods." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1068 -#, kde-format -msgid "Cannot re-assign $this." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1262 -#, kde-format -msgid "Cannot access private property %1" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1265 -#, kde-format -msgid "Cannot access protected property %1" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1411 -#, kde-format -msgid "Cannot use positional argument after argument unpacking" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1608 -#, kde-format -msgid "The use statement with non-compound name '%1' has no effect." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1636 -#, kde-format -msgid "Cannot use '%1' as '%2' because the name is already in use." -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1662 -#, kde-format -msgid "Cannot use %1 as %2 because '%2' is a special class name" -msgstr "" - -#: duchain/builders/declarationbuilder.cpp:1672 -#, kde-format -msgid "The 'yield' expression can only be used inside a function" -msgstr "" - -#: duchain/builders/usebuilder.cpp:207 -#, kde-format -msgid "Usage of %1 is deprecated." -msgstr "" - -#: duchain/builders/usebuilder.cpp:209 -#, kde-format -msgid "Declaration not found: %1" -msgstr "" - -#: duchain/declarations/traitmemberaliasdeclaration.cpp:68 -#: duchain/declarations/traitmethodaliasdeclaration.cpp:101 -#, kde-format -msgid "Lost trait alias %1" -msgstr "" - -#: duchain/navigation/declarationnavigationcontext.cpp:129 -#: duchain/navigation/declarationnavigationcontext.cpp:142 -#, kde-format -msgid "Use of %1 from %2<br />" -msgstr "" - -#: duchain/navigation/declarationnavigationcontext.cpp:152 -#, kde-format -msgid "Broken member alias trait." -msgstr "" - -#: duchain/navigation/declarationnavigationcontext.cpp:243 -#, kde-format -msgid "PHP internal" -msgstr "" - -#: duchain/navigation/declarationnavigationcontext.cpp:253 -#, kde-format -msgctxt "kind of a php-constant, as shown in the declaration tooltip" -msgid "Constant" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:60 -#, kde-format -msgid "magic constant" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:77 -#, kde-format -msgid "empty (not inside a class)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:83 -#, kde-format -msgid "empty (not inside a trait)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:102 -#, kde-format -msgid "empty (not inside a method)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:112 -#, kde-format -msgid "empty (not inside a function)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:121 -#, kde-format -msgid "empty (not inside a namespace)" -msgstr "" - -#: duchain/navigation/magicconstantnavigationcontext.cpp:125 -#, kde-format -msgid "current value: %1" -msgstr "" - -#: duchain/types/indexedcontainer.cpp:89 -#, kde-format -msgctxt "as in list of int, set of string" -msgid "%1 of %2" -msgstr "" - -#: parser/main.cpp:38 -#, kde-format -msgid "php-parser" -msgstr "" - -#: parser/main.cpp:39 -#, kde-format -msgid "KDevelop PHP parser debugging utility" -msgstr "" - -#: parser/main.cpp:40 -#, kde-format -msgid "(c) 2008 Niko Sams, 2009 Milian Wolff" -msgstr "" - -#: parser/parsesession.cpp:80 -#, kde-format -msgid "Could not open file '%1'" -msgstr "" - -#: parser/parsesession.cpp:83 -#, kde-format -msgid "File could not be read from." -msgstr "" - -#: parser/parsesession.cpp:86 -#, kde-format -msgid "File could not be opened." -msgstr "" - -#: parser/parsesession.cpp:89 -#, kde-format -msgid "File permissions prevent opening for read." -msgstr "" - -#: testprovider/phpunitrunjob.cpp:85 -#, kde-format -msgid "PHPUnit" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/po/sk/kdevphp.po new/kdev-php-5.4.3/po/sk/kdevphp.po --- old/kdev-php-5.4.2/po/sk/kdevphp.po 2019-09-02 21:50:28.000000000 +0200 +++ new/kdev-php-5.4.3/po/sk/kdevphp.po 2019-10-21 18:22:17.000000000 +0200 @@ -1,6 +1,6 @@ # translation of kdevphp.po to Slovak # Richard Fric <richard.f...@kdemail.net>, 2009. -# Roman Paholík <wizzar...@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017. +# Roman Paholík <wizzar...@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2019. # Mthw <jari...@hotmail.com>, 2018. # Matej Mrenica <matejm98m...@gmail.com>, 2019. msgid "" @@ -8,14 +8,14 @@ "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2019-08-30 07:39+0200\n" -"PO-Revision-Date: 2019-08-07 19:50+0200\n" -"Last-Translator: Matej Mrenica <matejm98m...@gmail.com>\n" -"Language-Team: Slovak <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2019-09-05 20:53+0200\n" +"Last-Translator: Roman Paholík <wizzar...@gmail.com>\n" +"Language-Team: Slovak <kde...@linux.sk>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 19.07.90\n" +"X-Generator: Lokalize 18.12.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #, kde-format @@ -321,7 +321,7 @@ #: duchain/builders/declarationbuilder.cpp:1672 #, kde-format msgid "The 'yield' expression can only be used inside a function" -msgstr "" +msgstr "Výraz 'yield' sa môže použiť iba vo funkcii" #: duchain/builders/usebuilder.cpp:207 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdev-php-5.4.2/po/zh_CN/kdevphp.po new/kdev-php-5.4.3/po/zh_CN/kdevphp.po --- old/kdev-php-5.4.2/po/zh_CN/kdevphp.po 2019-09-02 21:50:33.000000000 +0200 +++ new/kdev-php-5.4.3/po/zh_CN/kdevphp.po 2019-10-21 18:22:19.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2019-08-30 07:39+0200\n" -"PO-Revision-Date: 2019-08-16 17:11\n" +"PO-Revision-Date: 2019-10-09 10:09\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"