Commit e5a8dea6 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 c9e7bfb2
......@@ -13,6 +13,7 @@ Name[eu]=AtCore probatzeko bezeroa
Name[fi]=AtCore – koeasiakas
Name[fr]=Client de test AtCore
Name[gl]=Cliente de probas de AtCore
Name[ia]=Cliente de prova de AtCore
Name[it]=Client di prova per AtCore
Name[ko]=AtCore 테스트 클라이언트
Name[nl]=AtCore testclient
......
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