Commit 2f806c3d 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 908fe95c
Pipeline #5896 failed with stage
in 60 minutes
......@@ -5,6 +5,7 @@
"Name": "Carlos Nihelton",
"Name[ca]": "Carlos Nihelton",
"Name[cs]": "Carlos Nihelton",
"Name[es]": "Carlos Nihelton",
"Name[fr]": "Carlos Nihelton",
"Name[it]": "Carlos Nihelton",
"Name[nl]": "Carlos Nihelton",
......@@ -43,6 +44,7 @@
"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[es]": "Clang-Tidy proporciona una infraestructura extensible para diagnosticar y corregir errores típicos de programación, como violaciones de estilo, mal uso de la interfaz o fallos que se pueden deducir mediante análisis estáticos. 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[nl]": "clang-tidy biedt een uit te breiden framework voor diagnostiseren en repareren van typische programmeringsfouten, zoals zondigen tegen de stijl, interfacemisbruik of bugs die afgeleid kunnen worden via statische analyse. 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/",
......@@ -54,6 +56,7 @@
"Name": "Clang-Tidy Support",
"Name[ca]": "Implementació del Clang-Tidy",
"Name[cs]": "Podpora Clang-Tidy",
"Name[es]": "Implementación de Clang-Tidy",
"Name[fr]": "Prise en charge de Clang-Tidy",
"Name[it]": "Supporto per Clang-Tidy",
"Name[nl]": "Ondersteuning voor Clang-Tidy",
......
......@@ -4,6 +4,7 @@
"Description": "Imports and edits Meson projects",
"Description[ca]": "Importa i edita projectes del Meson",
"Description[cs]": "Importuje a upravuje vlastní projekty Meson",
"Description[es]": "Importa y edita proyectos Meson",
"Description[fr]": "Importe et édite des projets Meson",
"Description[it]": "Importa e modifica i progetti Meson",
"Description[nl]": "Importeert en bewerkt Meson-projecten",
......@@ -15,6 +16,7 @@
"Name": "Meson Project Manager",
"Name[ca]": "Gestor de projectes Meson",
"Name[cs]": "Správce projektů Meson",
"Name[es]": "Gestor de proyectos Meson",
"Name[fr]": "Gestionnaire de projet Meson",
"Name[it]": "Gestore progetto Meson",
"Name[nl]": "Meson-projectbeheerder",
......
......@@ -3,6 +3,7 @@
"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[es]": "Implementación del lenguaje QML/JS (basado en qmljs de 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[nl]": "QML/JS taalondersteuning (gebaseerd op qmljs uit QtCreator)",
......
......@@ -2,6 +2,7 @@
"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[es]": "Scratchpad le permite ejecutar y experimentar con código rápidamente con código sin un proyecto completo, e incluso guardar listas de cosas por hacer.",
"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[nl]": "Scratchpad lets you quickly run and experiment with code without a full project, and even store todos.",
......@@ -11,6 +12,7 @@
"Id": "scratchpad",
"Name": "Scratchpad",
"Name[ca]": "Scratchpad",
"Name[es]": "Scratchpad",
"Name[fr]": "Brouillon",
"Name[it]": "Blocco note",
"Name[nl]": "Scratchpad",
......
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