From a45395491b166f2f8ecc3d8e81757d565e818f4f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 29 May 2025 01:33:33 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index 70621b71..b1894505 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -9,7 +9,7 @@ Name=Plasma Mobile (Development) Name[ar]=بلازما الجوال (التطوير) Name[az]=Plasma Mobil (Tərtibat) Name[ca]=Plasma Mobile (Desenvolupament) -Name[ca@valencia]=Plasma Mobile (Desenvolupament) +Name[ca@valencia]=Plasma Mobile (desenvolupament) Name[cs]=Plasma Mobile (Vývojová) Name[de]=Plasma Mobile (Entwicklung) Name[en_GB]=Plasma Mobile (Development)