diff -Nru kdevelop-php-1.3.0/CHANGELOG.1.3.0 kdevelop-php-1.3.1/CHANGELOG.1.3.0 --- kdevelop-php-1.3.0/CHANGELOG.1.3.0 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/CHANGELOG.1.3.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -ChangeLog for php v1.3.0 -======================== - -* Milian Wolff: set version to 1.3.0 and depend on kdevplatform 1.3.0 -* Milian Wolff: simplify release management, plugin version is now also set from the CMakeLists.txt diff -Nru kdevelop-php-1.3.0/CHANGELOG.1.3.1 kdevelop-php-1.3.1/CHANGELOG.1.3.1 --- kdevelop-php-1.3.0/CHANGELOG.1.3.1 1970-01-01 00:00:00.000000000 +0000 +++ kdevelop-php-1.3.1/CHANGELOG.1.3.1 2012-04-13 19:58:52.000000000 +0000 @@ -0,0 +1,7 @@ +ChangeLog for php v1.3.1 +======================== + +* Milian Wolff: set version to 1.3.1 +* Milian Wolff: properly report uses after instanceof operator +* Milian Wolff: take range into account when looking for redeclarations +* Milian Wolff: properly check context before accessing it diff -Nru kdevelop-php-1.3.0/CMakeLists.txt kdevelop-php-1.3.1/CMakeLists.txt --- kdevelop-php-1.3.0/CMakeLists.txt 2012-03-11 18:11:18.000000000 +0000 +++ kdevelop-php-1.3.1/CMakeLists.txt 2012-04-13 20:02:29.000000000 +0000 @@ -2,7 +2,7 @@ set(KDEVPHP_VERSION_MAJOR 1) set(KDEVPHP_VERSION_MINOR 3) -set(KDEVPHP_VERSION_PATCH 0) +set(KDEVPHP_VERSION_PATCH 1) configure_file( "${php_SOURCE_DIR}/kdevphpversion.h.cmake" "${php_BINARY_DIR}/kdevphpversion.h" @ONLY ) diff -Nru kdevelop-php-1.3.0/debian/changelog kdevelop-php-1.3.1/debian/changelog --- kdevelop-php-1.3.0/debian/changelog 2012-03-22 12:54:04.000000000 +0000 +++ kdevelop-php-1.3.1/debian/changelog 2012-04-17 12:01:56.000000000 +0000 @@ -1,3 +1,10 @@ +kdevelop-php (1.3.1-0ubuntu1) precise-proposed; urgency=low + + * New upstream bugfix release + * Added watch file + + -- Rohan Garg Sun, 15 Apr 2012 21:59:13 +0200 + kdevelop-php (1.3.0-0ubuntu1) precise; urgency=low * New upstream release diff -Nru kdevelop-php-1.3.0/debian/control kdevelop-php-1.3.1/debian/control --- kdevelop-php-1.3.0/debian/control 2012-03-22 12:53:51.000000000 +0000 +++ kdevelop-php-1.3.1/debian/control 2012-04-15 20:11:27.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Fathi Boudra , Modestas Vainius , Andreas Cord-Landwehr Build-Depends: debhelper (>= 7.4.15), cmake (>= 2.8.0), pkg-kde-tools (>= 0.6.4), - kdevplatform-dev (>= 1.2.90), kdevelop-pg-qt (>= 0.9.82) + kdevplatform-dev (>= 1.3.1), kdevelop-pg-qt (>= 0.9.82) Standards-Version: 3.9.2 Homepage: http://www.kdevelop.org/ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop-php.git diff -Nru kdevelop-php-1.3.0/debian/watch kdevelop-php-1.3.1/debian/watch --- kdevelop-php-1.3.0/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ kdevelop-php-1.3.1/debian/watch 2012-04-15 20:13:27.000000000 +0000 @@ -0,0 +1,3 @@ +version=3 + +ftp://ftp.kde.org/pub/kde/stable/kdevelop/([\d.]+)/src/kdevelop-php-([\d.]+).tar.bz2 diff -Nru kdevelop-php-1.3.0/duchain/builders/declarationbuilder.cpp kdevelop-php-1.3.1/duchain/builders/declarationbuilder.cpp --- kdevelop-php-1.3.0/duchain/builders/declarationbuilder.cpp 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/builders/declarationbuilder.cpp 2012-04-13 19:58:52.000000000 +0000 @@ -438,11 +438,12 @@ if ( m_upcomingClassVariables.contains(identifier) ) { if (m_actuallyRecompiling) { DUChainWriteLocker lock; - Declaration* dec = currentContext()->parentContext()->findDeclarationAt(startPos(node)); - if ( dynamic_cast(dec) ) { - // invalidate declaration, it got added - // see also bug https://bugs.kde.org/show_bug.cgi?id=241750 - delete dec; + if (Declaration* dec = currentContext()->findDeclarationAt(startPos(node))) { + if (dynamic_cast(dec)) { + // invalidate declaration, it got added + // see also bug https://bugs.kde.org/show_bug.cgi?id=241750 + delete dec; + } } } return; @@ -970,9 +971,10 @@ bool isDeclared = false; { DUChainWriteLocker lock(DUChain::lock()); + RangeInRevision range = m_editor->findRange(m_findVariable.node); foreach ( Declaration* dec, ctx->findDeclarations(m_findVariable.identifier) ) { if ( dec->kind() == Declaration::Instance ) { - if (!wasEncountered(dec)) { + if (!wasEncountered(dec) || (dec->context() == ctx && range < dec->range())) { // just like a "redeclaration", hence we must update the range // TODO: do the same for all other uses of "encounter"? dec->setRange(editorFindRange(m_findVariable.node)); diff -Nru kdevelop-php-1.3.0/duchain/expressionvisitor.cpp kdevelop-php-1.3.1/duchain/expressionvisitor.cpp --- kdevelop-php-1.3.0/duchain/expressionvisitor.cpp 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/expressionvisitor.cpp 2012-04-13 19:58:52.000000000 +0000 @@ -661,6 +661,19 @@ } } +void ExpressionVisitor::visitRelationalExpression(RelationalExpressionAst *node) +{ + DefaultVisitor::visitRelationalExpression(node); + if (node->instanceofType && node->instanceofType->identifier) { + const QualifiedIdentifier id = identifierForNamespace(node->instanceofType->identifier, m_editor); + DeclarationPointer dec = findDeclarationImport(ClassDeclarationType, node->instanceofType->identifier, + id); + usingDeclaration(node->instanceofType->identifier->namespaceNameSequence->back()->element, dec); + buildNamespaceUses(node->instanceofType->identifier, id); + m_result.setDeclaration(dec); + } +} + QString ExpressionVisitor::stringForNode(AstNode* id) { if (!id) diff -Nru kdevelop-php-1.3.0/duchain/expressionvisitor.h kdevelop-php-1.3.1/duchain/expressionvisitor.h --- kdevelop-php-1.3.0/duchain/expressionvisitor.h 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/expressionvisitor.h 2012-04-13 19:58:52.000000000 +0000 @@ -69,7 +69,8 @@ void visitUnaryExpression(UnaryExpressionAst* node); void visitAdditiveExpressionRest(AdditiveExpressionRestAst* node); void visitVariable(VariableAst* node); - virtual void visitFunctionCallParameterList( FunctionCallParameterListAst* node ); + void visitFunctionCallParameterList( FunctionCallParameterListAst* node ); + void visitRelationalExpression(RelationalExpressionAst* node); QString stringForNode(AstNode* id); KDevelop::QualifiedIdentifier identifierForNode(IdentifierAst* id); diff -Nru kdevelop-php-1.3.0/duchain/tests/duchain.cpp kdevelop-php-1.3.1/duchain/tests/duchain.cpp --- kdevelop-php-1.3.0/duchain/tests/duchain.cpp 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/tests/duchain.cpp 2012-04-13 19:58:52.000000000 +0000 @@ -1999,6 +1999,52 @@ QCOMPARE(top->problems().at(1)->finalLocation().start.line, 3); } +void TestDUChain::declareMemberOutOfClass2() +{ + // see also: https://bugs.kde.org/show_bug.cgi?id=283356 + // 0 1 2 3 4 5 6 7 + // 01234567890123456789012345678901234567890123456789012345678901234567890123456789 + QByteArray code("x = 1;\n" + "class A { var $x = 1; }"); + TopDUContext* top = parse(code, DumpAST); + QVERIFY(top); + // update + top = parse(code, DumpNone, top->url().str(), ReferencedTopDUContext(top)); + DUChainReleaser releaseTop(top); + DUChainWriteLocker lock; + + QVERIFY(top->problems().isEmpty()); + + QList decs = top->findLocalDeclarations(Identifier("a")); + QCOMPARE(decs.size(), 2); + { + Declaration *dec = decs.first(); + QVERIFY(dynamic_cast(dec)); + QVERIFY(dec->type()); + QVERIFY(dec->type()->declaration(top)->identifier().nameEquals(Identifier("a"))); + } + { + Declaration *dec = decs.last(); + QVERIFY(dynamic_cast(dec)); + QVERIFY(dec->type()); + QVERIFY(dec->type()->declaration(top)->identifier().nameEquals(Identifier("a"))); + } + + { // check if x got declared + QList decs = top->childContexts().first()->findDeclarations(Identifier("x")); + // the type of both assignments to $bar->asdf are the same, hence it should only be declared once + QCOMPARE(decs.size(), 1); + ClassMemberDeclaration* cmdec = dynamic_cast(decs.first()); + QVERIFY(cmdec); + QVERIFY(cmdec->accessPolicy() == Declaration::Public); + QVERIFY(!cmdec->isStatic()); + QVERIFY(cmdec->type()); + QCOMPARE(cmdec->type()->dataType(), (uint) IntegralType::TypeInt); + } +} + void TestDUChain::declareMemberInClassMethod() { QByteArray code("problems().isEmpty()); } +namespace QTest { + template<> + char* toString(const KDevelop::CursorInRevision& c) + { + return qstrdup( + QString("(%1, %2)") + .arg(QTest::toString(c.line)) + .arg(QTest::toString(c.column)) + .toLocal8Bit().constData()); + } + template<> + char* toString(const KDevelop::RangeInRevision& r) + { + return qstrdup( + QString("[%1, %2]") + .arg(QTest::toString(r.start)) + .arg(QTest::toString(r.end)) + .toLocal8Bit().constData()); + } +} + +void TestDUChain::bug296709() +{ + // see also: https://bugs.kde.org/show_bug.cgi?id=296709 + // 0 1 2 3 4 5 6 7 + // 01234567890123456789012345678901234567890123456789012345678901234567890123456789 + TopDUContext* top = parse( + "problems().isEmpty()); + QList< Declaration* > decs = top->findLocalDeclarations(Identifier("a")); + QCOMPARE(decs.size(), 1); + QCOMPARE(decs.at(0)->range(), RangeInRevision(1, 19, 1, 21)); + QCOMPARE(decs.at(0)->uses().count(), 1); + QCOMPARE(decs.at(0)->uses().begin()->count(), 1); + QCOMPARE(decs.at(0)->uses().begin()->first(), RangeInRevision(2, 2, 2, 4)); +} + #include "duchain.moc" diff -Nru kdevelop-php-1.3.0/duchain/tests/duchain.h kdevelop-php-1.3.1/duchain/tests/duchain.h --- kdevelop-php-1.3.0/duchain/tests/duchain.h 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/tests/duchain.h 2012-04-13 19:58:52.000000000 +0000 @@ -111,6 +111,7 @@ void unsureReferencedArgument(); void defaultArgument(); void declareMemberOutOfClass(); + void declareMemberOutOfClass2(); void declareMemberInClassMethod(); void thisRedeclaration(); void implicitArrayDeclaration(); @@ -141,6 +142,7 @@ void closureEmptyUse(); void gotoTest(); void ternary(); + void bug296709(); }; } diff -Nru kdevelop-php-1.3.0/duchain/tests/duchaintestbase.cpp kdevelop-php-1.3.1/duchain/tests/duchaintestbase.cpp --- kdevelop-php-1.3.0/duchain/tests/duchaintestbase.cpp 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/tests/duchaintestbase.cpp 2012-04-13 19:58:52.000000000 +0000 @@ -145,7 +145,8 @@ return top; } -TopDUContext* DUChainTestBase::parse(const QByteArray& unit, DumpAreas dump, QString url) +TopDUContext* DUChainTestBase::parse(const QByteArray& unit, DumpAreas dump, + QString url, TopDUContext* update) { if (dump) kDebug() << "==== Beginning new test case...:" << endl << unit; @@ -170,7 +171,7 @@ EditorIntegrator editor(&session); session.setCurrentDocument(IndexedString(url)); DeclarationBuilder declarationBuilder(&editor); - TopDUContext* top = declarationBuilder.build(session.currentDocument(), ast); + TopDUContext* top = declarationBuilder.build(session.currentDocument(), ast, ReferencedTopDUContext(update)); if (!session.problems().isEmpty()) { DUChainWriteLocker lock; @@ -200,6 +201,8 @@ } } + + if (dump) kDebug() << "===== Finished test case."; diff -Nru kdevelop-php-1.3.0/duchain/tests/duchaintestbase.h kdevelop-php-1.3.1/duchain/tests/duchaintestbase.h --- kdevelop-php-1.3.0/duchain/tests/duchaintestbase.h 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/tests/duchaintestbase.h 2012-04-13 19:58:52.000000000 +0000 @@ -107,7 +107,9 @@ void cleanupTestCase(); protected: - KDevelop::TopDUContext* parse(const QByteArray& unit, DumpAreas dump = static_cast(DumpAST | DumpDUChain | DumpType), QString fileName = QString()); + KDevelop::TopDUContext* parse(const QByteArray& unit, + DUChainTestBase::DumpAreas dump = DumpAreas(DumpAll), + QString url = QString(), KDevelop::TopDUContext* update = 0); KDevelop::TopDUContext* parseAdditionalFile(const KDevelop::IndexedString& fileName, const QByteArray& contents); diff -Nru kdevelop-php-1.3.0/duchain/tests/uses.cpp kdevelop-php-1.3.1/duchain/tests/uses.cpp --- kdevelop-php-1.3.0/duchain/tests/uses.cpp 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/tests/uses.cpp 2012-04-13 19:58:52.000000000 +0000 @@ -31,6 +31,22 @@ QTEST_MAIN(Php::TestUses) +namespace QTest { + +template<> +char* toString(const KDevelop::CursorInRevision& c) +{ + return qstrdup(qPrintable(QString("(%1, %2)").arg(c.line).arg(c.column))); +} + +template<> +char* toString(const KDevelop::RangeInRevision& r) +{ + return qstrdup(qPrintable(QString("[%1, %2]").arg(toString(r.start)).arg(toString(r.end)))); +} + +} + namespace Php { @@ -41,7 +57,7 @@ QCOMPARE(dec->uses().values().count(), 1); QCOMPARE(dec->uses().values().first().count(), ranges.count()); for (int i = 0; i < ranges.count(); ++i) { - kDebug() << dec->uses().values().first().at(i).castToSimpleRange() << ranges.at(i).castToSimpleRange(); + kDebug() << dec->uses().values().first().at(i) << ranges.at(i); QCOMPARE(dec->uses().values().first().at(i), ranges.at(i)); } } @@ -1016,6 +1032,27 @@ QVERIFY(b->uses().isEmpty()); } +void TestUses::instanceof() +{ + // 0 1 2 3 4 5 + // 012345678901234567890123456789012345678901234567890123456789 + TopDUContext* top = parse("localDeclarations().count(), 3); + + Declaration* a = top->localDeclarations().at(0); + QCOMPARE(a->identifier().toString(), QString("a")); + compareUses(a, QList() + << RangeInRevision(1, 9, 1, 10) + << RangeInRevision(2, 19, 2, 20)); + +} + } #include "uses.moc" diff -Nru kdevelop-php-1.3.0/duchain/tests/uses.h kdevelop-php-1.3.1/duchain/tests/uses.h --- kdevelop-php-1.3.0/duchain/tests/uses.h 2012-03-11 18:07:16.000000000 +0000 +++ kdevelop-php-1.3.1/duchain/tests/uses.h 2012-04-13 19:58:52.000000000 +0000 @@ -78,6 +78,7 @@ void useNamespace(); void lateStatic(); void closures(); + void instanceof(); }; } diff -Nru kdevelop-php-1.3.0/po/ca/kdevphp.po kdevelop-php-1.3.1/po/ca/kdevphp.po --- kdevelop-php-1.3.0/po/ca/kdevphp.po 2012-03-11 18:07:45.000000000 +0000 +++ kdevelop-php-1.3.1/po/ca/kdevphp.po 2012-04-13 19:59:19.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-09-10 17:18+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -87,48 +87,48 @@ msgid "Properties cannot be declared abstract." msgstr "Les propietats no es poden declarar abstractes." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "No es pot redeclarar la propietat privada %1 des d'aquest context." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "No es pot redeclarar la propietat protegida %1 des d'aquest context." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Només booleans, sencers. números de coma flotant i cadenes estan permesos " "pels constants de classes." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "El valor per omissió per paràmetres amb tipus suggerit de classe només pot " "ser NULL" -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Els paràmetres següents han de tenir un valor per omissió assignat." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "No es pot tornar a declarar la funció interna de PHP %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "No es pot tornat a declarar %1, ja s'ha declarat a %2 a la línia %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "No es pot tornar a assignar $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "La sentència «use» amb el nom no compost «%1» no té cap efecte." diff -Nru kdevelop-php-1.3.0/po/ca@valencia/kdevphp.po kdevelop-php-1.3.1/po/ca@valencia/kdevphp.po --- kdevelop-php-1.3.0/po/ca@valencia/kdevphp.po 2012-03-11 18:07:48.000000000 +0000 +++ kdevelop-php-1.3.1/po/ca@valencia/kdevphp.po 2012-04-13 19:59:21.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-09-10 17:18+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -87,48 +87,48 @@ msgid "Properties cannot be declared abstract." msgstr "Les propietats no es poden declarar abstractes." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "No es pot redeclarar la propietat privada %1 des d'este context." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "No es pot redeclarar la propietat protegida %1 des d'este context." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Només booleans, sencers. números de coma flotant i cadenes estan permesos " "pels constants de classes." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "El valor per omissió per paràmetres amb tipus suggerit de classe només pot " "ser NULL" -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Els paràmetres següents han de tindre un valor per omissió assignat." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "No es pot tornar a declarar la funció interna de PHP %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "No es pot tornat a declarar %1, ja s'ha declarat a %2 a la línia %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "No es pot tornar a assignar $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "La sentència «use» amb el nom no compost «%1» no té cap efecte." diff -Nru kdevelop-php-1.3.0/po/CMakeLists.txt kdevelop-php-1.3.1/po/CMakeLists.txt --- kdevelop-php-1.3.0/po/CMakeLists.txt 2012-03-11 18:11:18.000000000 +0000 +++ kdevelop-php-1.3.1/po/CMakeLists.txt 2012-04-13 20:02:29.000000000 +0000 @@ -5,25 +5,26 @@ if (NOT GETTEXT_MSGFMT_EXECUTABLE) MESSAGE(FATAL_ERROR "Please install msgmerge binary") endif (NOT GETTEXT_MSGFMT_EXECUTABLE) -add_subdirectory(da) -add_subdirectory(pt) -add_subdirectory(nb) add_subdirectory(nds) -add_subdirectory(en_GB) add_subdirectory(zh_CN) -add_subdirectory(de) -add_subdirectory(ca) +add_subdirectory(pl) add_subdirectory(pt_BR) -add_subdirectory(it) -add_subdirectory(ca@valencia) -add_subdirectory(et) add_subdirectory(nl) add_subdirectory(es) -add_subdirectory(fr) -add_subdirectory(fi) +add_subdirectory(pt) +add_subdirectory(zh_TW) +add_subdirectory(et) +add_subdirectory(it) +add_subdirectory(gl) +add_subdirectory(ca) add_subdirectory(sv) +add_subdirectory(de) add_subdirectory(uk) +add_subdirectory(fr) +add_subdirectory(nb) add_subdirectory(th) -add_subdirectory(pl) -add_subdirectory(zh_TW) -add_subdirectory(gl) +add_subdirectory(ca@valencia) +add_subdirectory(da) +add_subdirectory(fi) +add_subdirectory(en_GB) +add_subdirectory(el) diff -Nru kdevelop-php-1.3.0/po/da/kdevphp.po kdevelop-php-1.3.1/po/da/kdevphp.po --- kdevelop-php-1.3.0/po/da/kdevphp.po 2012-03-11 18:08:00.000000000 +0000 +++ kdevelop-php-1.3.1/po/da/kdevphp.po 2012-04-13 19:59:31.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-09-15 15:07+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -82,45 +82,45 @@ msgid "Properties cannot be declared abstract." msgstr "Properties kan ikke erklæres abstract." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "Kan ikke generklære private property %1 fra denne kontekst." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "Kan ikke generklære protected property %1 i denne kontekst." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Kun booleske, heltal, floats og strenge er tilladt som klassekonstanter." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "Standardværdi for parametre med en klassetype-tip kan kun være NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Følgende parametre må have tildelt en standardværdi." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Kan ikke generklære PHP-intern %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "Kan ikke generklære %1, der allerede er erklæret i %2 på linje %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Kan ikke generklære $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "use-erklæringen med ikke-compound navn \"%1\" har ingen virkning." diff -Nru kdevelop-php-1.3.0/po/de/kdevphp.po kdevelop-php-1.3.1/po/de/kdevphp.po --- kdevelop-php-1.3.0/po/de/kdevphp.po 2012-03-11 18:08:02.000000000 +0000 +++ kdevelop-php-1.3.1/po/de/kdevphp.po 2012-04-13 19:59:34.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-11-27 18:30+0100\n" "Last-Translator: Frederik Schwarzer \n" "Language-Team: German \n" @@ -86,54 +86,54 @@ msgid "Properties cannot be declared abstract." msgstr "Eigenschaften können nicht als abstrakt deklariert werden." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "Die private Eigenschaft %1 kann aus diesem Kontext nicht erneut deklariert " "werden." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "Die geschützte Eigenschaft %1 kann aus diesem Kontext nicht erneut " "deklariert werden." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Nur boolsche Werte, Ganzzahlen, Fließkommazahlen und Zeichenketten sind für " "Konstanten in Klassen zulässig." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "Der Vorgabewert für Parameter, dessen Typhinweis eine Klasse bezeichnet, " "darf ausschließlich NULL sein." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Folgenden Parametern muss ein Vorgabewert zugewiesen werden." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Die PHP-interne Funktion %1 kann nicht erneut deklariert werden." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "" "%1 kann nicht erneut deklariert werden, da es bereits in %2 in Zeile %3 " "deklariert ist." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "$this kann nicht erneut zugewiesen werden." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "" diff -Nru kdevelop-php-1.3.0/po/el/CMakeLists.txt kdevelop-php-1.3.1/po/el/CMakeLists.txt --- kdevelop-php-1.3.0/po/el/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ kdevelop-php-1.3.1/po/el/CMakeLists.txt 2012-04-13 19:59:36.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES(el ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru kdevelop-php-1.3.0/po/el/kdevphp.po kdevelop-php-1.3.1/po/el/kdevphp.po --- kdevelop-php-1.3.0/po/el/kdevphp.po 1970-01-01 00:00:00.000000000 +0000 +++ kdevelop-php-1.3.1/po/el/kdevphp.po 2012-04-13 19:59:36.000000000 +0000 @@ -0,0 +1,224 @@ +# translation of kdevphp.po into [el] +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Stelios , 2011. +msgid "" +msgstr "" +"Project-Id-Version: kdevphp\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" +"PO-Revision-Date: 2012-03-14 19:44+0300\n" +"Last-Translator: Stelios \n" +"Language-Team: Greek \n" +"Language: el\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 1.2\n" + +#: completion/implementationitem.cpp:69 +msgid "Override" +msgstr "Αντικατάσταση" + +#: completion/implementationitem.cpp:72 +msgid "Implement" +msgstr "Υλοποίηση" + +#: completion/implementationitem.cpp:84 +#, kde-format +msgid "From %1" +msgstr "Από %1" + +#: duchain/builders/usebuilder.cpp:141 +#, kde-format +msgid "Usage of %1 is deprecated." +msgstr "Η χρήση του %1 είναι ανεπιθύμητη." + +#: duchain/builders/contextbuilder.cpp:388 +#, kde-format +msgid "Circular inheritance of %1 and %2" +msgstr "Κυκλική κληρονομικότητα των %1 και %2" + +#: duchain/builders/declarationbuilder.cpp:309 +#, kde-format +msgid "Access type for interface method %1 must be omitted." +msgstr "Ο τύπος πρόσβασης για τη μέθοδο διεπαφής %1 πρέπει να παραλειφθεί" + +#: duchain/builders/declarationbuilder.cpp:313 +#, kde-format +msgid "Interface function %1 cannot contain body." +msgstr "Η συνάρτηση διεπαφής %1 δεν μπορεί να περιέχει το σώμα." + +#: duchain/builders/declarationbuilder.cpp:325 +#, kde-format +msgid "" +"Class %1 contains abstract method %2 and must therefore be declared abstract " +"or implement the method." +msgstr "" +"Η κλάση %1 περιέχει αφηρημένη μέθοδο %2 και συνεπώς πρέπει να δηλωθεί " +"αφηρημένη ή να υλοποιήσει τη μέθοδο." + +#: duchain/builders/declarationbuilder.cpp:331 +#, kde-format +msgid "Abstract function %1 cannot contain body." +msgstr "Η αφηρημένη συνάρτηση %1 δεν μπορεί να περιέχει το σώμα." + +#: duchain/builders/declarationbuilder.cpp:334 +msgid "Cannot use the final modifier on an abstract class member." +msgstr "" +"Δεν μπορεί να χρησιμοποιηθεί ο οριστικός τροποποιητής σε μέλος αφηρημένης " +"κλάσης." + +#: duchain/builders/declarationbuilder.cpp:344 +#, kde-format +msgid "Non-abstract method %1 must contain body." +msgstr "Η μη-αφηρημένη μέθοδος %1 πρέπει να περιέχει το σώμα." + +#: duchain/builders/declarationbuilder.cpp:358 +msgid "Properties cannot be declared final." +msgstr "Οι ιδιότητες δεν είναι δυνατό να δηλώνονται οριστικές." + +#: duchain/builders/declarationbuilder.cpp:361 +msgid "Properties cannot be declared abstract." +msgstr "Οι ιδιότητες δεν είναι δυνατό να δηλώνονται αφηρημένες." + +#: duchain/builders/declarationbuilder.cpp:461 +#, kde-format +msgid "Cannot redeclare private property %1 from this context." +msgstr "Αδυναμία επαναδήλωσης private ιδιότητας %1 από αυτό το πλαίσιο." + +#: duchain/builders/declarationbuilder.cpp:467 +#, kde-format +msgid "Cannot redeclare protected property %1 from this context." +msgstr "Αδυναμία επαναδήλωσης protected ιδιότητας %1 από αυτό το πλαίσιο." + +#: duchain/builders/declarationbuilder.cpp:530 +msgid "" +"Only booleans, ints, floats and strings are allowed for class constants." +msgstr "" +"Μόνο booleans, ints, floats και strings επιτρέπονται για σταθερές κλάσης." + +#: duchain/builders/declarationbuilder.cpp:543 +msgid "Default value for parameters with a class type hint can only be NULL." +msgstr "" +"Η προκαθορισμένη τιμή για παραμέτρους με υπόδειξη τύπου κλάσης μπορεί μόνο " +"να είναι NULL." + +#: duchain/builders/declarationbuilder.cpp:546 +msgid "Following parameters must have a default value assigned." +msgstr "" +"Οι ακόλουθες παράμετροι πρέπει να έχουν καταχώρηση προεπιλεγμένης τιμής." + +#: duchain/builders/declarationbuilder.cpp:653 +#, kde-format +msgid "Cannot redeclare PHP internal %1." +msgstr "Αδυναμία επαναδήλωσης PHP εσωτερικής %1." + +#: duchain/builders/declarationbuilder.cpp:657 +#, kde-format +msgid "Cannot redeclare %1, already declared in %2 on line %3." +msgstr "Αδυναμία επαναδήλωσης %1, ήδη δηλώθηκαν στη %2 στη γραμμή %3." + +#: duchain/builders/declarationbuilder.cpp:703 +msgid "Cannot re-assign $this." +msgstr "Αδυναμία επαναδήλωσης $this." + +#: duchain/builders/declarationbuilder.cpp:1132 +#, kde-format +msgid "The use statement with non-compound name '%1' has no effect." +msgstr "Η δήλωση use με μη-σύνθετο όνομα '%1' δεν έχει αποτέλεσμα." + +#: duchain/navigation/declarationnavigationcontext.cpp:123 +msgid "PHP internal" +msgstr "PHP εσωτερική" + +#: duchain/navigation/declarationnavigationcontext.cpp:133 +msgctxt "kind of a php-constant, as shown in the declaration tooltip" +msgid "Constant" +msgstr "Σταθερά" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:61 +msgid "magic constant" +msgstr "magic constant" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:76 +msgid "empty (not inside a class)" +msgstr "κενό (όχι μέσα σε κλάση)" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:95 +msgid "empty (not inside a method)" +msgstr "κενό (όχι μέσα σε μέθοδο)" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:105 +msgid "empty (not inside a function)" +msgstr "κενό (όχι μέσα σε συνάρτηση)" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:114 +msgid "empty (not inside a namespace)" +msgstr "κενό (όχι μέσα σε πεδίο ορισμού)" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:118 +#, kde-format +msgid "current value: %1" +msgstr "τρέχουσα τιμή: %1" + +#: parser/main.cpp:41 +msgid "php-parser" +msgstr "php-parser" + +#: parser/main.cpp:42 +msgid "KDevelop PHP parser debugging utility" +msgstr "Βοηθητικό πρόγραμμα PHP διορθώσεων συντακτικής ανάλυσης " + +#: parser/main.cpp:43 +msgid "(c) 2008 Niko Sams, 2009 Milian Wolff" +msgstr "(c) 2008 Niko Sams, 2009 Milian Wolff" + +#: parser/parsesession.cpp:73 +#, kde-format +msgid "Could not open file '%1'" +msgstr "Αδυναμία ανοίγματος αρχείου '%1'" + +#: parser/parsesession.cpp:76 +msgid "File could not be read from." +msgstr "Αδυναμία ανάγνωσης αρχείου από." + +#: parser/parsesession.cpp:79 +msgid "File could not be opened." +msgstr "Αδυναμία ανοίγματος αρχείου." + +#: parser/parsesession.cpp:82 +msgid "File permissions prevent opening for read." +msgstr "Τα δικαιώματα πρόσβασης εμποδίζουν το άνοιγμα για ανάγνωση." + +#: phplanguagesupport.cpp:62 +msgid "Php Support" +msgstr "Υποστήριξη Php" + +#: phplanguagesupport.cpp:63 +msgid "Support for Php Language" +msgstr "Υποστήριξη για τη γλώσσα Php" + +#: phplanguagesupport.cpp:64 +msgid "Milian Wolff" +msgstr "Milian Wolff" + +#: phplanguagesupport.cpp:64 phplanguagesupport.cpp:65 +msgid "Author" +msgstr "Συγγραφέας" + +#: phplanguagesupport.cpp:65 +msgid "Niko Sams" +msgstr "Niko Sams" + +#: rc.cpp:1 +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Stelios" + +#: rc.cpp:2 +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "sstavra@gmail.com" \ No newline at end of file diff -Nru kdevelop-php-1.3.0/po/en_GB/kdevphp.po kdevelop-php-1.3.1/po/en_GB/kdevphp.po --- kdevelop-php-1.3.0/po/en_GB/kdevphp.po 2012-03-11 18:08:07.000000000 +0000 +++ kdevelop-php-1.3.1/po/en_GB/kdevphp.po 2012-04-13 19:59:38.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-07-31 12:08+0100\n" "Last-Translator: Andrew Coles \n" "Language-Team: British English \n" @@ -81,45 +81,45 @@ msgid "Properties cannot be declared abstract." msgstr "Properties cannot be declared abstract." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "Cannot redeclare private property %1 from this context." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "Cannot redeclare protected property %1 from this context." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Only booleans, ints, floats and strings are allowed for class constants." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "Default value for parameters with a class type hint can only be NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Following parameters must have a default value assigned." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Cannot redeclare PHP internal %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "Cannot redeclare %1, already declared in %2 on line %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Cannot re-assign $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "The use statement with non-compound name '%1' has no effect." diff -Nru kdevelop-php-1.3.0/po/es/kdevphp.po kdevelop-php-1.3.1/po/es/kdevphp.po --- kdevelop-php-1.3.0/po/es/kdevphp.po 2012-03-11 18:08:12.000000000 +0000 +++ kdevelop-php-1.3.1/po/es/kdevphp.po 2012-04-13 19:59:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2011-02-13 10:44+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -83,50 +83,50 @@ msgid "Properties cannot be declared abstract." msgstr "Las propiedades no se pueden declarar abstractas." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "No se puede volver a declarar la propiedad privada %1 desde este contexto." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "No se puede volver a declarar la propiedad protegida %1 desde este contexto." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Solo se permiten booleanos, enteros, números en coma flotante y cadenas como " "constantes de clases." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "El valor por omisión de los parámetros con un tipo de clase sugerido so\t" "\tlo puede ser NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Los siguientes parámetros deben tener asignado un valor por omisión." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "No se puede volver a declarar la función interna de PHP %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "No se puede volver a declarar %1, ya declarada en %2 en la línea %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "No se puede volver a asignar $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "La sentencia «use» con el nombre no compuesto «%1» no tiene efecto." diff -Nru kdevelop-php-1.3.0/po/et/kdevphp.po kdevelop-php-1.3.1/po/et/kdevphp.po --- kdevelop-php-1.3.0/po/et/kdevphp.po 2012-03-11 18:08:14.000000000 +0000 +++ kdevelop-php-1.3.1/po/et/kdevphp.po 2012-04-13 19:59:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-09-13 16:43+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -83,46 +83,46 @@ msgid "Properties cannot be declared abstract." msgstr "Omadusi ei saa deklareerida abstraktsena." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "Privaatomadust %1 ei saa sellest kontekstist taasdeklareerida." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "Kaitstud omadust %1 ei saa sellest kontekstist taasdeklareerida." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Klassi konstantide puhul on lubatud ainult tõeväärtused. täisarvud, " "murdarvud ja stringid." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "Klassi tüübi vihjega parameetrite vaikeväärtus saab olla ainult NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Järgmistele parameetritele peab olema omistatud vaikeväärtus." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "PHP sisemist %1 ei saa taasdeklareerida." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "%1 ei saa taasdeklareerida, seda deklareerib juba %2 real %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Ei saa taasomistada $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "Kasutuslause mitte-liitnimega \"%1\" ei toimi." diff -Nru kdevelop-php-1.3.0/po/fi/kdevphp.po kdevelop-php-1.3.1/po/fi/kdevphp.po --- kdevelop-php-1.3.0/po/fi/kdevphp.po 2012-03-11 18:08:21.000000000 +0000 +++ kdevelop-php-1.3.1/po/fi/kdevphp.po 2012-04-13 19:59:51.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2012-01-13 17:01+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" @@ -83,49 +83,49 @@ msgid "Properties cannot be declared abstract." msgstr "Ominaisuutta ei voi esitellä abstraktiksi." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "Ei voida esitellä uudelleen private-ominaisuutta %1 tästä asiayhteydestä." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "Ei voida esitellä uudelleen protected-ominaisuutta %1 tästä asiayhteydestä." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Vain boolean-muuttujat, kokonaisluvut, liukuluvut ja merkkijonot sallitaan " "luokkavakioina." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "Oletusarvo parametreille luokkatyyppivihjeellä voi olla vain NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Seuraaville parametreilla on oltava oletusarvo." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Ei voida esitellä uudelleen PHP:n sisäistä %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "" "Ei voida esitellä uudelleen %1, se on jo esitelty kohteessa %2 rivillä %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Muuttujaan $this ei voida sijoittaa uudelleen." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "" diff -Nru kdevelop-php-1.3.0/po/fr/kdevphp.po kdevelop-php-1.3.1/po/fr/kdevphp.po --- kdevelop-php-1.3.0/po/fr/kdevphp.po 2012-03-11 18:08:23.000000000 +0000 +++ kdevelop-php-1.3.1/po/fr/kdevphp.po 2012-04-13 19:59:53.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-07-16 08:11+0200\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" @@ -86,54 +86,54 @@ msgid "Properties cannot be declared abstract." msgstr "Impossible que les propriétés soient déclarées abstraites." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "Impossible de déclarer à nouveau la propriété privée %1 à partir de ce " "contexte." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "Impossible de déclarer à nouveau la propriété protégée %1 à partir de ce " "contexte." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Seuls les booléens, les entiers, les flottants et les chaînes sont autorisés " "pour les constantes de classes." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "La valeur par défaut des paramètres comportant une suggestion de type de " "classe ne peut être que NULLE." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "" "Les paramètres suivants doivent comporter une valeur par défaut affectée." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Impossible de déclarer à nouveau la fonction interne PHP %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "" "Impossible de déclarer à nouveau %1, déjà déclaré dans %2 sur la ligne %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Impossible d'affecter à nouveau $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "" diff -Nru kdevelop-php-1.3.0/po/gl/kdevphp.po kdevelop-php-1.3.1/po/gl/kdevphp.po --- kdevelop-php-1.3.0/po/gl/kdevphp.po 2012-03-11 18:08:31.000000000 +0000 +++ kdevelop-php-1.3.1/po/gl/kdevphp.po 2012-04-13 20:00:00.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2012-02-16 00:29+0100\n" "Last-Translator: Xosé \n" "Language-Team: Galician \n" @@ -90,50 +90,50 @@ msgid "Properties cannot be declared abstract." msgstr "As propriedades non se poden declarar como abstractas." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "Non se pode declarar de novo a propriedade privada %1 desde este contexto." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "Non se pode declarar de novo a propriedade protexida %1 desde este contexto." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Só se permiten valores booleanos, enteiros, de vírgula flutuante ou cadeas " "para as constantes das clases." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "O valor por omisión dos parámetros cunha suxestión de tipo de clase só pode " "ser NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Os parámetros seguintes teñen que ter asignado un valor por omisión." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Non se pode declarar de novo %1 interno de PHP." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "Non se pode declarar de novo %1, xa foi declarado na liña %3 de %2." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Non se pode asignar de novo $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "A declaración use co nome non composto «%1» non ten efecto." diff -Nru kdevelop-php-1.3.0/po/it/kdevphp.po kdevelop-php-1.3.1/po/it/kdevphp.po --- kdevelop-php-1.3.0/po/it/kdevphp.po 2012-03-11 18:09:01.000000000 +0000 +++ kdevelop-php-1.3.1/po/it/kdevphp.po 2012-04-13 20:00:27.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-07-31 17:28+0200\n" "Last-Translator: Simone Solinas \n" "Language-Team: Italian \n" @@ -83,48 +83,48 @@ msgid "Properties cannot be declared abstract." msgstr "Impossibile dichiarare astratte le proprietà." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "Impossibile ridichiarare privata la proprietà %1 da questo contesto." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "Impossibile ridichiarare protetta la proprietà %1 da questo contesto." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Solo i boolean, int, float e string sono ammessi per le costanti delle " "classi." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "Il valore predefinito per i parametri con un class type hint può essere solo " "NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "I seguenti parametri devono avere un valore assegnato predefinito." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Impossibile ridichiarare la funzione PHP interna %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "Impossibile ridichiarare %1, già dichiarata in %2 alla riga %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Impossibile riassegnare $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "L'istruzione usata con nome non composto «%1» non ha effetto." diff -Nru kdevelop-php-1.3.0/po/nb/kdevphp.po kdevelop-php-1.3.1/po/nb/kdevphp.po --- kdevelop-php-1.3.0/po/nb/kdevphp.po 2012-03-11 18:09:42.000000000 +0000 +++ kdevelop-php-1.3.1/po/nb/kdevphp.po 2012-04-13 20:01:02.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-12 11:15+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-12-31 14:54+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -83,44 +83,44 @@ msgid "Properties cannot be declared abstract." msgstr "Egenskaper kan ikke deklareres abstrakt." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "Kan ikke redeklarere private egenskap %1 fra denne konteksten." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "Kan ikke redeklarere protected egenskap %1 fra denne konteksten." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "Bare boolean, int, float og string er tillatt for klassekonstanter." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "Standardverdi for parametre med et klassetype-hint kan bare være NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Følgende parametre må ha tilordnet en standardverdi." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Kan ikke re-deklarere PHP intern %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "Kan ikke re-deklarere %1, allerede deklarert i %2 på linje %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Kan ikke gi $this ny tilordning." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "use-setningen med ikke-sammensatt navn «%1» har ingen effekt." @@ -188,23 +188,23 @@ msgid "File permissions prevent opening for read." msgstr "Filtillatelser tillater ikke åpning for lesing." -#: phplanguagesupport.cpp:60 +#: phplanguagesupport.cpp:62 msgid "Php Support" msgstr "PHP-støtte" -#: phplanguagesupport.cpp:60 +#: phplanguagesupport.cpp:63 msgid "Support for Php Language" msgstr "Støtte for PHP-språket" -#: phplanguagesupport.cpp:61 +#: phplanguagesupport.cpp:64 msgid "Milian Wolff" msgstr "Milian Wolff" -#: phplanguagesupport.cpp:61 phplanguagesupport.cpp:62 +#: phplanguagesupport.cpp:64 phplanguagesupport.cpp:65 msgid "Author" msgstr "Forfatter" -#: phplanguagesupport.cpp:62 +#: phplanguagesupport.cpp:65 msgid "Niko Sams" msgstr "Niko Sams" diff -Nru kdevelop-php-1.3.0/po/nds/kdevphp.po kdevelop-php-1.3.1/po/nds/kdevphp.po --- kdevelop-php-1.3.0/po/nds/kdevphp.po 2012-03-11 18:09:44.000000000 +0000 +++ kdevelop-php-1.3.1/po/nds/kdevphp.po 2012-04-13 20:01:04.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-09-09 11:02+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -82,51 +82,51 @@ msgid "Properties cannot be declared abstract." msgstr "Egenschappen laat sik nich afstrakt angeven." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "Privaat Egenschap %1 lett sik ut dissen Kontext nich nochmaal verkloren." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "Schuult Egenschap %1 lett sik ut dissen Kontext nich nochmaal verkloren." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "För Klass-Konstanten sünd bloots Heeltall-, Fleetkomma-, boolsch Weerten un " "Tekenkeden tolaten." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "Standardweerten för Parameters mit en Klassentyp-Henwies köönt bloots NULL " "wesen." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "För disse Parameters deit towiest Standardweerten noot." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "PHP-Internal %1 lett sik nich nochmaal angeven." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "" "%1 lett sik nich nochmaal verkloren, dat wöör al in %2, Reeg %3 verkloort." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "\"$this\" lett sik nich nochmaal towiesen." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "" diff -Nru kdevelop-php-1.3.0/po/nl/kdevphp.po kdevelop-php-1.3.1/po/nl/kdevphp.po --- kdevelop-php-1.3.0/po/nl/kdevphp.po 2012-03-11 18:09:49.000000000 +0000 +++ kdevelop-php-1.3.1/po/nl/kdevphp.po 2012-04-13 20:01:08.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-09-09 17:03+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -82,48 +82,48 @@ msgid "Properties cannot be declared abstract." msgstr "Eigenschappen kunnen niet abstract worden gedeclareerd." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "Kan private eigenschap %1 van deze context niet opnieuw declareren." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "Kan beschermde eigenschap %1 van deze context niet opnieuw declareren." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Alleen booleans, ints, floats en strings zijn toegestaan voor " "klasseconstanten." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "Standaardwaarde voor parameters met een klassetype tip kunnen alleen NULL " "zijn." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Aan de volgende parameters moet een standaardwaarde worden toegekend." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Kan PHP-intern %1 niet opnieuw declareren." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "Kan %1 niet opnieuw declareren, is al gedeclareerd in %2 op regel %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Kan $this niet opnieuw toekennen." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "Het gebruiksstatement met niet-compound naam '%1' heeft geen effect." diff -Nru kdevelop-php-1.3.0/po/pl/kdevphp.po kdevelop-php-1.3.1/po/pl/kdevphp.po --- kdevelop-php-1.3.0/po/pl/kdevphp.po 2012-03-11 18:10:03.000000000 +0000 +++ kdevelop-php-1.3.1/po/pl/kdevphp.po 2012-04-13 20:01:21.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2011-07-28 13:28+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -82,49 +82,49 @@ msgid "Properties cannot be declared abstract." msgstr "Nie można zadeklarować właściwości abstrakcyjnie." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "Nie można ponownie zdeklarować prywatnej właściwości %1 z tego kontekstu." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "Nie można ponownie zdeklarować chronionej właściwości %1 z tego kontekstu." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Dla stałych klas dozwolone są tylko wartości bolkowskie, l. całkowite, l. " "zmiennoprzecinkowe i ciągi znaków." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "Domyślna wartość parametrów o typie klasy hint może być tylko NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Następujące parametry muszą mieć przypisaną domyślną wartość." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Nie można ponownie zadeklarować wewnętrznej PHP %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "" "Nie można ponownie zadeklarować %1, już zadeklarowane w %2 w wierszu %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Nie można ponownie przypisać $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "Wyrażenie use bez złożonej nazwy '%1' nie ma efektu." diff -Nru kdevelop-php-1.3.0/po/pt/kdevphp.po kdevelop-php-1.3.1/po/pt/kdevphp.po --- kdevelop-php-1.3.0/po/pt/kdevphp.po 2012-03-11 18:10:07.000000000 +0000 +++ kdevelop-php-1.3.1/po/pt/kdevphp.po 2012-04-13 20:01:25.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-07-15 11:15+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -79,52 +79,52 @@ msgid "Properties cannot be declared abstract." msgstr "As propriedades não podem ser abstractas." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "Não é possível declarar de novo a propriedade privada %1 deste contexto." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "Não é possível declarar de novo a propriedade protegida %1 deste contexto." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Somente são permitidos booleanos, inteiros, 'floats' e sequências de texto " "como constantes das classes." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "O valor por omissão dos parâmetros com uma sugestão de tipo de classe só " "pode ser NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Os parâmetros seguintes deverão ter um valor por omissão associado." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Não é possível declarar de novo o item interno de PHP %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "" "Não é possível declarar de novo o %1, por já estar declarado em %2, na linha " "%3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Não é possível atribuir de novo o $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "A instrução 'use' com um nome não-composto '%1' não tem efeito." diff -Nru kdevelop-php-1.3.0/po/pt_BR/kdevphp.po kdevelop-php-1.3.1/po/pt_BR/kdevphp.po --- kdevelop-php-1.3.0/po/pt_BR/kdevphp.po 2012-03-11 18:10:10.000000000 +0000 +++ kdevelop-php-1.3.1/po/pt_BR/kdevphp.po 2012-04-13 20:01:27.000000000 +0000 @@ -6,13 +6,14 @@ # Marcus Vinícius de Andrade Gama , 2010. # André Marcelo Alvarenga , 2010, 2011. # Aracele Torres , 2010. +# André Marcelo Alvarenga , 2012. msgid "" msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" -"PO-Revision-Date: 2011-08-07 14:05-0300\n" -"Last-Translator: André Marcelo Alvarenga \n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" +"PO-Revision-Date: 2012-03-14 00:20-0300\n" +"Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -86,52 +87,52 @@ msgid "Properties cannot be declared abstract." msgstr "As propriedades não podem ser abstratas." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "Não é possível declarar de novo a propriedade privada %1 deste contexto." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "Não é possível declarar de novo a propriedade protegida %1 deste contexto." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Somente são permitidos booleanos, inteiros, 'floats' e sequências de texto " "como constantes das classes." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "O valor padrão dos parâmetros com uma sugestão de tipo de classe só pode ser " "NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Os seguintes parâmetros devem ter um valor padrão atribuído." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Não é possível declarar de novo o item interno de PHP %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "" "Não é possível declarar de novo o %1, por já estar declarado em %2, na linha " "%3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Não é possível atribuir de novo o $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "A instrução 'use' com um nome não-composto '%1' não tem efeito." diff -Nru kdevelop-php-1.3.0/po/sv/kdevphp.po kdevelop-php-1.3.1/po/sv/kdevphp.po --- kdevelop-php-1.3.0/po/sv/kdevphp.po 2012-03-11 18:10:40.000000000 +0000 +++ kdevelop-php-1.3.1/po/sv/kdevphp.po 2012-04-13 20:01:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-07-15 21:12+0200\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -82,46 +82,46 @@ msgid "Properties cannot be declared abstract." msgstr "Egenskaper kan inte deklareras som abstrakta." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "Kan inte deklarera om privat egenskap %1 i detta sammanhang." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "Kan inte deklarera om skyddad egenskap %1 i detta sammanhang." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Bara Boolean, heltal, flyttal och strängar är tillåtna i klasskonstanter." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "Förvalt värde för parametrar med ett tips om klasstyp kan bara vara NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Följande parametrar måste ha ett tilldelat förvalt värde." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Kan inte deklarera om PHP-internobjekt %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "Kan inte deklarera om %1, redan deklarerad i %2 på rad %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Kan inte ändra tilldelning av $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "" diff -Nru kdevelop-php-1.3.0/po/th/kdevphp.po kdevelop-php-1.3.1/po/th/kdevphp.po --- kdevelop-php-1.3.0/po/th/kdevphp.po 2012-03-11 18:10:49.000000000 +0000 +++ kdevelop-php-1.3.1/po/th/kdevphp.po 2012-04-13 20:02:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-05-27 22:25+0700\n" "Last-Translator: Phuwanat Sakornsakolpat \n" "Language-Team: Thai \n" @@ -81,44 +81,44 @@ msgid "Properties cannot be declared abstract." msgstr "ไม่สามารถประกาศคุณสมบัติเป็น abstract ได้" -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "ไม่สามารถจะประกาศคุณสมบัติส่วนตัว %1 จากบริบทนี้ซ้ำอีกได้" -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "ไม่สามารถจะประกาศคุณสมบัติที่ถูกป้องกัน %1 จากบริบทนี้ซ้ำอีกได้" -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "อนุญาตเฉพาะ booleans, ints, floats และ strings เท่านั้นสำหรับค่าคงที่คลาส" -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "ค่าปริยายสำหรับพารามิเตอร์ที่เป็น class type hint เป็นได้เฉพาะ'ว่าง' (NULL)" -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "พารามิเตอร์ต่อไปนี้ต้องมีการกำหนดค่าปริยายไว้" -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "ไม่สามารถประกาศ PHP internal %1 ซ้ำได้" -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "ไม่สามารถประกาศ %1 เนื่องจากได้ประกาศไว้แล้วใน %2 บรรทัดที่ %3" -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "ไม่สามารถจะกำหนดค่า (assign) $this ซ้ำได้" -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "" diff -Nru kdevelop-php-1.3.0/po/uk/kdevphp.po kdevelop-php-1.3.1/po/uk/kdevphp.po --- kdevelop-php-1.3.0/po/uk/kdevphp.po 2012-03-11 18:10:59.000000000 +0000 +++ kdevelop-php-1.3.1/po/uk/kdevphp.po 2012-04-13 20:02:12.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-07-15 08:13+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -84,49 +84,49 @@ msgid "Properties cannot be declared abstract." msgstr "Властивості не можна оголошувати як abstract." -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "" "З цього контексту не можна повторно оголошувати приватну властивість %1." -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "" "З цього контексту не можна повторно оголошувати захищену властивість %1." -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "" "Константами класу можуть бути лише значення таких типів: boolean, int, float " "і string." -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "" "Типовим значенням для параметрів з підказкою типу класу може бути лише NULL." -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "Параметрам з наведеного нижче списку слід призначити типове значення." -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "Не можна повторно оголошувати внутрішнє для PHP %1." -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "Не можна повторно оголошувати %1, вже оголошене у %2, рядок %3." -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "Не вдалося перепризначити $this." -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "Оператор використання з нескладеною назвою «%1» не працюватиме." diff -Nru kdevelop-php-1.3.0/po/zh_CN/kdevphp.po kdevelop-php-1.3.1/po/zh_CN/kdevphp.po --- kdevelop-php-1.3.0/po/zh_CN/kdevphp.po 2012-03-11 18:11:13.000000000 +0000 +++ kdevelop-php-1.3.1/po/zh_CN/kdevphp.po 2012-04-13 20:02:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-11-16 14:21+0800\n" "Last-Translator: Ni Hui \n" "Language-Team: Chinese Simplified \n" @@ -79,44 +79,44 @@ msgid "Properties cannot be declared abstract." msgstr "属性无法声明为抽象。" -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "无法从上下文重新声明私有属性 %1。" -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "无法从上下文重新声明受保护属性 %1。" -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "只有布尔型、整型、浮点型和字符串允许用于类常量。" -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "类类型参数的默认值只能是 NULL。" -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "以下参数必须指派默认值。" -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "无法重新声明 PHP 内部 %1。" -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "无法重新声明 %1，已经在行 %3 上的 %2 中声明。" -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "无法重新赋值 $this。" -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "" diff -Nru kdevelop-php-1.3.0/po/zh_TW/kdevphp.po kdevelop-php-1.3.1/po/zh_TW/kdevphp.po --- kdevelop-php-1.3.0/po/zh_TW/kdevphp.po 2012-03-11 18:11:18.000000000 +0000 +++ kdevelop-php-1.3.1/po/zh_TW/kdevphp.po 2012-04-13 20:02:28.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdevphp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-30 12:28+0200\n" "PO-Revision-Date: 2010-10-29 09:05+0800\n" "Last-Translator: Franklin Weng \n" "Language-Team: Chinese Traditional \n" @@ -82,44 +82,44 @@ msgid "Properties cannot be declared abstract." msgstr "屬性不能被宣告為 abstract。" -#: duchain/builders/declarationbuilder.cpp:460 +#: duchain/builders/declarationbuilder.cpp:461 #, kde-format msgid "Cannot redeclare private property %1 from this context." msgstr "無法從此內文重新宣告私密屬性 %1。" -#: duchain/builders/declarationbuilder.cpp:466 +#: duchain/builders/declarationbuilder.cpp:467 #, kde-format msgid "Cannot redeclare protected property %1 from this context." msgstr "無法從此內文重新宣告保護屬性 %1。" -#: duchain/builders/declarationbuilder.cpp:529 +#: duchain/builders/declarationbuilder.cpp:530 msgid "" "Only booleans, ints, floats and strings are allowed for class constants." msgstr "類別常數只能使用布林值、整數、浮點數與字串。" -#: duchain/builders/declarationbuilder.cpp:542 +#: duchain/builders/declarationbuilder.cpp:543 msgid "Default value for parameters with a class type hint can only be NULL." msgstr "有類別型態提示的參數預設值只能為 NULL。" -#: duchain/builders/declarationbuilder.cpp:545 +#: duchain/builders/declarationbuilder.cpp:546 msgid "Following parameters must have a default value assigned." msgstr "接下來的參數必須指定預設值。" -#: duchain/builders/declarationbuilder.cpp:652 +#: duchain/builders/declarationbuilder.cpp:653 #, kde-format msgid "Cannot redeclare PHP internal %1." msgstr "無法重新宣告 PHP internal %1。" -#: duchain/builders/declarationbuilder.cpp:656 +#: duchain/builders/declarationbuilder.cpp:657 #, kde-format msgid "Cannot redeclare %1, already declared in %2 on line %3." msgstr "無法重新宣告 %1，已宣告於 %2，第 %3 行。" -#: duchain/builders/declarationbuilder.cpp:702 +#: duchain/builders/declarationbuilder.cpp:703 msgid "Cannot re-assign $this." msgstr "無法重新指定 $this。" -#: duchain/builders/declarationbuilder.cpp:1130 +#: duchain/builders/declarationbuilder.cpp:1132 #, kde-format msgid "The use statement with non-compound name '%1' has no effect." msgstr "使用非複合（non-compound）名稱 %1 的 use 敘述沒有效果。"