diff -Nru kdevelop-php-5.1.1/CMakeLists.txt kdevelop-php-5.1.2/CMakeLists.txt
--- kdevelop-php-5.1.1/CMakeLists.txt	2017-05-13 10:11:45.000000000 +0000
+++ kdevelop-php-5.1.2/CMakeLists.txt	2017-08-15 09:28:49.000000000 +0000
@@ -4,7 +4,7 @@
 
 set(KDEVPHP_VERSION_MAJOR 5)
 set(KDEVPHP_VERSION_MINOR 1)
-set(KDEVPHP_VERSION_PATCH 1)
+set(KDEVPHP_VERSION_PATCH 2)
 # KDevplatform dependency version
 set( KDEVPLATFORM_VERSION "${KDEVPHP_VERSION_MAJOR}.${KDEVPHP_VERSION_MINOR}.${KDEVPHP_VERSION_PATCH}" )
 
diff -Nru kdevelop-php-5.1.1/completion/CMakeLists.txt kdevelop-php-5.1.2/completion/CMakeLists.txt
--- kdevelop-php-5.1.1/completion/CMakeLists.txt	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/completion/CMakeLists.txt	2017-08-15 09:28:35.000000000 +0000
@@ -1,4 +1,6 @@
-add_subdirectory(tests)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
 
 set(completion_SRCS
     worker.cpp
diff -Nru kdevelop-php-5.1.1/debian/changelog kdevelop-php-5.1.2/debian/changelog
--- kdevelop-php-5.1.1/debian/changelog	2017-07-06 22:34:44.000000000 +0000
+++ kdevelop-php-5.1.2/debian/changelog	2017-08-29 23:21:10.000000000 +0000
@@ -1,3 +1,9 @@
+kdevelop-php (5.1.2-1ubuntu1) artful; urgency=medium
+
+  * New upstream bugfix release (5.1.2)
+
+ -- Rik Mills <rikmills@kubuntu.org>  Wed, 30 Aug 2017 00:21:10 +0100
+
 kdevelop-php (5.1.1-1ubuntu1) artful; urgency=medium
 
   * Merge with debian. Remaining changes
diff -Nru kdevelop-php-5.1.1/debian/control kdevelop-php-5.1.2/debian/control
--- kdevelop-php-5.1.1/debian/control	2017-07-06 22:34:44.000000000 +0000
+++ kdevelop-php-5.1.2/debian/control	2017-08-29 23:21:10.000000000 +0000
@@ -17,7 +17,7 @@
                libkf5texteditor-dev,
                libkf5threadweaver-dev,
                kdevelop-pg-qt (>= 2.0),
-               kdevplatform-dev (>= 5.1.1),
+               kdevplatform-dev (>= 5.1.2),
                pkg-kde-tools (>= 0.15.16),
 Standards-Version: 4.0.0
 Homepage: http://www.kdevelop.org/
@@ -26,7 +26,7 @@
 
 Package: kdevelop-php
 Architecture: any
-Depends: kdevelop (>= 4:5.1.1), ${misc:Depends}, ${shlibs:Depends}
+Depends: kdevelop (>= 4:5.1.2), ${misc:Depends}, ${shlibs:Depends}
 Suggests: kdevelop-php-l10n
 Enhances: kdevelop
 Description: PHP plugin for KDevelop
diff -Nru kdevelop-php-5.1.1/docs/kcm_kdevphpdocs.desktop.cmake kdevelop-php-5.1.2/docs/kcm_kdevphpdocs.desktop.cmake
--- kdevelop-php-5.1.1/docs/kcm_kdevphpdocs.desktop.cmake	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/docs/kcm_kdevphpdocs.desktop.cmake	2017-08-15 09:28:35.000000000 +0000
@@ -32,6 +32,7 @@
 Name[sk]=Dokumentácia PHP
 Name[sl]=Dokumentacija za PHP
 Name[sv]=PHP-dokumentation
+Name[tr]=PHP Belgelendirmesi
 Name[uk]=Документація з PHP
 Name[x-test]=xxPHP Documentationxx
 Name[zh_CN]=PHP 文档
diff -Nru kdevelop-php-5.1.1/duchain/builders/typebuilder.cpp kdevelop-php-5.1.2/duchain/builders/typebuilder.cpp
--- kdevelop-php-5.1.1/duchain/builders/typebuilder.cpp	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/duchain/builders/typebuilder.cpp	2017-08-15 09:28:35.000000000 +0000
@@ -540,12 +540,15 @@
                 if (classDec->isPublicBaseClass(iteratorDecl, currentContext()->topContext())) {
                     /// Qualified identifier for 'current'
                     static const QualifiedIdentifier currentQId(QStringLiteral("current"));
-                    foreach (Declaration *d, classDec->internalContext()->findDeclarations(currentQId)) {
-                        if (!dynamic_cast<ClassMethodDeclaration*>(d)) continue;
-                        Q_ASSERT(d->type<FunctionType>());
-                        injectType(d->type<FunctionType>()->returnType());
-                        foundType = true;
-                        // qCDebug(DUCHAIN) << "that's it: " << d->type<FunctionType>()->returnType()->toString();
+                    auto classContext = classDec->internalContext();
+                    if (classContext) {
+                        foreach (Declaration *d, classContext->findDeclarations(currentQId)) {
+                            if (!dynamic_cast<ClassMethodDeclaration*>(d)) continue;
+                            Q_ASSERT(d->type<FunctionType>());
+                            injectType(d->type<FunctionType>()->returnType());
+                            foundType = true;
+                            // qCDebug(DUCHAIN) << "that's it: " << d->type<FunctionType>()->returnType()->toString();
+                        }
                     }
                 }
             }
diff -Nru kdevelop-php-5.1.1/duchain/CMakeLists.txt kdevelop-php-5.1.2/duchain/CMakeLists.txt
--- kdevelop-php-5.1.1/duchain/CMakeLists.txt	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/duchain/CMakeLists.txt	2017-08-15 09:28:35.000000000 +0000
@@ -1,5 +1,8 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_subdirectory(tests)
+
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
 
 set(duchain_SRCS
     types/integraltypeextended.cpp
diff -Nru kdevelop-php-5.1.1/duchain/tests/duchain_multiplefiles.cpp kdevelop-php-5.1.2/duchain/tests/duchain_multiplefiles.cpp
--- kdevelop-php-5.1.1/duchain/tests/duchain_multiplefiles.cpp	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/duchain/tests/duchain_multiplefiles.cpp	2017-08-15 09:28:35.000000000 +0000
@@ -30,6 +30,7 @@
 #include <tests/testfile.h>
 #include <language/duchain/declaration.h>
 #include <language/duchain/problem.h>
+#include <language/duchain/types/integraltype.h>
 
 QTEST_MAIN(Php::TestDUChainMultipleFiles)
 
@@ -294,3 +295,30 @@
         QCOMPARE(top->problems().at(0)->range(), RangeInRevision(2, 3, 2, 7));
     }
 }
+
+void TestDUChainMultipleFiles::testIteratorForeachReparse() {
+    TestFile file(QStringLiteral("<?php\n/*\n\n/*\n*/\nforeach (new A() as $a) {}\nclass A implements Iterator {\npublic function current() { return 0; }\n}"), QStringLiteral("php"));
+
+    auto features = TopDUContext::AllDeclarationsAndContexts;
+
+    for (int i = 0; i < 2; ++i) {
+        if (i == 1) {
+            file.setFileContents(QStringLiteral("<?php\n/*\n*/\n\n/*\n*/\nforeach (new A() as $a) {}\nclass A implements Iterator {\npublic function current() { return 0; }\n}"));
+            features = static_cast<TopDUContext::Features>(features | TopDUContext::ForceUpdate);
+        }
+
+        file.parse(features);
+        QVERIFY(file.waitForParsed());
+
+        DUChainReadLocker lock;
+        auto top = file.topContext();
+        QVERIFY(top);
+        QVERIFY(top->localDeclarations().size() == 2);
+        QCOMPARE(top->localDeclarations().at(0)->qualifiedIdentifier(), QualifiedIdentifier("a"));
+
+        IntegralType::Ptr type = top->localDeclarations().at(0)->type<IntegralType>();
+        QVERIFY(type);
+        //Should actually parse as an TypeInt, but this does not work.
+        QVERIFY(type->dataType() == IntegralType::TypeMixed);
+    }
+}
diff -Nru kdevelop-php-5.1.1/duchain/tests/duchain_multiplefiles.h kdevelop-php-5.1.2/duchain/tests/duchain_multiplefiles.h
--- kdevelop-php-5.1.1/duchain/tests/duchain_multiplefiles.h	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/duchain/tests/duchain_multiplefiles.h	2017-08-15 09:28:35.000000000 +0000
@@ -45,6 +45,7 @@
     void testForeachImportedIdentifier();
     void testUpdateForeach();
     void testTodoExtractorReparse();
+    void testIteratorForeachReparse();
 private:
     KDevelop::TestProjectController* m_projectController;
 };
diff -Nru kdevelop-php-5.1.1/kdevphpversion.h.cmake kdevelop-php-5.1.2/kdevphpversion.h.cmake
--- kdevelop-php-5.1.1/kdevphpversion.h.cmake	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/kdevphpversion.h.cmake	2017-08-15 09:28:35.000000000 +0000
@@ -20,12 +20,14 @@
 #ifndef KDEVPHP_VERSION_H
 #define KDEVPHP_VERSION_H
 
+#include <qglobal.h>
+
 #define KDEVPHP_MAJOR_VERSION @KDEVPHP_VERSION_MAJOR@
 #define KDEVPHP_MINOR_VERSION @KDEVPHP_VERSION_MINOR@
 #define KDEVPHP_PATCH_VERSION @KDEVPHP_VERSION_PATCH@
 
 #define KDEVPHP_VERSION_STR "@KDEVPHP_VERSION_MAJOR@.@KDEVPHP_VERSION_MINOR@.@KDEVPHP_VERSION_PATCH@"
 
-#define KDEVPHP_VERSION KDE_MAKE_VERSION(@KDEVPHP_VERSION_MAJOR@, @KDEVPHP_VERSION_MINOR@, @KDEVPHP_VERSION_PATCH@)
+#define KDEVPHP_VERSION QT_VERSION_CHECK(@KDEVPHP_VERSION_MAJOR@, @KDEVPHP_VERSION_MINOR@, @KDEVPHP_VERSION_PATCH@)
 
 #endif
diff -Nru kdevelop-php-5.1.1/parser/CMakeLists.txt kdevelop-php-5.1.2/parser/CMakeLists.txt
--- kdevelop-php-5.1.1/parser/CMakeLists.txt	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/parser/CMakeLists.txt	2017-08-15 09:28:35.000000000 +0000
@@ -1,4 +1,6 @@
-add_subdirectory(test)
+if(BUILD_TESTING)
+    add_subdirectory(test)
+endif()
 
 set(parser_STAT_SRCS
     phplexer.cpp
@@ -11,6 +13,7 @@
     "${php_SOURCE_DIR}/parser/phplexer.h"
 )
 
+
 add_library(kdevphpparser SHARED ${parser_SRCS} ${parser_STAT_SRCS})
 
 generate_export_header(kdevphpparser EXPORT_MACRO_NAME KDEVPHPPARSER_EXPORT
@@ -20,18 +23,13 @@
     KF5::I18n
 )
 
-add_executable(php-parser main.cpp)
-
-# hack to make phpdebugvisitor.h (generated at compile time)
-# use the correct EXPORT tags when compiling in MinGW
-if (MINGW)
-    add_definitions(-DMAKE_KDEV4PHPPARSER_LIB)
-endif (MINGW)
-
-target_link_libraries(php-parser
-    KDev::Tests
-    KDev::Language
-    kdevphpparser
-)
+if(BUILD_TESTING)
+    add_executable(php-parser main.cpp)
+    target_link_libraries(php-parser
+        KDev::Tests
+        KDev::Language
+        kdevphpparser
+    )
+endif()
 
 install(TARGETS kdevphpparser DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nru kdevelop-php-5.1.1/po/cs/kdevphp.po kdevelop-php-5.1.2/po/cs/kdevphp.po
--- kdevelop-php-5.1.1/po/cs/kdevphp.po	2017-05-13 10:11:38.000000000 +0000
+++ kdevelop-php-5.1.2/po/cs/kdevphp.po	2017-08-15 09:28:43.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák <vit@pelcak.org>, 2010, 2011, 2012, 2014, 2016.
+# Vít Pelčák <vit@pelcak.org>, 2010, 2011, 2012, 2014, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kdevphp\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2017-05-13 05:03+0200\n"
-"PO-Revision-Date: 2016-08-29 09:24+0100\n"
+"PO-Revision-Date: 2017-07-27 15:39+0100\n"
 "Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -319,12 +319,12 @@
 #: parser/main.cpp:38
 #, kde-format
 msgid "php-parser"
-msgstr ""
+msgstr "php-parser"
 
 #: parser/main.cpp:39
 #, kde-format
 msgid "KDevelop PHP parser debugging utility"
-msgstr ""
+msgstr "Ladicí nástroj pro analýzu PHP pro KDevelop"
 
 #: parser/main.cpp:40
 #, kde-format
@@ -354,4 +354,4 @@
 #: testprovider/phpunitrunjob.cpp:84
 #, kde-format
 msgid "PHPUnit"
-msgstr ""
\ No newline at end of file
+msgstr "PHPUnit"
\ No newline at end of file
diff -Nru kdevelop-php-5.1.1/po/en_GB/kdevphp.po kdevelop-php-5.1.2/po/en_GB/kdevphp.po
--- kdevelop-php-5.1.1/po/en_GB/kdevphp.po	2017-05-13 10:11:38.000000000 +0000
+++ kdevelop-php-5.1.2/po/en_GB/kdevphp.po	2017-08-15 09:28:43.000000000 +0000
@@ -8,9 +8,9 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2017-05-13 05:03+0200\n"
-"PO-Revision-Date: 2017-03-05 11:16+0000\n"
+"PO-Revision-Date: 2017-05-21 17:49+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
-"Language-Team: English <kde-l10n-en_gb@kde.org>\n"
+"Language-Team: English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -256,16 +256,13 @@
 msgstr "Cannot redeclare %1, already declared in %2 on line %3."
 
 #: duchain/builders/declarationbuilder.cpp:980
-#, fuzzy, kde-format
-#| msgid ""
-#| "Class %1 contains abstract method %2 and must therefore be declared "
-#| "abstract or implement the method."
+#, kde-format
 msgid ""
 "Class %1 contains %2 abstract methods and must therefore be declared "
 "abstract or implement the remaining methods."
 msgstr ""
-"Class %1 contains abstract method %2 and must therefore be declared abstract "
-"or implement the method."
+"Class %1 contains %2 abstract methods and must therefore be declared "
+"abstract or implement the remaining methods."
 
 #: duchain/builders/declarationbuilder.cpp:987
 #, kde-format
diff -Nru kdevelop-php-5.1.1/po/fr/kdevphp.po kdevelop-php-5.1.2/po/fr/kdevphp.po
--- kdevelop-php-5.1.1/po/fr/kdevphp.po	2017-05-13 10:11:40.000000000 +0000
+++ kdevelop-php-5.1.2/po/fr/kdevphp.po	2017-08-15 09:28:44.000000000 +0000
@@ -11,8 +11,8 @@
 "Project-Id-Version: kdevphp\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2017-05-13 05:03+0200\n"
-"PO-Revision-Date: 2014-03-03 17:13+0100\n"
-"Last-Translator: Vincent PINON <vincent.pinon@laposte.net>\n"
+"PO-Revision-Date: 2015-06-11 15:39+0200\n"
+"Last-Translator: Vincent PINON <vpinon@kde.org>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@
 #: docs/phpdocsconfig.ui:57
 #, kde-format
 msgid "Location:"
-msgstr ""
+msgstr "Emplacement :"
 
 #: docs/phpdocsmodel.cpp:110
 #, kde-format
diff -Nru kdevelop-php-5.1.1/po/nb/kdevphp.po kdevelop-php-5.1.2/po/nb/kdevphp.po
--- kdevelop-php-5.1.1/po/nb/kdevphp.po	2017-05-13 10:11:43.000000000 +0000
+++ kdevelop-php-5.1.2/po/nb/kdevphp.po	2017-08-15 09:28:46.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-07 13:39+0100\n"
+"POT-Creation-Date: 2017-05-13 05:03+0200\n"
 "PO-Revision-Date: 2010-12-31 14:54+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -236,14 +236,14 @@
 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:978
+#: duchain/builders/declarationbuilder.cpp:980
 #, 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:985
+#: duchain/builders/declarationbuilder.cpp:987
 #, kde-format
 msgid "Cannot re-assign $this."
 msgstr "Kan ikke gi $this ny tilordning."
diff -Nru kdevelop-php-5.1.1/po/tr/kdevphp.po kdevelop-php-5.1.2/po/tr/kdevphp.po
--- kdevelop-php-5.1.1/po/tr/kdevphp.po	2017-05-13 10:11:44.000000000 +0000
+++ kdevelop-php-5.1.2/po/tr/kdevphp.po	2017-08-15 09:28:48.000000000 +0000
@@ -9,8 +9,8 @@
 "Project-Id-Version: extragear-kdevelop-kde4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2017-05-13 05:03+0200\n"
-"PO-Revision-Date: 2015-07-28 19:46+0000\n"
-"Last-Translator: Necdet <necdetyucel@gmail.com>\n"
+"PO-Revision-Date: 2017-05-15 15:07+0000\n"
+"Last-Translator: Mete <metebilgin48@gmail.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@
 #: docs/phpdocsconfig.ui:20
 #, kde-format
 msgid "PHP Manual Integration"
-msgstr ""
+msgstr "PHP Ek Kitabı Bütünleşmesi"
 
 #. i18n: ectx: property (text), widget (QLabel, PhpDocNote)
 #: docs/phpdocsconfig.ui:36
@@ -69,28 +69,42 @@
 "your choice. Make sure you downloaded the <span style=\" font-style:italic;"
 "\">\"Many HTML files\"</span> package.</p></body></html>"
 msgstr ""
+"<!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;\">Öntanımlı olarak çevrimiçi "
+"<a href=\"http://php.net\"><span style=\" text-decoration: underline; color:"
+"#0000ff;\">PHP belgelendirmesi</span></a> uzaktan kullanılır. Alternatif "
+"olarak konumu belgelendirmenin istediğiniz dilde yerel kopyasına "
+"ayarlayabilirsiniz.<span style=\" font-style:italic;\">\"Çoklu HTML dosyaları"
+"\"</span> paketini indirdiğinizden emin olun.</p></body></html>"
 
 #. i18n: ectx: property (text), widget (QLabel, PhpDocLocationLabel)
 #: docs/phpdocsconfig.ui:57
 #, kde-format
 msgid "Location:"
-msgstr ""
+msgstr "Konum:"
 
 #: docs/phpdocsmodel.cpp:110
 #, kde-format
 msgid "<lost declaration>"
-msgstr ""
+msgstr "<kayıp bildirim>"
 
 #: docs/phpdocsplugin.cpp:221
 #, kde-format
 msgid "PHP Documentation"
-msgstr ""
+msgstr "PHP Belgelendirmesi"
 
 #. 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 ""
+msgstr "Kullanılacak PHP belgelendirmesinin konumunu belirtir."
 
 #. i18n: ectx: tooltip, entry (phpDocLocation), group (PHP Documentation)
 #: docs/phpdocssettings.kcfg:13
@@ -101,6 +115,9 @@
 "contains the\n"
 "                 PHP documentation in HTML format with many files."
 msgstr ""
+"Kullanılacak PHP belgelendirmesinin konumu. İsterseniz http://php.net gibi\n"
+"                 uzak bir konumu veya çok sayfalı HTML biçimindeki yerel\n"
+"                 PHP belgelendirme dizinini kullanabilirsiniz."
 
 #. i18n: ectx: whatsthis, entry (phpDocLocation), group (PHP Documentation)
 #: docs/phpdocssettings.kcfg:15
@@ -109,11 +126,13 @@
 "Make sure local copies are downloaded in HTML format with many files.\n"
 "        "
 msgstr ""
+"Yerel kopyanızın çok sayfalı HTML biçiminde olduğundan emin olun.\n"
+"        "
 
 #: docs/phpdocumentationwidget.cpp:70
 #, kde-format
 msgid "...loading documentation..."
-msgstr ""
+msgstr "...belgelendirme yükleniyor..."
 
 #: duchain/builders/contextbuilder.cpp:410
 #, kde-format
@@ -236,16 +255,13 @@
 msgstr "%1 yeniden belirtilemez, zaten %2 içinde %3 satırında belirtilmiş."
 
 #: duchain/builders/declarationbuilder.cpp:980
-#, fuzzy, kde-format
-#| msgid ""
-#| "Class %1 contains abstract method %2 and must therefore be declared "
-#| "abstract or implement the method."
+#, kde-format
 msgid ""
 "Class %1 contains %2 abstract methods and must therefore be declared "
 "abstract or implement the remaining methods."
 msgstr ""
-"%1 sınıfı abstract metot %2 içeriyor ve bu nedenle abstract ya da "
-"gerçeklenmiş gerekiyor."
+"%1 sınıfı %2 özet yöntem içeriyor, bu nedenle abstract olarak tanımlanmalı "
+"ya da kalan yöntemler gerçeklenmeli."
 
 #: duchain/builders/declarationbuilder.cpp:987
 #, kde-format
@@ -282,7 +298,7 @@
 #: duchain/navigation/declarationnavigationcontext.cpp:138
 #, kde-format
 msgid "Use of %1 from %2<br />"
-msgstr ""
+msgstr "%2 den %1 kullanımı<br />"
 
 #: duchain/navigation/declarationnavigationcontext.cpp:148
 #, kde-format
diff -Nru kdevelop-php-5.1.1/po/zh_CN/kdevphp.po kdevelop-php-5.1.2/po/zh_CN/kdevphp.po
--- kdevelop-php-5.1.1/po/zh_CN/kdevphp.po	2017-05-13 10:11:45.000000000 +0000
+++ kdevelop-php-5.1.2/po/zh_CN/kdevphp.po	2017-08-15 09:28:48.000000000 +0000
@@ -1,23 +1,20 @@
-# Copyright (C) YEAR This_file_is_part_of_KDE
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Ni Hui <shuizhuyuanluo@126.com>, 2010, 2011, 2012.
-# Weng Xuetian <wengxt@gmail.com>, 2013, 2015.
-# Feng Chao <chaofeng111@gmail.com>, 2013, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2017-05-13 05:03+0200\n"
-"PO-Revision-Date: 2015-01-25 14:18+0800\n"
-"Last-Translator: Feng Chao <chaofeng111@gmail.com>\n"
-"Language-Team: Chinese Simplified <kde-china@kde.org>\n"
+"PO-Revision-Date: 2017-08-14 08:08-0400\n"
+"Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n"
+"Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
+"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /kf5-stable/messages/extragear-kdevelop/kdevphp.pot\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -46,10 +43,9 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, PhpDoc)
 #: docs/phpdocsconfig.ui:20
-#, fuzzy, kde-format
-#| msgid "PHPUnit Integration"
+#, kde-format
 msgid "PHP Manual Integration"
-msgstr "PHPUnit 集成"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, PhpDocNote)
 #: docs/phpdocsconfig.ui:36
@@ -75,7 +71,7 @@
 #: docs/phpdocsconfig.ui:57
 #, kde-format
 msgid "Location:"
-msgstr ""
+msgstr "位置："
 
 #: docs/phpdocsmodel.cpp:110
 #, kde-format
@@ -83,10 +79,9 @@
 msgstr ""
 
 #: docs/phpdocsplugin.cpp:221
-#, fuzzy, kde-format
-#| msgid "PHPUnit Integration"
+#, kde-format
 msgid "PHP Documentation"
-msgstr "PHPUnit 集成"
+msgstr ""
 
 #. i18n: ectx: label, entry (phpDocLocation), group (PHP Documentation)
 #: docs/phpdocssettings.kcfg:10
@@ -231,10 +226,7 @@
 msgstr "无法重新声明 %1，已经在行 %3 上的 %2 中声明。"
 
 #: duchain/builders/declarationbuilder.cpp:980
-#, fuzzy, kde-format
-#| msgid ""
-#| "Class %1 contains abstract method %2 and must therefore be declared "
-#| "abstract or implement the method."
+#, kde-format
 msgid ""
 "Class %1 contains %2 abstract methods and must therefore be declared "
 "abstract or implement the remaining methods."
@@ -243,7 +235,7 @@
 #: duchain/builders/declarationbuilder.cpp:987
 #, kde-format
 msgid "Cannot re-assign $this."
-msgstr "无法重新赋值 $this。"
+msgstr "无法重新赋值 $this 。"
 
 #: duchain/builders/declarationbuilder.cpp:1423
 #, kde-format
diff -Nru kdevelop-php-5.1.1/testprovider/kdevphpunitprovider.desktop.cmake kdevelop-php-5.1.2/testprovider/kdevphpunitprovider.desktop.cmake
--- kdevelop-php-5.1.1/testprovider/kdevphpunitprovider.desktop.cmake	2017-05-13 10:11:29.000000000 +0000
+++ kdevelop-php-5.1.2/testprovider/kdevphpunitprovider.desktop.cmake	2017-08-15 09:28:35.000000000 +0000
@@ -4,8 +4,8 @@
 Comment=Finds and runs PHPUnit tests.
 Comment[ar]=يعثر اختبارات PHPUnit ويشغّلها.
 Comment[bs]=Traži i pokreće PHPUnit testove.
-Comment[ca]=Cerca i executa proves de PHPUnit.
-Comment[ca@valencia]=Busca i executa proves de PHPUnit.
+Comment[ca]=Cerca i executa proves del PHPUnit.
+Comment[ca@valencia]=Busca i executa proves del PHPUnit.
 Comment[da]=Finder og kører PHPUnit-tests.
 Comment[de]=Sucht und führt PHPUnit-Tests aus.
 Comment[el]=Βρίσκει και εκτελεί PHPUnit tests.
@@ -39,8 +39,8 @@
 Name=PHPUnit Integration
 Name[ar]=تكامل PHPUnit
 Name[bs]=PHPUnit Integracija
-Name[ca]=Integració PHPUnit
-Name[ca@valencia]=Integració PHPUnit
+Name[ca]=Integració del PHPUnit
+Name[ca@valencia]=Integració del PHPUnit
 Name[da]=Integration af PHPUnit
 Name[de]=PHPUnit-Integration
 Name[el]=PHPUnit Integration
@@ -75,8 +75,8 @@
 GenericName=PHPUnit Integration
 GenericName[ar]=تكامل PHPUnit
 GenericName[bs]=PHPUnit Integracija
-GenericName[ca]=Integració de PHPUnit
-GenericName[ca@valencia]=Integració de PHPUnit
+GenericName[ca]=Integració del PHPUnit
+GenericName[ca@valencia]=Integració del PHPUnit
 GenericName[da]=Integration af PHPUnit
 GenericName[de]=PHPUnit-Integration
 GenericName[el]=PHPUnit Integration