From 7d81f95592f3862bfd97298de80d926084f87904 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 29 Jun 2024 01:19:28 +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"
---
 src/plugins/shakecursor/cursors/Breeze_Light/index.theme   | 6 ++++++
 src/plugins/shakecursor/cursors/breeze_cursors/index.theme | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/plugins/shakecursor/cursors/Breeze_Light/index.theme b/src/plugins/shakecursor/cursors/Breeze_Light/index.theme
index 7fe923640f..24a40c6992 100644
--- a/src/plugins/shakecursor/cursors/Breeze_Light/index.theme
+++ b/src/plugins/shakecursor/cursors/Breeze_Light/index.theme
@@ -4,7 +4,10 @@ Name[ar]=نسيم فاتح
 Name[bg]=Breeze Светъл
 Name[ca]=Brisa clara
 Name[cs]=Breeze Světlé
+Name[eo]=Breeze Light
 Name[es]=Brisa claro
+Name[eu]=Breeze argia
+Name[fr]=Breeze clair
 Name[he]=בריזה בהירה
 Name[hu]=Breeze Light
 Name[ia]=Breeze Light (Brisa Ligier)
@@ -20,7 +23,10 @@ Comment[ar]=نسيم فاتح من مجموعة تصميم كِيدِي
 Comment[bg]=Breeze Светъл от KDE VDG
 Comment[ca]=Brisa clara, creat pel VDG del KDE
 Comment[cs]=Breeze Light od KDE VDG
+Comment[eo]=Brizo Leĝera de la KDE VDG
 Comment[es]=Brisa claro, por KDE VDG
+Comment[eu]=Breeze argia, KDE VDGk egina
+Comment[fr]=Breeze clair par le groupe de conception graphique de KDE
 Comment[he]=בריזה בהירה מאת צוות העיצוב החזותי של KDE
 Comment[hu]=Breeze Light a KDE VDG-től
 Comment[ia]=Breeze (Brisa) Ligier per KDE VDG
diff --git a/src/plugins/shakecursor/cursors/breeze_cursors/index.theme b/src/plugins/shakecursor/cursors/breeze_cursors/index.theme
index e6bf96a80c..87439efcec 100644
--- a/src/plugins/shakecursor/cursors/breeze_cursors/index.theme
+++ b/src/plugins/shakecursor/cursors/breeze_cursors/index.theme
@@ -4,7 +4,10 @@ Name[ar]=نسيم
 Name[bg]=Breeze
 Name[ca]=Brisa
 Name[cs]=Breeze
+Name[eo]=Breeze
 Name[es]=Brisa
+Name[eu]=Breeze (Brisa)
+Name[fr]=Breeze
 Name[he]=בריזה
 Name[hu]=Breeze
 Name[ia]=Breeze(Brisa)
@@ -20,7 +23,10 @@ Comment[ar]=نسيم من مجموعة تصميم كِيدِي
 Comment[bg]=Breeze от KDE VDG
 Comment[ca]=Brisa, creat pel VDG del KDE
 Comment[cs]=Breeze od KDE VDG
+Comment[eo]=Brizo de la KDE VDG
 Comment[es]=Brisa, por KDE VDG
+Comment[eu]=Breeze, KDE VDGk egina
+Comment[fr]=Breeze par le groupe de conception graphique de KDE
 Comment[he]=בריזה מאת צוות העיצוב החזותי של KDE
 Comment[hu]=Breeze a KDE VDG-től
 Comment[ia]=Breeze (Brisa) per le KDE VDG