From bc9e3744bcc47de978673d1e382f4125a1ab5fa8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 6 Aug 2020 09:25:51 +0200 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/analyze/gui/org.kde.heaptrack.desktop b/src/analyze/gui/org.kde.heaptrack.desktop index 26c3eea6..7f835cc7 100644 --- a/src/analyze/gui/org.kde.heaptrack.desktop +++ b/src/analyze/gui/org.kde.heaptrack.desktop @@ -34,8 +34,8 @@ Name[uk]=Heaptrack Name[x-test]=xxHeaptrackxx Name[zh_CN]=Heaptrack GenericName=Profiler Frontend -GenericName[ca]=Frontal de l'analitzador del rendiment -GenericName[ca@valencia]=Frontal de l'analitzador del rendiment +GenericName[ca]=Frontal per a l'analitzador del rendiment +GenericName[ca@valencia]=Frontal per a l'analitzador del rendiment GenericName[cs]=Rozhraní pro profilaci GenericName[da]=Profilerings-frontend GenericName[de]=Profiler-Oberfläche