From b279de93bec341c6ab47efc6f6cb66fd9fa4fe1d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Mar 2017 05:28:11 +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" --- data/org.kde.kdenlive.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/data/org.kde.kdenlive.desktop b/data/org.kde.kdenlive.desktop index 0e57977df..1eb9c4dbd 100644 --- a/data/org.kde.kdenlive.desktop +++ b/data/org.kde.kdenlive.desktop @@ -83,6 +83,7 @@ Comment=Nonlinear video editor by KDE Comment[ca]=Editor de vídeo no lineal, creat per la comunitat KDE Comment[ca@valencia]=Editor de vídeo no lineal, creat per la comunitat KDE Comment[cs]=Nelineární editor videí od KDE +Comment[de]=Nichtlinearer Video-Editor von KDE Comment[it]=Editor di video non lineare di KDE Comment[nl]=Niet-lineaire video-bewerker door KDE Comment[pt]=Editor de vídeo não-linear do KDE -- GitLab