Commit d0260704 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent f891396a
......@@ -2,7 +2,14 @@
"KPlugin": {
"Authors": [
{
"Name": "Carlos Nihelton"
"Name": "Carlos Nihelton",
"Name[ca]": "Carlos Nihelton",
"Name[cs]": "Carlos Nihelton",
"Name[fr]": "Carlos Nihelton",
"Name[it]": "Carlos Nihelton",
"Name[pt]": "Carlos Nihelton",
"Name[uk]": "Carlos Nihelton",
"Name[x-test]": "xxCarlos Niheltonxx"
},
{
"Name": "Friedrich W. H. Kossebau",
......@@ -34,10 +41,22 @@
],
"Category": "Analyzers",
"Description": "clang-tidy provides an extensible framework for diagnosing and fixing typical programming errors, like style violations, interface misuse, or bugs that can be deduced via static analysis. https://clang.llvm.org/extra/clang-tidy/",
"Description[ca]": "El clang-tidy proporciona un marc de treball extensible per al diagnòstic i esmena d'errors de programació típics, com ara infraccions de l'estil, mal ús de la interfície o errors que es poden deduir mitjançant anàlisi estàtica. https://clang.llvm.org/extra/clang-tidy/",
"Description[it]": "clang-tidy fornisce un'infrastruttura estensibile per diagnosticare e correggere dei classici errori di programmazione, che includono violazioni di stile, uso incorretto delle interfacce o errori che possono essere dedotti tramite analisi statica. https://clang.llvm.org/extra/clang-tidy/",
"Description[pt]": "O 'clang-tidy' oferece uma plataforma extensível para diagnosticar e corrigir erros de programação típicos, como violações do estilo, mau uso de interfaces ou erros que possam ser deduzidos por análise estática. https://clang.llvm.org/extra/clang-tidy/",
"Description[uk]": "clang-tidy — розширена оболонка діагностування та виправлення типових помилок у програмах, зокрема порушень стилю, помилкового використання інтерфейсу та вад, які можна виявити за допомогою статичного аналізу. https://clang.llvm.org/extra/clang-tidy/",
"Description[x-test]": "xxclang-tidy provides an extensible framework for diagnosing and fixing typical programming errors, like style violations, interface misuse, or bugs that can be deduced via static analysis. https://clang.llvm.org/extra/clang-tidy/xx",
"Icon": "dialog-ok",
"Id": "kdevclangtidy",
"License": "GPL",
"Name": "Clang-Tidy Support",
"Name[ca]": "Implementació del Clang-Tidy",
"Name[cs]": "Podpora Clang-Tidy",
"Name[fr]": "Prise en charge de Clang-Tidy",
"Name[it]": "Supporto per Clang-Tidy",
"Name[pt]": "Suporte para o Clang-Tidy",
"Name[uk]": "Підтримка Clang-Tidy",
"Name[x-test]": "xxClang-Tidy Supportxx",
"ServiceTypes": [
"KDevelop/Plugin"
],
......
......@@ -2,9 +2,23 @@
"KPlugin": {
"Category": "Project Management",
"Description": "Imports and edits Meson projects",
"Description[ca]": "Importa i edita projectes del Meson",
"Description[cs]": "Importuje a upravuje vlastní projekty Meson",
"Description[fr]": "Importe et édite des projets Meson",
"Description[it]": "Importa e modifica i progetti Meson",
"Description[pt]": "Importa e edita os projectos do Meson",
"Description[uk]": "Імпортує і дає змогу редагувати проєкти Meson",
"Description[x-test]": "xxImports and edits Meson projectsxx",
"Icon": "run-build",
"Id": "KDevMesonManager",
"Name": "Meson Project Manager",
"Name[ca]": "Gestor de projectes Meson",
"Name[cs]": "Správce projektů Meson",
"Name[fr]": "Gestionnaire de projet Meson",
"Name[it]": "Gestore progetto Meson",
"Name[pt]": "Gestor de Projectos Meson",
"Name[uk]": "Керування проєктами Meson",
"Name[x-test]": "xxMeson Project Managerxx",
"ServiceTypes": [
"KDevelop/Plugin"
]
......
......@@ -2,6 +2,12 @@
"KPlugin": {
"Category": "Language Support",
"Description": "QML/JS language support (based on qmljs from QtCreator)",
"Description[ca]": "Implementació dels llenguatges QML/JS (basats en el «qmljs» del QtCreator)",
"Description[fr]": "Prise en charge du langage QML/JS (utilisant qmljs de QtCreator)",
"Description[it]": "Supporto al linguaggio QML/JS (basato su qmljs di QtCreator)",
"Description[pt]": "Suporte para a linguagem QML/JS (baseado no 'qmljs' do QtCreator)",
"Description[uk]": "Підтримка мови QML/JS (на основі qmljs з QtCreator)",
"Description[x-test]": "xxQML/JS language support (based on qmljs from QtCreator)xx",
"Icon": "text-x-qml",
"Id": "kdevqmljs",
"License": "GPL",
......
{
"KPlugin": {
"Description": "Scratchpad lets you quickly run and experiment with code without a full project, and even store todos.",
"Description[ca]": "L'Scratchpad permet executar i experimentar ràpidament amb el codi sense un projecte complet, i inclús emmagatzemar tasques pendents.",
"Description[fr]": "Le brouillon vous permet de lancer et d'essayer rapidement du code sans créer un projet complet, vous pouvez même vous en servir pour stocker des listes de tâches.",
"Description[it]": "Il blocco note ti permette di sperimentare ed eseguire rapidamente il codice senza un progetto completo, ed anche memorizzare un elenco di cose da fare.",
"Description[pt]": "O Quadro permite-lhe executar e experimentar rapidamente o código sem ter um projecto completo, ou ainda registar tarefas.",
"Description[uk]": "За допомогою нотатника ви можете швидко створити фрагмент коду та поекспериментувати з ним без створення повноцінного проєкту. Можливе навіть створення завдань на майбутнє.",
"Description[x-test]": "xxScratchpad lets you quickly run and experiment with code without a full project, and even store todos.xx",
"Id": "scratchpad",
"Name": "Scratchpad",
"Name[ca]": "Scratchpad",
"Name[fr]": "Brouillon",
"Name[it]": "Blocco note",
"Name[pt]": "Quadro",
"Name[uk]": "Нотатник для чернеток",
"Name[x-test]": "xxScratchpadxx",
"ServiceTypes": [
"KDevelop/Plugin"
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment