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 75c1e5e..70fc127 100644 (file)
--- a/src/analyze/gui/org.kde.heaptrack.desktop
+++ b/src/analyze/gui/org.kde.heaptrack.desktop
@@ -16,6 +16,7 @@ Name[en_GB]=Heaptrack
 Name[es]=Heaptrack
 Name[it]=Heaptrack
 Name[nl]=Heaptrack
+Name[pl]=Heaptrack
 Name[pt]=Heaptrack
 Name[sk]=Heaptrack
 Name[sv]=Heaptrack
@@ -30,6 +31,7 @@ GenericName[en_GB]=Profiler Frontend
 GenericName[es]=Interfaz de analizador de rendimiento
 GenericName[it]=Interfaccia a profiler
 GenericName[nl]=Profiler-hulpprogramma
+GenericName[pl]=Nakładka programu profilującego
 GenericName[pt]=Interface de Análise de Performance
 GenericName[sk]=Rozhranie pre profiláciu
 GenericName[sv]=Profileringsgränssnitt
@@ -44,6 +46,7 @@ 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
+Comment[pl]=Wizualizacja danych profilowania pamięci
 Comment[pt]=Visualização dos Dados de Performance da Memória
 Comment[sk]=Vizualizácia dát profilovania pamäte
 Comment[sv]=Visualisering av profileringsdata för minne