Commit b58ed5a5 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 da622d3b
......@@ -56,7 +56,7 @@ GenericName[ug]=IRC خېرىدارى
GenericName[uk]=Клієнт IRC
GenericName[x-test]=xxIRC Clientxx
GenericName[zh_CN]=IRC 客户端
GenericName[zh_TW]=IRC 戶端程式
GenericName[zh_TW]=IRC 戶端程式
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