Commit bc9e3744 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 1ea17c3c
......@@ -34,8 +34,8 @@ Name[uk]=Heaptrack
Name[x-test]=xxHeaptrackxx
Name[zh_CN]=Heaptrack
GenericName=Profiler Frontend
GenericName[ca]=Frontal de l'analitzador del rendiment
GenericName[ca@valencia]=Frontal de l'analitzador del rendiment
GenericName[ca]=Frontal per a l'analitzador del rendiment
GenericName[ca@valencia]=Frontal per a l'analitzador del rendiment
GenericName[cs]=Rozhraní pro profilaci
GenericName[da]=Profilerings-frontend
GenericName[de]=Profiler-Oberfläche
......
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