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 cfe1839..bbd8a38 100644 (file)
--- a/src/analyze/gui/org.kde.heaptrack.desktop
+++ b/src/analyze/gui/org.kde.heaptrack.desktop
@@ -15,6 +15,7 @@ Name[cs]=Heaptrack
 Name[de]=Heaptrack
 Name[en_GB]=Heaptrack
 Name[es]=Heaptrack
+Name[gl]=Heaptrack
 Name[it]=Heaptrack
 Name[nl]=Heaptrack
 Name[pl]=Heaptrack
@@ -32,6 +33,7 @@ GenericName[de]=Profiler-Oberfläche
 GenericName[en_GB]=Profiler Frontend
 GenericName[es]=Interfaz de analizador de rendimiento
 GenericName[fr]=Interface de profilage
+GenericName[gl]=Interface de analizador de rendemento
 GenericName[it]=Interfaccia a profiler
 GenericName[nl]=Frontend van profiler
 GenericName[pl]=Nakładka programu profilującego
@@ -49,6 +51,7 @@ Comment[de]=Visualisierung von Daten des Speicherverhaltens eines Programms
 Comment[en_GB]=Visualisation of Memory Profiling Data
 Comment[es]=Visualización de datos de análisis de rendimiento de la memoria
 Comment[fr]=Visualisation des données de profilage de la mémoire
+Comment[gl]=Visualización dos datos da análise de rendemento
 Comment[it]=Visualizzazione dei dati di profiling della memoria
 Comment[nl]=Visualisatie van geheugenprofileringsgegevens
 Comment[pl]=Wizualizacja danych profilowania pamięci