Commit 358da3a4 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 add04380
......@@ -69,7 +69,7 @@ Name[tg]=KMag
Name[tr]=KMag
Name[ug]=KMag
Name[uk]=KMag
Name[vi]=Kính lúp K
Name[vi]=KMag
Name[x-test]=xxKMagxx
Name[zh_CN]=放大镜
Name[zh_TW]=K-放大鏡
......
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