From 690a709dc8f8b3baef2d4276ed24efda1e962e6e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 26 Jun 2019 05:22:10 +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" --- plasma-mobile.desktop.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plasma-mobile.desktop.cmake b/plasma-mobile.desktop.cmake index 90a9019b..5ec2a971 100644 --- a/plasma-mobile.desktop.cmake +++ b/plasma-mobile.desktop.cmake @@ -7,6 +7,7 @@ Name=Plasma Mobile Name[ca]=Plasma Mòbil Name[ca@valencia]=Plasma Mòbil Name[cs]=Plasma Mobile +Name[de]=Plasma Mobile Name[en_GB]=Plasma Mobile Name[es]=Plasma Mobile Name[fi]=Plasma Mobile @@ -26,6 +27,7 @@ Comment=Plasma Mobile by KDE Comment[ca]=Plasma Mòbil, creat per la comunitat KDE Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE Comment[cs]=Plasma Mobile od KDE +Comment[de]=Plasma Mobile von KDE Comment[en_GB]=Plasma Mobile by KDE Comment[es]=Plasma Mobile creado por KDE Comment[fi]=KDE:n Plasma Mobile