From 1588a45026bf6ef94c89a82d05088921ef912264 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 3 Mar 2023 02:40:44 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/quicksettings/hotspot/metadata.json b/quicksettings/hotspot/metadata.json index 75ab303e..2bf53933 100644 --- a/quicksettings/hotspot/metadata.json +++ b/quicksettings/hotspot/metadata.json @@ -4,15 +4,18 @@ { "Email": "skilvingr@gmail.com", "Name": "Yari Polla", + "Name[uk]": "Yari Polla", "Name[x-test]": "xxYari Pollaxx" } ], "Description": "Hotspot quick setting for Plasma Mobile", + "Description[uk]": "Швидке налаштовування точки доступу для Мобільної Плазми", "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[uk]": "Точка доступу", "Name[x-test]": "xxHotspotxx", "ServiceTypes": [ "KPackage/GenericQML"