Commit 19a28c79 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 5cea391f
......@@ -10,7 +10,7 @@
"Description[es]": "Importa y edita proyectos Make personalizados",
"Description[et]": "Kohandatud make'i projektide import ja muutmine",
"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",
......@@ -10,7 +10,7 @@
"Description[es]": "Importa y edita proyectos QMake",
"Description[et]": "QMake'i projektide import ja muutmine",
"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",
Supports Markdown
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