Commit 8dcca2d9 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 614b3ddd
......@@ -66,6 +66,7 @@ Comment[pl]=Replicode (konstruktywistyczny język AI i biblioteka uruchomieniowa
Comment[pt]=Replicode (linguagem e ambiente de execução de linguagens de IA construtivas)
Comment[pt_BR]=Replicode (ambiente de execução e linguagens de IA construtivas)
Comment[ru]=Replicode (конструктивистский язык программирования ИИ и исполняемые модули)
Comment[sk]=Replicode (konštruktívny jazyk AI a runtime)
Comment[sv]=Replicode (konstruktivistiskt AI-språk och körprogram)
Comment[tr]=Replicode (yapılandırmacı YZ dili ve çalıştırma zamanı)
Comment[uk]=Replicode (конструктивістська мова та середовище виконання ШІ)
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment