Commit 17a0a943 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 2bdfbdc9
......@@ -85,5 +85,4 @@ Comment[sk]=Spracovať text pomocou príkazov terminálu
Comment[sv]=Behandla text med terminalkommandon
Comment[uk]=Обробити текст за допомогою команд термінала
Comment[x-test]=xxProcess text using terminal commandsxx
Comment[zh_CN]=使用终端命令处理文本
Comment[zh_TW]=使用終端器指令處理文字
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