Commit 676fd9d6 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 0b1e6e89
......@@ -9,6 +9,7 @@
"Description[es]": "Motor para programación científica en Python",
"Description[et]": "Pythoni teadusliku programmeerimise taustaprogramm",
"Description[fr]": "Moteur pour la programmation scientifique Python",
"Description[it]": "Backend per l'ambiente scientifico di programmazione Python",
"Description[nl]": "Backend voor wetenschappelijk programmeren in Python",
"Description[nn]": "Motor for Pythons «Scientific Programming»",
"Description[pt]": "Infra-Estrutura de Programação Científica com Python",
......@@ -28,6 +29,7 @@
"Name[es]": "Python",
"Name[et]": "Python",
"Name[fr]": "Python",
"Name[it]": "Python",
"Name[nl]": "Python",
"Name[nn]": "Python",
"Name[pt]": "Python",
......
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