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 eb3a771..d3ad094 100644 (file)
--- a/src/analyze/gui/org.kde.heaptrack.desktop
+++ b/src/analyze/gui/org.kde.heaptrack.desktop
@@ -10,6 +10,7 @@ Icon=office-chart-area
 Terminal=false
 Name=Heaptrack
 Name[ca]=Heaptrack
+Name[en_GB]=Heaptrack
 Name[es]=Heaptrack
 Name[it]=Heaptrack
 Name[nl]=Heaptrack
@@ -20,6 +21,7 @@ Name[uk]=Heaptrack
 Name[x-test]=xxHeaptrackxx
 GenericName=Profiler Frontend
 GenericName[ca]=Frontal de l'analitzador del rendiment
+GenericName[en_GB]=Profiler Frontend
 GenericName[es]=Interfaz de analizador de rendimiento
 GenericName[it]=Interfaccia a profiler
 GenericName[nl]=Frontend van profiler
@@ -30,6 +32,7 @@ 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[en_GB]=Visualisation of Memory Profiling Data
 Comment[es]=Visualización de datos de análisis de rendimiento de la memoria
 Comment[it]=Visualizzazione dei dati di profiling della memoria
 Comment[nl]=Visualisatie van geheugenprofileringsgegevens