Commit 2417d858 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 e1a7c594
......@@ -2,6 +2,7 @@
"KPlugin": {
"Dependencies": [],
"Description": "Backend for Python Scientific Programming",
"Description[ca@valencia]": "Dorsal per a la programació científica Python",
"Description[ca]": "Dorsal per a la programació científica Python",
"Description[es]": "Motor para programación científica en Python",
"Description[et]": "Pythoni teadusliku programmeerimise taustaprogramm",
......@@ -15,6 +16,7 @@
"Id": "Python",
"License": "GPL",
"Name": "Python",
"Name[ca@valencia]": "Python",
"Name[ca]": "Python",
"Name[es]": "Python",
"Name[et]": "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