From 4ca6c2ffcb99e419d711c3435dc4f6128372a304 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Feb 2017 07:37:47 +0100 Subject: [PATCH] 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" --- src/analyze/gui/org.kde.heaptrack.desktop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/analyze/gui/org.kde.heaptrack.desktop b/src/analyze/gui/org.kde.heaptrack.desktop index 2dbb0e2..452b1f1 100644 --- a/src/analyze/gui/org.kde.heaptrack.desktop +++ b/src/analyze/gui/org.kde.heaptrack.desktop @@ -11,6 +11,7 @@ Terminal=false Name=Heaptrack Name[ca]=Heaptrack Name[es]=Heaptrack +Name[it]=Heaptrack Name[nl]=Heaptrack Name[pt]=Heaptrack Name[sk]=Heaptrack @@ -19,6 +20,7 @@ Name[x-test]=xxHeaptrackxx GenericName=Profiler Frontend GenericName[ca]=Frontal de l'analitzador del rendiment GenericName[es]=Interfaz de analizador de rendimiento +GenericName[it]=Interfaccia a profiler GenericName[nl]=Profiler-hulpprogramma GenericName[pt]=Interface de Análise de Performance GenericName[sk]=Rozhranie pre profiláciu @@ -27,6 +29,7 @@ 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[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[pt]=Visualização dos Dados de Performance da Memória Comment[sk]=Vizualizácia dát profilovania pamäte -- 2.7.4