From 23b4ad1f0e188244a093fa641bee33f7457feac0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 11 Jun 2022 01:42:04 +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 27fe9c35..9e110a15 100644
--- a/containments/homescreens/halcyon/package/metadata.desktop
+++ b/containments/homescreens/halcyon/package/metadata.desktop
@@ -7,6 +7,7 @@ Keywords=
 Name=Halcyon
 Name[ca]=Halcyon
 Name[es]=Halcyon
+Name[fr]=Halcyon
 Name[nl]=Halcyon
 Name[tr]=Halikon
 Name[uk]=Альціон
@@ -14,6 +15,7 @@ Name[x-test]=xxHalcyonxx
 Description=A mobile homescreen focused on simplicity and ease-of-use.
 Description[ca]=Una pantalla d'inici del mòbil enfocada a la senzillesa i facilitat d'ús.
 Description[es]=Pantalla de inicio para móvil centrada en la simplicidad y en la facilidad de uso.
+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[tr]=Yalınlığa ve kullanım kolaylığına odaklanmış, taşınabilir bir ana ekran.
 Description[uk]=Домашній екран для мобільних пристроїв із акцентом на простоті та зручності.