Commit cd18b89a authored by Script Kiddy's avatar Script Kiddy
Browse files

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 a10636ea
Pipeline #204844 skipped
......@@ -59,7 +59,7 @@ GenericName[ru]=Интерфейс к профилировщику
GenericName[sk]=Rozhranie pre profiláciu
GenericName[sl]=Začelje analizatorja profila
GenericName[sv]=Profileringsgränssnitt
GenericName[tr]=Profil Önyüzü
GenericName[tr]=Profilci Ön Yüzü
GenericName[uk]=Інтерфейс профілювання
GenericName[x-test]=xxProfiler Frontendxx
GenericName[zh_CN]=分析器前端
......
Supports Markdown
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