[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [umbrello] lib/kdev5-php: Merge remote-tracking branch 'origin/Applications/18.08'
From: Ralf Habacker <null () kde ! org>
Date: 2018-09-20 13:31:52
Message-ID: E1g2z3g-0004eN-G0 () code ! kde ! org
[Download RAW message or body]
Git commit 8fd8cdbea2c6633be2bc5494e89fa7ef8d3bf7cc by Ralf Habacker.
Committed on 20/09/2018 at 13:31.
Pushed by habacker into branch 'master'.
Merge remote-tracking branch 'origin/Applications/18.08'
# Conflicts:
# CMakeLists.txt
M +2 -0 lib/kdev5-php/docs/kdevphpdocs.json
M +2 -0 lib/kdev5-php/kdevphpsupport.json
M +2 -0 lib/kdev5-php/org.kde.umbrello.kdev-php.metainfo.xml
M +2 -0 lib/kdev5-php/testprovider/kdevphpunitprovider.json
https://commits.kde.org/umbrello/8fd8cdbea2c6633be2bc5494e89fa7ef8d3bf7cc
diff --cc lib/kdev5-php/docs/kdevphpdocs.json
index f70d945e5,04b39e843..c2b320942
--- a/lib/kdev5-php/docs/kdevphpdocs.json
+++ b/lib/kdev5-php/docs/kdevphpdocs.json
@@@ -18,7 -18,9 +18,8 @@@
"Description[gl]": "Este complemento integra a documentación con conexión de PHP.net.",
"Description[it]": "Questa estensione integra la documentazione online di PHP.net.",
"Description[nl]": "Deze plugin integreert PHP.net online-documentatie.",
+ "Description[pl]": "Wtyczka ta integruje dokumentację internetową PHP.net.",
"Description[pt]": "Este 'plugin' integra-se com a documentação 'online' do PHP.net.",
- "Description[pt_BR]": "Este plugin integra a documentação online do PHP.net.",
"Description[sk]": "Tento plugin integruje online dokumentáciu PHP.net.",
"Description[sl]": "Ta vstavek vključuje spletno dokumentacijo za PHP.",
"Description[sv]": "Insticksprogrammet integrerar Internet-dokumentationen från PHP.net.",
@@@ -38,7 -40,9 +39,8 @@@
"Name[gl]": "Documentación de PHP",
"Name[it]": "Documentazione PHP",
"Name[nl]": "PHP-documentatie",
+ "Name[pl]": "Dokumentacja PHP",
"Name[pt]": "Documentação de PHP",
- "Name[pt_BR]": "Documentação de PHP",
"Name[sk]": "Dokumentácia PHP",
"Name[sl]": "Dokumentacija za PHP",
"Name[sv]": "PHP-dokumentation",
diff --cc lib/kdev5-php/kdevphpsupport.json
index 5420d59e6,3f64cee07..c140494c3
--- a/lib/kdev5-php/kdevphpsupport.json
+++ b/lib/kdev5-php/kdevphpsupport.json
@@@ -12,7 -12,9 +12,8 @@@
"Description[gl]": "Compatibilidade coa linguaxe PHP",
"Description[it]": "Supporto al linguaggio PHP",
"Description[nl]": "Ondersteuning van de PHP-taal",
+ "Description[pl]": "Obsługa języka PHP",
"Description[pt]": "Suporte da Linguagem PHP",
- "Description[pt_BR]": "Suporte linguagem PHP",
"Description[sk]": "Jazyková podpora PHP",
"Description[sl]": "Podpora jeziku PHP",
"Description[sv]": "PHP-språkstöd",
@@@ -32,7 -34,9 +33,8 @@@
"Name[gl]": "Compatibilidade coa linguaxe PHP",
"Name[it]": "Supporto al linguaggio PHP",
"Name[nl]": "Ondersteuning van de PHP-taal",
+ "Name[pl]": "Obsługa języka PHP",
"Name[pt]": "Suporte da Linguagem PHP",
- "Name[pt_BR]": "Suporte linguagem PHP",
"Name[sk]": "Jazyková podpora PHP",
"Name[sl]": "Podpora jeziku PHP",
"Name[sv]": "PHP-språkstöd",
diff --cc lib/kdev5-php/org.kde.umbrello.kdev-php.metainfo.xml
index a189ad1ed,626ee2f75..85e98585d
--- a/lib/kdev5-php/org.kde.umbrello.kdev-php.metainfo.xml
+++ b/lib/kdev5-php/org.kde.umbrello.kdev-php.metainfo.xml
@@@ -13,8 -13,9 +13,9 @@@
<name xml:lang="gl">Compatibilidade con PHP para KDevelop</name>
<name xml:lang="it">Supporto PHP per KDevelop</name>
<name xml:lang="nl">PHP ondersteuning in KDevelop</name>
+ <name xml:lang="pl">KDevelop - obsługa PHP</name>
<name xml:lang="pt">Suporte para PHP do KDevelop</name>
- <name xml:lang="pt-BR">Suporte a PHP no KDevelop</name>
+ <name xml:lang="pt-BR">Suporte PHP do KDevelop</name>
<name xml:lang="sk">PHP podpora pre KDevelop</name>
<name xml:lang="sl">Podpora PHP-ju za KDevelop</name>
<name xml:lang="sv">KDevelop PHP-stöd</name>
@@@ -32,8 -33,9 +33,9 @@@
<summary xml:lang="gl">Compatibilidade coa linguaxe PHP para KDevelop</summary>
<summary xml:lang="it">Supporto al linguaggio PHP per KDevelop</summary>
<summary xml:lang="nl">Ondersteuning van PHP-taal voor KDevelop</summary>
+ <summary xml:lang="pl">Obsługa języka PHP dla KDevelop</summary>
<summary xml:lang="pt">Suporte linguagem PHP do KDevelop</summary>
- <summary xml:lang="pt-BR">Suporte linguagem PHP para o KDevelop</summary>
+ <summary xml:lang="pt-BR">Suporte linguagem PHP do KDevelop</summary>
<summary xml:lang="sk">Podpora jazyka PHP pre KDevelop</summary>
<summary xml:lang="sl">Podpora jeziku PHP za KDevelop</summary>
<summary xml:lang="sv">Stöd för språket PHP i KDevelop</summary>
diff --cc lib/kdev5-php/testprovider/kdevphpunitprovider.json
index 3f7d361c4,0d5f4817e..2e24a93b9
--- a/lib/kdev5-php/testprovider/kdevphpunitprovider.json
+++ b/lib/kdev5-php/testprovider/kdevphpunitprovider.json
@@@ -18,7 -18,9 +18,8 @@@
"Description[gl]": "Atopa e executa probas de PHPUnit.",
"Description[it]": "Trova ed esegue i test PHPUnit",
"Description[nl]": "Testen van PHPUnit vinden en uitvoeren.",
+ "Description[pl]": "Znajduje i uruchamia testy PHPUnit.",
"Description[pt]": "Procura e executa os testes do PHPUnit.",
- "Description[pt_BR]": "Procura e executa os testes do PHPUnit.",
"Description[sk]": "Nájde a spustí PHPUnit testy.",
"Description[sl]": "Najde in zažene preizkuse PHPUnit",
"Description[sv]": "Söker efter och kör PHPUnit-tester.",
@@@ -39,7 -41,9 +40,8 @@@
"Name[gl]": "Integración con PHPUnit",
"Name[it]": "Integrazione PHPUnit",
"Name[nl]": "Integratie van PHPUnit",
+ "Name[pl]": "Integracja PHPUnit",
"Name[pt]": "Integração com o PHPUnit",
- "Name[pt_BR]": "Integração com o PHPUnit",
"Name[sk]": "Integrácia PHPUnit",
"Name[sl]": "Podpora PHPUnit",
"Name[sv]": "Integrering av PHPUnit",
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic