From ece098ac3bf41af338c337363a6c12169ea05d7e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 31 May 2017 08:06:19 +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" --- indicator/org.kde.kdeconnect.nonplasma.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index ba3e68901..bd6057575 100755 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -2,6 +2,7 @@ Name=KDE Connect Indicator Name[ca]=Indicador del KDE Connect Name[ca@valencia]=Indicador del KDE Connect +Name[de]=KDE-Connect-Anzeige Name[nl]=KDE-Connect indicator Name[pt]=Indicador do KDE Connect Name[sv]=KDE-anslut indikator