From 972046f0622293fc55720a05330b6aa041ca44c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 9 Dec 2020 06:49:33 +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" --- bin/plasma-mobile.desktop.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake index ef4daa75..40fa1442 100644 --- a/bin/plasma-mobile.desktop.cmake +++ b/bin/plasma-mobile.desktop.cmake @@ -4,7 +4,7 @@ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/kwinwrapper DesktopNames=KDE Name=Plasma Mobile Name[ast]=Plasma Mobile -Name[ca]=Plasma mòbil +Name[ca]=Plasma Mobile Name[ca@valencia]=Plasma Mòbil Name[cs]=Plasma Mobile Name[da]=Plasma Mobile @@ -38,7 +38,7 @@ Name[zh_CN]=Plasma Mobile Name[zh_TW]=Plasma 行動 Comment=Plasma Mobile by KDE Comment[ast]=Plasma Mobile, por KDE -Comment[ca]=Plasma mòbil, creat per la comunitat KDE +Comment[ca]=Plasma Mobile, creat per la comunitat KDE Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE Comment[cs]=Plasma Mobile od KDE Comment[da]=Plasma Mobile fra KDE