Commit 34861bce 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 4810ce10
......@@ -14,6 +14,8 @@
"Description[nn]": "Motor for Pythons «Scientific Programming»",
"Description[pt]": "Infra-Estrutura de Programação Científica com Python",
"Description[pt_BR]": "Infraestrutura de programação científica Python",
"Description[sk]": "Backend pre vedecké programovanie v Python-e",
"Description[sl]": "Zaledje za znanstveno programersko okolje Python",
"Description[sv]": "Bakgrundsprogram för Python vetenskaplig programmeringsmiljö",
"Description[uk]": "Модуль наукового програмування мовою Python",
"Description[x-test]": "xxBackend for Python Scientific Programmingxx",
......@@ -34,6 +36,8 @@
"Name[nn]": "Python",
"Name[pt]": "Python",
"Name[pt_BR]": "Python",
"Name[sk]": "Python",
"Name[sl]": "Python",
"Name[sv]": "Python",
"Name[uk]": "Python",
"Name[x-test]": "xxPythonxx",
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