From 0564472de4ba738fc07dddedf30208d104121676 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Mar 2023 03:27:43 +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/hotspot/metadata.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quicksettings/hotspot/metadata.json b/quicksettings/hotspot/metadata.json index c639d2e2..75ab303e 100644 --- a/quicksettings/hotspot/metadata.json +++ b/quicksettings/hotspot/metadata.json @@ -3,14 +3,17 @@ "Authors": [ { "Email": "skilvingr@gmail.com", - "Name": "Yari Polla" + "Name": "Yari Polla", + "Name[x-test]": "xxYari Pollaxx" } ], "Description": "Hotspot quick setting for Plasma Mobile", + "Description[x-test]": "xxHotspot quick setting for Plasma Mobilexx", "Icon": "network-wireless-hotspot", "Id": "org.kde.plasma.quicksetting.hotspot", "License": "GPL-2.0+", "Name": "Hotspot", + "Name[x-test]": "xxHotspotxx", "ServiceTypes": [ "KPackage/GenericQML" ],