Commit 97573c08 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 0b9845de
......@@ -178,6 +178,7 @@ Comment[ru]=Простая в использовании программа дл
Comment[sk]=Jednoduchý maľovací program
Comment[sl]=Enostaven program za risanje
Comment[sv]=Ett lättanvänt ritprogram
Comment[tr]=Kolay kullanılır bir çizim programı
Comment[uk]=Проста у користуванні програма для малювання
Comment[x-test]=xxAn easy-to-use paint programxx
Comment[zh_CN]=一个简单易用的画图程序
......
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