[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevplatform] /: Merge remote-tracking branch 'origin/5.0'
From:       Kevin Funk <kfunk () kde ! org>
Date:       2016-11-30 22:33:10
Message-ID: E1cCDR8-00034u-Rg () code ! kde ! org
[Download RAW message or body]

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/9f37cb54927c2b940aaa78a6580d11e067d0abb2

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]": "Забезпечує роботу панелі \
показу текстових даних інших додатків, \
                зокрема попереджень компілятора.", 
          "Description[x-test]": "xxProvides a text output toolview for other plugins \
                to use, to show things like compiler messages.xx", 
          "Description[zh_CN]": \
"提供让其它插件使用的文本输出工具视图，以便显示诸如编译器消息的信息。", \
                
-         "Icon": "gear", 
+         "Icon": "kdevelop", 
          "Id": "KDevStandardOutputView", 
          "Name": "Output View", 
 +        "Name[ar]": "عرض الخَرْج", 
 +        "Name[bg]": "Преглед на резултата", 
 +        "Name[bs]": "Pregled izlaza", 
          "Name[ca@valencia]": "Vista de l'eixida", 
          "Name[ca]": "Vista de la sortida", 
          "Name[cs]": "Pohled na výstup", 
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  �subversion � en el \
                KDevelop.", 
 -        "Description[ca]": "Aquest connector integra el  �subversion � 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 KDevelop.", 
 -        "Description[es]": "Este complemento integra Subversion en KDevelop", 
 -        "Description[et]": "See plugin lõimib Subversioni KDevelopiga.", 
 -        "Description[fi]": "Tämä liitännäinen integroi subversionin \
KDevelopiin.",   +        "Description[es]": "Este complemento integra Subversion en \
KDevelop.",   +        "Description[fr]": "Ce module intègre Subversion dans \
KDevelop.",  +         "Description[fr]": "Ce module intègre subversion dans \
                KDevelop.", 
 -        "Description[gl]": "Este complemento integra subversion en KDevelop.", 
          "Description[it]": "Questa estensione integra Subversion in KDevelop.", 
 -        "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 KDevelop.", 
 -        "Description[pt_BR]": "Este plugin integra o subversion ao KDevelop.", 
          "Description[sk]": "Tento plugin integruje subversion do KDevelop.", 
          "Description[sl]": "Vstavek v KDevelop vgradi Subversion.", 
          "Description[sv]": "Insticksprogrammet integrerar Subversion i KDevelop.", 


[prev in list] [next in list] [prev in thread] [next in thread]