Commit f63d4a80 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 509d8db3
......@@ -310,6 +310,6 @@ Comment[ug]=چاي سوۋۇپ قالدى.
Comment[uk]=Час остигає.
Comment[x-test]=xxTea is getting lonely.xx
Comment[zh_CN]=茶都凉了
Comment[zh_TW]=茶煮好了,怎麼沒人喝
Comment[zh_TW]=茶煮好了,怎麼沒人喝
Sound=KDE-Sys-App-Special.ogg
Action=Sound
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