Commit d53f4947 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 3ee4cdf6
......@@ -7,6 +7,7 @@
"Description[en_GB]": "Backend for Python Scientific Programming",
"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[nl]": "Backend voor wetenschappelijk programmeren in Python",
"Description[pt]": "Infra-Estrutura de Programação Científica com Python",
"Description[pt_BR]": "Infraestrutura de programação científica Python",
......@@ -23,6 +24,7 @@
"Name[en_GB]": "Python",
"Name[es]": "Python",
"Name[et]": "Python",
"Name[fr]": "Python",
"Name[nl]": "Python",
"Name[pt]": "Python",
"Name[pt_BR]": "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