From 33dcb543f290f09feea12f1a422bf8b10a89ce1b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 16 Jun 2022 01:55:25 +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"
---
 containments/homescreens/halcyon/package/metadata.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/containments/homescreens/halcyon/package/metadata.desktop b/containments/homescreens/halcyon/package/metadata.desktop
index b7349139..34e5d362 100644
--- a/containments/homescreens/halcyon/package/metadata.desktop
+++ b/containments/homescreens/halcyon/package/metadata.desktop
@@ -11,6 +11,7 @@ Name[es]=Halcyon
 Name[fr]=Halcyon
 Name[nl]=Halcyon
 Name[pa]=ਹਲਕਿਆਨ
+Name[pt]=Halcyon
 Name[sl]=Halcyon
 Name[sv]=Halcyon
 Name[tr]=Halikon
@@ -23,6 +24,7 @@ Description[es]=Pantalla de inicio para móvil centrada en la simplicidad y en l
 Description[fr]=Un écran d'accueil pour périphérique mobile, centré sur la simplicité et la facilité d'utilisation.
 Description[nl]=Een startscherm voor een mobiel gericht op eenvoud en gebruiksgemak.
 Description[pa]=ਮੋਬਾਈਲ ਮੁੱਖ-ਸਕਰੀਨ, ਜੋ ਕਿ ਸਰਲ ਅਤੇ ਵਰਤਣ ਲਈ ਸੌਖੇ ਟੀਚੇ ਉੱਤੇ ਕੇਂਦਰਿਤ ਹੈ।
+Description[pt]=Um ecrã inicial para dispositivos móveis focado na simplicidade e facilidade de uso.
 Description[sl]=Mobilni domači zaslon, enostavnega videza in uporabe
 Description[sv]=En hemskärm för mobiler fokuserad på enkelhet och användbarhet.
 Description[tr]=Yalınlığa ve kullanım kolaylığına odaklanmış, taşınabilir bir ana ekran.