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"

diff --git a/src/analyze/gui/org.kde.heaptrack.desktop b/src/analyze/gui/org.kde.heaptrack.desktop
index 3b1f62d..09667ed 100644 (file)
--- a/src/analyze/gui/org.kde.heaptrack.desktop
+++ b/src/analyze/gui/org.kde.heaptrack.desktop
@@ -10,17 +10,23 @@ Icon=office-chart-area
 Terminal=false
 Name=Heaptrack
 Name[ca]=Heaptrack
+Name[nl]=Heaptrack
 Name[pt]=Heaptrack
+Name[sk]=Heaptrack
 Name[uk]=Heaptrack
 Name[x-test]=xxHeaptrackxx
 GenericName=Profiler Frontend
 GenericName[ca]=Frontal de l'analitzador del rendiment
+GenericName[nl]=Frontend van profiler
 GenericName[pt]=Interface de Análise de Performance
+GenericName[sk]=Rozhranie pre profiláciu
 GenericName[uk]=Інтерфейс профілювання
 GenericName[x-test]=xxProfiler Frontendxx
 Comment=Visualization of Memory Profiling Data
 Comment[ca]=Visualització de les dades per a l'anàlisi del rendiment de la memòria
+Comment[nl]=Visualisatie van geheugenprofileringsgegevens
 Comment[pt]=Visualização dos Dados de Performance da Memória
+Comment[sk]=Vizualizácia dát profilovania pamäte
 Comment[uk]=Візуалізація даних профілювання пам’яті
 Comment[x-test]=xxVisualization of Memory Profiling Dataxx
 Categories=Qt;KDE;Development;