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 · Jun 18, 2020 · 1ea17c3 · 1ea17c3
1 parent d439c84
commit 1ea17c3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/analyze/gui/org.kde.heaptrack.desktop b/src/analyze/gui/org.kde.heaptrack.desktop
@@ -31,6 +31,7 @@ Name[sk]=Heaptrack
 Name[sv]=Heaptrack
 Name[tr]=Heaptrack
 Name[uk]=Heaptrack
+Name[x-test]=xxHeaptrackxx
 Name[zh_CN]=Heaptrack
 GenericName=Profiler Frontend
 GenericName[ca]=Frontal de l'analitzador del rendiment
@@ -54,6 +55,7 @@ GenericName[sk]=Rozhranie pre profiláciu
 GenericName[sv]=Profileringsgränssnitt
 GenericName[tr]=Profil Önyüzü
 GenericName[uk]=Інтерфейс профілювання
+GenericName[x-test]=xxProfiler Frontendxx
 GenericName[zh_CN]=分析器前端
 Comment=Visualization of Memory Profiling Data
 Comment[ca]=Visualització de les dades per a l'anàlisi del rendiment de la memòria
@@ -77,5 +79,6 @@ Comment[sk]=Vizualizácia dát profilovania pamäte
 Comment[sv]=Visualisering av profileringsdata för minne
 Comment[tr]=Bellek Profilleme Verisinin Görselleştirilmesi
 Comment[uk]=Візуалізація даних профілювання пам’яті
+Comment[x-test]=xxVisualization of Memory Profiling Dataxx
 Comment[zh_CN]=可视化内存分析数据
 Categories=Qt;KDE;Development;