From d2e03281dc5c0437e922a15a265ee3cd006572e7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 20 Aug 2025 01:36:17 +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" --- quicksettings/kscreenosd/package/metadata.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quicksettings/kscreenosd/package/metadata.json b/quicksettings/kscreenosd/package/metadata.json index 8c33be14..5ba77827 100644 --- a/quicksettings/kscreenosd/package/metadata.json +++ b/quicksettings/kscreenosd/package/metadata.json @@ -4,14 +4,17 @@ "Authors": [ { "Email": "sebas@kde.org", - "Name": "Sebastian Kügler" + "Name": "Sebastian Kügler", + "Name[x-test]": "xxSebastian Küglerxx" } ], "Description": "Screen setup OSD quick setting for Plasma Mobile", + "Description[x-test]": "xxScreen setup OSD quick setting for Plasma Mobilexx", "Icon": "osd-duplicate", "Id": "org.kde.plasma.quicksetting.kscreenosd", "License": "GPL-2.0+", "Name": "Screen OSD", + "Name[x-test]": "xxScreen OSDxx", "Website": "https://kde.org" } }