Commit 3f43a376 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 153f77e2
......@@ -23,6 +23,7 @@
"Description[sr@latin]": "Jednostavan priključak za Kate",
"Description[sr]": "Једноставан прикључак за Кејт",
"Description[sv]": "Ett enkelt insticksprogram för Kate",
"Description[tr]": "Basit Kate Eklentisi",
"Description[uk]": "Простий додаток до Kate",
"Description[x-test]": "xxA simple Kate pluginxx",
"Description[zh_CN]": "一个简单的 Kate 插件",
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