Commit 7171ab04 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 c584501a
......@@ -10,7 +10,7 @@
"Description[en_GB]": "Imports and edits custom make projects",
"Description[es]": "Importa y edita proyectos Make personalizados",
"Description[fi]": "Tuo ja muokkaa räätälöityjä make-projekteja",
"Description[fr]": "Importe et édite des projet make personnalisés",
"Description[fr]": "Importe et édite des projets make personnalisés",
"Description[gl]": "Importa e edita proxectos que usen un sistema make personalizado.",
"Description[it]": "Importa e modifica i progetti personalizzati di Make",
"Description[nl]": "Importeert en bewerkt eigen make-projecten",
......
......@@ -4,7 +4,9 @@
"Description": "Imports and edits Meson projects",
"Description[ca@valencia]": "Importa i edita projectes del Meson",
"Description[ca]": "Importa i edita projectes del Meson",
"Description[en_GB]": "Imports and edits Meson projects",
"Description[es]": "Importa y edita proyectos Meson",
"Description[fr]": "Importe et édite des projets Meson",
"Description[gl]": "Importa e edita proxectos Meson",
"Description[it]": "Importa e modifica i progetti Meson",
"Description[nl]": "Importeert en bewerkt Meson-projecten",
......@@ -19,7 +21,9 @@
"Name": "Meson Project Manager",
"Name[ca@valencia]": "Gestor de projectes Meson",
"Name[ca]": "Gestor de projectes Meson",
"Name[en_GB]": "Meson Project Manager",
"Name[es]": "Gestor de proyectos Meson",
"Name[fr]": "Gestionnaire de projet Meson",
"Name[gl]": "Xestor de proxectos Meson",
"Name[it]": "Gestore progetto Meson",
"Name[nl]": "Meson projectbeheerder",
......
......@@ -9,7 +9,7 @@
"Description[en_GB]": "Imports and edits QMake projects",
"Description[es]": "Importa y edita proyectos QMake",
"Description[fi]": "Tuo ja muokkaa QMake-projekteja",
"Description[fr]": "Importe et édite des projet QMake",
"Description[fr]": "Importe et édite des projets QMake",
"Description[gl]": "Importa e edita proxectos QMake.",
"Description[it]": "Importa e modifica i progetti QMake",
"Description[nl]": "Importeert en bewerkt QMake-projecten",
......
......@@ -3,7 +3,9 @@
"Description": "Scratchpad lets you quickly run and experiment with code without a full project, and even store todos.",
"Description[ca@valencia]": "L'Scratchpad permet executar i experimentar ràpidament amb el codi sense un projecte complet, i inclús emmagatzemar tasques pendents.",
"Description[ca]": "L'Scratchpad permet executar i experimentar ràpidament amb el codi sense un projecte complet, i inclús emmagatzemar tasques pendents.",
"Description[en_GB]": "Scratchpad lets you quickly run and experiment with code without a full project, and even store to-dos.",
"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[gl]": "O caderno de notas permítelle executar e experimentar con código rapidamente sen un proxecto completo, e mesmo pode gardar listas de tarefas.",
"Description[nl]": "Kladblol laat u snel code uitvoeren en mee experimenteren zonder een volledig project en zelfs to-do's opslaan.",
"Description[pl]": "Bazgroszyt umożliwia szybkie wykonanie kodu, a także wykonywanie na nim prób bez pełnego projektu. Umożliwia także zapisywanie sobie zadań do zrobienia.",
......@@ -17,7 +19,9 @@
"Name": "Scratchpad",
"Name[ca@valencia]": "Scratchpad",
"Name[ca]": "Scratchpad",
"Name[en_GB]": "Scratchpad",
"Name[es]": "Scratchpad",
"Name[fr]": "Brouillon",
"Name[gl]": "Caderno de notas",
"Name[it]": "Blocco note",
"Name[nl]": "Kladblok",
......
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