Git commit bcaf01ff2b9743bd11af64b9d0e05f4804abe5e2 by Kevin Funk. Committed on 30/11/2016 at 22:35. Pushed by kfunk into branch 'master'. Merge remote-tracking branch 'origin/5.0' M +3 -1 languages/clang/tests/test_assistants.cpp M +1 -1 projectbuilders/makebuilder/kdevmakebuilder.json M +1 -1 projectbuilders/ninjabuilder/kdevninja.json M +1 -1 projectbuilders/qmakebuilder/kdevqmakebuilder.json M +2 -2 projectmanagers/custom-buildsystem/kdevcustombuildsystem.json M +1 -1 projectmanagers/custommake/kdevcustommakemanager.json M +2 -0 providers/ghprovider/kdevghprovider.json https://commits.kde.org/kdevelop/bcaf01ff2b9743bd11af64b9d0e05f4804abe5e2 diff --cc projectbuilders/makebuilder/kdevmakebuilder.json index 3c3bbdf,25691c6..b7c6376 --- a/projectbuilders/makebuilder/kdevmakebuilder.json +++ b/projectbuilders/makebuilder/kdevmakebuilder.json @@@ -22,10 -21,9 +22,10 @@@ "Description[uk]": "=D0=97=D0=B1=D0=B8=D1=80=D0=B0=D1=87 Make =D0= =B4=D0=BB=D1=8F KDevelop", = "Description[x-test]": "xxKDevelop Make Builderxx", = "Description[zh_CN]": "KDevelop Make =E6=9E=84=E5=BB=BA=E5=99=A8"= , = - "Icon": "gear", = + "Icon": "kdevelop", = "Id": "KDevMakeBuilder", = "Name": "Make Project Builder", = + "Name[bs]": "Napravi graditelja projekta", = "Name[ca@valencia]": "Constructor de projecte Make", = "Name[ca]": "Constructor de projecte Make", = "Name[cs]": "P=C5=99eklada=C4=8D projekt=C5=AF Make", = diff --cc projectmanagers/custom-buildsystem/kdevcustombuildsystem.json index 68390dc,3c522bf..d554713 --- a/projectmanagers/custom-buildsystem/kdevcustombuildsystem.json +++ b/projectmanagers/custom-buildsystem/kdevcustombuildsystem.json @@@ -22,10 -21,9 +22,10 @@@ "Description[uk]": "=D0=9D=D0=B0=D0=B4=D0=B0=D1=94 =D0=B7=D0=BC= =D0=BE=D0=B3=D1=83 =D0=B2=D0=B8=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D0=BE= =D0=B2=D1=83=D0=B2=D0=B0=D1=82=D0=B8 =D0=BD=D0=B5=D1=82=D0=B8=D0=BF=D0=BE= =D0=B2=D1=96 =D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B8 =D0=B7=D0=B1=D0=B8= =D1=80=D0=B0=D0=BD=D0=BD=D1=8F =D1=83 =D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82= =D0=B0=D1=85 KDevelop", = "Description[x-test]": "xxAllows to use custom buildsystems for K= Develop projectsxx", = "Description[zh_CN]": "=E5=85=81=E8=AE=B8=E5=AF=B9 KDevelop =E5= =B7=A5=E7=A8=8B=E4=BD=BF=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9E=84=E5=BB= =BA=E7=B3=BB=E7=BB=9F", = - "Icon": "gear", = + "Icon": "kdevelop", = "Id": "KDevCustomBuildSystem", = "Name": "Custom BuildSystem", = + "Name[bs]": "Vlasititi sistem gradnje", = "Name[ca@valencia]": "BuildSystem personalitzat", = "Name[ca]": "BuildSystem personalitzat", = "Name[cs]": "Vlastn=C3=AD syst=C3=A9m pro sestaven=C3=AD", = diff --cc projectmanagers/custommake/kdevcustommakemanager.json index ec8e5d7,3094a7e..56314c3 --- a/projectmanagers/custommake/kdevcustommakemanager.json +++ b/projectmanagers/custommake/kdevcustommakemanager.json @@@ -23,10 -22,9 +23,10 @@@ "Description[uk]": "=D0=86=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D1=83=D1= =94 =D1=96 =D0=B7=D0=BC=D1=96=D0=BD=D1=8E=D1=94 =D0=BF=D1=80=D0=BE=D0=B5=D0= =BA=D1=82=D0=B8 =D0=BD=D0=B5=D1=82=D0=B8=D0=BF=D0=BE=D0=B2=D0=B8=D1=85 make= ", = "Description[x-test]": "xxImports and edits custom make projectsx= x", = "Description[zh_CN]": "=E5=AF=BC=E5=85=A5=E5=B9=B6=E7=BC=96=E8=BE= =91=E5=AE=9A=E5=88=B6 make =E5=B7=A5=E7=A8=8B", = - "Icon": "gear", = + "Icon": "kdevelop", = "Id": "KDevCustomMakeManager", = "Name": "Custom Makefile Project Manager", = + "Name[bs]": "Korisni=C4=8Dki Makefile menad=C5=BEer projekta", = "Name[ca@valencia]": "Gestor de projecte personalitzat Makefile", = "Name[ca]": "Gestor de projecte personalitzat Makefile", = "Name[de]": "Projektverwaltung mit eigenem Makefile", = diff --cc providers/ghprovider/kdevghprovider.json index 719c32e,08e8b46..783ec79 --- a/providers/ghprovider/kdevghprovider.json +++ b/providers/ghprovider/kdevghprovider.json @@@ -7,37 -7,50 +7,39 @@@ } ], = "Category": "Utilities", = - "Description": "This plugin helps to obtain projects from Github"= , = - "Description[ca@valencia]": "Este connector ajuda a obtindre els = projectes des de Github", = - "Description[ca]": "Aquest connector ajuda a obtenir els projecte= s des de Github", = - "Description[de]": "Dieses Modul hilft dabei Github-Projekte zu b= eziehen", = - "Description[es]": "Este complemento le ayuda a obtener proyectos= de Github", = - "Description[et]": "See plugin aitab hankida projekte Githubist", = - "Description[fi]": "T=C3=A4m=C3=A4 liit=C3=A4nn=C3=A4inen auttaa = Github-projektien hakemisessa", = + "Description": "This plugin helps to obtain projects from GitHub"= , = + "Description[ca@valencia]": "Este connector ajuda a obtindre els = projectes des de GitHub", = + "Description[ca]": "Aquest connector ajuda a obtenir els projecte= s des de GitHub", = + "Description[de]": "Dieses Modul hilft dabei, GitHub-Projekte zu = beziehen", = + "Description[es]": "Este complemento le ayuda a obtener proyectos= de GitHub", = + "Description[fr]": "Ce module aide =C3=A0 obtenir des projets dep= uis GitHub", = + "Description[it]": "Questa estensione consente di ottenere proget= ti da GitHub", = + "Description[fr]": "Ce module aide =C3=A0 obtenir des projets dep= uis Github", = - "Description[gl]": "Este complemento permite obter proxectos de G= itHub.", = - "Description[it]": "Questa estensione consente di ottenere proget= ti da Github", = "Description[nl]": "Deze plug-in helpt om projecten uit Github te= verkrijgen", = - "Description[pl]": "Wtyczka ta pomaga przy pobieraniu projekt=C3= =B3w z Githuba", = - "Description[pt]": "Este 'plugin' ajuda a obter projectos do Gith= ub", = - "Description[pt_BR]": "Este plugin ajuda a obter projetos a parti= r do Github", = - "Description[sk]": "Tento modul pom=C3=A1ha z=C3=ADskava=C5=A5 pr= ojekty z Github", = - "Description[sl]": "Ta vstavek pomaga pri pridobivanju projektov = iz Github-a", = - "Description[sv]": "Insticksprogrammet hj=C3=A4lper till att erh= =C3=A5lla projekt Github", = - "Description[uk]": "=D0=97=D0=B0 =D0=B4=D0=BE=D0=BF=D0=BE=D0=BC= =D0=BE=D0=B3=D0=BE=D1=8E =D1=86=D1=8C=D0=BE=D0=B3=D0=BE =D0=B4=D0=BE=D0=B4= =D0=B0=D1=82=D0=BA=D0=B0 =D0=BC=D0=BE=D0=B6=D0=BD=D0=B0 =D0=BE=D1=82=D1=80= =D0=B8=D0=BC=D1=83=D0=B2=D0=B0=D1=82=D0=B8 =D0=BF=D1=80=D0=BE=D0=B5=D0=BA= =D1=82=D0=B8 =D0=B7 Github", = - "Description[x-test]": "xxThis plugin helps to obtain projects fr= om Githubxx", = - "Description[zh_CN]": "=E6=AD=A4=E6=8F=92=E4=BB=B6=E5=B8=AE=E5=8A= =A9=E6=82=A8=E8=8E=B7=E5=8F=96 Github =E9=A1=B9=E7=9B=AE", = + "Description[pt]": "Este 'plugin' ajuda a obter projectos do GitH= ub", = + "Description[sk]": "Tento modul pom=C3=A1ha z=C3=ADskava=C5=A5 pr= ojekty z GitHub", = + "Description[sl]": "Ta vstavek pomaga pri pridobivanju projektov = iz GitHub-a", = + "Description[sv]": "Insticksprogrammet hj=C3=A4lper till att erh= =C3=A5lla projekt fr=C3=A5n Github", = + "Description[uk]": "=D0=97=D0=B0 =D0=B4=D0=BE=D0=BF=D0=BE=D0=BC= =D0=BE=D0=B3=D0=BE=D1=8E =D1=86=D1=8C=D0=BE=D0=B3=D0=BE =D0=B4=D0=BE=D0=B4= =D0=B0=D1=82=D0=BA=D0=B0 =D0=BC=D0=BE=D0=B6=D0=BD=D0=B0 =D0=BE=D1=82=D1=80= =D0=B8=D0=BC=D1=83=D0=B2=D0=B0=D1=82=D0=B8 =D0=BF=D1=80=D0=BE=D0=B5=D0=BA= =D1=82=D0=B8 =D0=B7 GitHub", = + "Description[x-test]": "xxThis plugin helps to obtain projects fr= om GitHubxx", = "Icon": "kdevgh", = "Id": "kdevghprovider", = "License": "GPL", = - "Name": "Github Provider", = - "Name[ca@valencia]": "Prove=C3=AFdor de Github", = - "Name[ca]": "Prove=C3=AFdor de Github", = - "Name[cs]": "Poskytovatel GitHubu", = - "Name[de]": "Github-Provider", = - "Name[es]": "Proveedor de Github", = - "Name[et]": "Githubi pakkuja", = - "Name[fi]": "Github-tarjoaja", = + "Name": "GitHub Provider", = + "Name[ca@valencia]": "Prove=C3=AFdor de GitHub", = + "Name[ca]": "Prove=C3=AFdor de GitHub", = + "Name[de]": "GitHub-Provider", = + "Name[es]": "Proveedor de GitHub", = + "Name[fr]": "Fournisseur GitHub", = + "Name[it]": "Fornitore GitHub", = + "Name[fr]": "Fournisseur Github", = - "Name[gl]": "Provedor de GitHub", = - "Name[it]": "Fornitore Github", = "Name[nl]": "Github-leverancier", = - "Name[pl]": "Dostawca Github", = - "Name[pt]": "Fornecedor do Github", = - "Name[pt_BR]": "Fornecedor do Github", = - "Name[sk]": "Poskytovate=C4=BE Github", = - "Name[sl]": "Ponudnik za Github", = + "Name[pt]": "Fornecedor do GitHub", = + "Name[sk]": "Poskytovate=C4=BE GitHub", = + "Name[sl]": "Ponudnik za GitHub", = "Name[sv]": "Github-leverant=C3=B6r", = - "Name[uk]": "=D0=9D=D0=B0=D0=B4=D0=B0=D0=B2=D0=B0=D1=87 =D0=B4=D0= =B0=D0=BD=D0=B8=D1=85 Github", = - "Name[x-test]": "xxGithub Providerxx", = - "Name[zh_CN]": "Github =E6=8F=90=E4=BE=9B=E8=80=85", = + "Name[uk]": "=D0=9D=D0=B0=D0=B4=D0=B0=D0=B2=D0=B0=D1=87 =D0=B4=D0= =B0=D0=BD=D0=B8=D1=85 GitHub", = + "Name[x-test]": "xxGitHub Providerxx", = "ServiceTypes": [ "KDevelop/Plugin" ]