Git commit 9f37cb54927c2b940aaa78a6580d11e067d0abb2 by Kevin Funk.
Committed on 30/11/2016 at 22:29.
Pushed by kfunk into branch 'master'.

Merge remote-tracking branch 'origin/5.0'

M  +1    -1    CMakeLists.txt
M  +10   -7    language/backgroundparser/backgroundparser.cpp
M  +1    -1    language/duchain/duchainpointer.h
M  +1    -1    plugins/standardoutputview/kdevstandardoutputview.json
M  +1    -0    plugins/subversion/kdevsubversion.json

https://commits.kde.org/kdevplatform/9f37cb54927c2b940aaa78a6580d11e067d0ab=
b2

diff --cc CMakeLists.txt
index a1c44d1,5c0e3b4..ec12010
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,12 -1,12 +1,12 @@@
  # kdevplatform version
  set(KDEVPLATFORM_VERSION_MAJOR 5)
  set(KDEVPLATFORM_VERSION_MINOR 0)
- set(KDEVPLATFORM_VERSION_PATCH 2)
+ set(KDEVPLATFORM_VERSION_PATCH 3)
  =

  # plugin versions listed in the .desktop files
 -set(KDEV_PLUGIN_VERSION 25)
 +set(KDEV_PLUGIN_VERSION 26)
  # Increase this to reset incompatible item-repositories
 -set(KDEV_ITEMREPOSITORY_VERSION 85)
 +set(KDEV_ITEMREPOSITORY_VERSION 86)
  =

  # library version / SO version
  set(KDEVPLATFORM_LIB_VERSION 10.0.0)
diff --cc plugins/standardoutputview/kdevstandardoutputview.json
index b0bbe69,b03d204..6fe652d
--- a/plugins/standardoutputview/kdevstandardoutputview.json
+++ b/plugins/standardoutputview/kdevstandardoutputview.json
@@@ -21,12 -21,9 +21,12 @@@
          "Description[uk]": "=D0=97=D0=B0=D0=B1=D0=B5=D0=B7=D0=BF=D0=B5=D1=
=87=D1=83=D1=94 =D1=80=D0=BE=D0=B1=D0=BE=D1=82=D1=83 =D0=BF=D0=B0=D0=BD=D0=
=B5=D0=BB=D1=96 =D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=83 =D1=82=D0=B5=D0=BA=D1=
=81=D1=82=D0=BE=D0=B2=D0=B8=D1=85 =D0=B4=D0=B0=D0=BD=D0=B8=D1=85 =D1=96=D0=
=BD=D1=88=D0=B8=D1=85 =D0=B4=D0=BE=D0=B4=D0=B0=D1=82=D0=BA=D1=96=D0=B2, =D0=
=B7=D0=BE=D0=BA=D1=80=D0=B5=D0=BC=D0=B0 =D0=BF=D0=BE=D0=BF=D0=B5=D1=80=D0=
=B5=D0=B4=D0=B6=D0=B5=D0=BD=D1=8C =D0=BA=D0=BE=D0=BC=D0=BF=D1=96=D0=BB=D1=
=8F=D1=82=D0=BE=D1=80=D0=B0.", =

          "Description[x-test]": "xxProvides a text output toolview for oth=
er plugins to use, to show things like compiler messages.xx", =

          "Description[zh_CN]": "=E6=8F=90=E4=BE=9B=E8=AE=A9=E5=85=B6=E5=AE=
=83=E6=8F=92=E4=BB=B6=E4=BD=BF=E7=94=A8=E7=9A=84=E6=96=87=E6=9C=AC=E8=BE=93=
=E5=87=BA=E5=B7=A5=E5=85=B7=E8=A7=86=E5=9B=BE=EF=BC=8C=E4=BB=A5=E4=BE=BF=E6=
=98=BE=E7=A4=BA=E8=AF=B8=E5=A6=82=E7=BC=96=E8=AF=91=E5=99=A8=E6=B6=88=E6=81=
=AF=E7=9A=84=E4=BF=A1=E6=81=AF=E3=80=82", =

-         "Icon": "gear", =

+         "Icon": "kdevelop", =

          "Id": "KDevStandardOutputView", =

          "Name": "Output View", =

 +        "Name[ar]": "=D8=B9=D8=B1=D8=B6 =D8=A7=D9=84=D8=AE=D9=8E=D8=B1=D9=
=92=D8=AC", =

 +        "Name[bg]": "=D0=9F=D1=80=D0=B5=D0=B3=D0=BB=D0=B5=D0=B4 =D0=BD=D0=
=B0 =D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=82=D0=B0=D1=82=D0=B0", =

 +        "Name[bs]": "Pregled izlaza", =

          "Name[ca@valencia]": "Vista de l'eixida", =

          "Name[ca]": "Vista de la sortida", =

          "Name[cs]": "Pohled na v=C3=BDstup", =

diff --cc plugins/subversion/kdevsubversion.json
index f4adbe4,94e4ebd..0e33691
--- a/plugins/subversion/kdevsubversion.json
+++ b/plugins/subversion/kdevsubversion.json
@@@ -7,17 -7,21 +7,18 @@@
              }
          ], =

          "Category": "Version Control", =

 -        "Description": "This plugin integrates subversion to KDevelop.", =

 -        "Description[ca@valencia]": "Este connector integra el =C2=ABsubv=
ersion=C2=BB en el KDevelop.", =

 -        "Description[ca]": "Aquest connector integra el =C2=ABsubversion=
=C2=BB en el KDevelop.", =

 +        "Description": "This plugin integrates Subversion to KDevelop.", =

 +        "Description[ca@valencia]": "Este connector integra el Subversion=
 en el KDevelop.", =

 +        "Description[ca]": "Aquest connector integra el Subversion en el =
KDevelop.", =

          "Description[cs]": "Tento modul integruje podporu pro subversion =
v KDevelop", =

          "Description[de]": "Dieses Modul integriert Subversion in KDevelo=
p.", =

 -        "Description[es]": "Este complemento integra Subversion en KDevel=
op", =

 -        "Description[et]": "See plugin l=C3=B5imib Subversioni KDevelopig=
a.", =

 -        "Description[fi]": "T=C3=A4m=C3=A4 liit=C3=A4nn=C3=A4inen integro=
i subversionin KDevelopiin.", =

 +        "Description[es]": "Este complemento integra Subversion en KDevel=
op.", =

 +        "Description[fr]": "Ce module int=C3=A8gre Subversion dans KDevel=
op.", =

+         "Description[fr]": "Ce module int=C3=A8gre subversion dans KDevel=
op.", =

 -        "Description[gl]": "Este complemento integra subversion en KDevel=
op.", =

          "Description[it]": "Questa estensione integra Subversion in KDeve=
lop.", =

 -        "Description[nl]": "Deze plugin integreert subversion in KDevelop=
.", =

 -        "Description[pl]": "Ta wtyczka integruje subversion z KDevelop.", =

 +        "Description[nl]": "Deze plugin integreert Subversion in KDevelop=
.", =

 +        "Description[pl]": "Ta wtyczka integruje Subversion z KDevelop.", =

          "Description[pt]": "Este 'plugin' integra o Subversion no KDevelo=
p.", =

 -        "Description[pt_BR]": "Este plugin integra o subversion ao KDevel=
op.", =

          "Description[sk]": "Tento plugin integruje subversion do KDevelop=
.", =

          "Description[sl]": "Vstavek v KDevelop vgradi Subversion.", =

          "Description[sv]": "Insticksprogrammet integrerar Subversion i KD=
evelop.",=20