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"
KDE · Aug 6, 2020 · bc9e374 · bc9e374
1 parent 1ea17c3
commit bc9e374
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/analyze/gui/org.kde.heaptrack.desktop b/src/analyze/gui/org.kde.heaptrack.desktop
@@ -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