Commit b43e343a 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 01fa1b4e
......@@ -116,7 +116,7 @@ GenericName[tr]=Profil Önyüzü
GenericName[uk]=Інтерфейс до Profiler
GenericName[wa]=Eterface grafike po Profiler
GenericName[x-test]=xxProfiler Frontendxx
GenericName[zh_CN]=性能测试数据前端
GenericName[zh_CN]=分析器前端
GenericName[zh_TW]=分析器前端
Comment=Visualization of Performance Profiling Data
Comment[bg]=Визуализация на данните за производителност
......
......@@ -99,7 +99,7 @@ GenericName[tr]=Profil Önyüzü
GenericName[uk]=Інтерфейс до Profiler
GenericName[wa]=Eterface grafike po Profiler
GenericName[x-test]=xxProfiler Frontendxx
GenericName[zh_CN]=性能测试数据前端
GenericName[zh_CN]=分析器前端
GenericName[zh_TW]=分析器前端
Comment=Visualization of Performance Profiling Data
Comment[bg]=Визуализация на данните за производителност
......
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