Commit 7764de04 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 f6e93aed
......@@ -61,4 +61,5 @@ Name[ug]=تام تەسۋىر
Name[uk]=Ковзання
Name[wa]=Rider
Name[x-test]=xxSlidexx
Name[zh_CN]=滑行
Name[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