From 9a913e178362003c850f4eb6f5359e6804ecaf30 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Jul 2022 02:04:13 +0000 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-dev.desktop.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index 61acee3b..de5fbbb0 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -7,6 +7,7 @@ DesktopNames=KDE Name=Plasma Mobile (Development) Name[az]=Plasma Mobil (Tərtibat) Name[ca]=Plasma Mobile (Desenvolupament) +Name[ca@valencia]=Plasma Mobile (Desenvolupament) Name[es]=Plasma Mobile (desarrollo) Name[fr]=Plasma Mobile (Développement) Name[ia]=Plasma Mobile (Disveloppamento)