Commit e8485d52 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 7bd015fc
......@@ -23,6 +23,7 @@ Name[pt]=Cliente de Testes do AtCore
Name[pt_BR]=Cliente de teste AtCore
Name[ru]=Тестовый клиент AtCore
Name[sk]=AtCore Test Klient
Name[sl]=Preizkusni odjemalec AtCore
Name[sv]=AtCore testklient
Name[tr]=AtCore Test İstemcisi
Name[uk]=Тестовий клієнт 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