Commit e8ae11b9 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 7b71a0b8
......@@ -26,7 +26,7 @@ Name[tr]=AtCore Test İstemcisi
Name[uk]=Тестовий клієнт AtCore
Name[x-test]=xxAtCore Test Clientxx
Name[zh_CN]=AtCore 测试客户端
Name[zh_TW]=AtCore 測試戶端
Name[zh_TW]=AtCore 測試戶端
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