From 1c96a6d060dce28e7dd33dfd8ffbb4383161feb0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 7 Jun 2021 01:16:14 +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"
---
 colors/BreezeLight.colors                         | 2 +-
 cursors/Breeze_Snow/Breeze_Snow/index.theme       | 2 +-
 cursors/Breeze_Snow/src/index.theme               | 2 +-
 kdecoration/config/breezedecorationconfig.desktop | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors
index 6d6a6796..0c58162f 100644
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@@ -138,7 +138,7 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
 Name[da]=Breeze Light
-Name[de]=Breeze-Hell
+Name[de]=Breeze Hell
 Name[el]=Breeze φωτεινό
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme
index 59dc9a74..649594bb 100644
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@@ -5,7 +5,7 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
 Name[da]=Breeze Light
-Name[de]=Breeze-Hell
+Name[de]=Breeze Hell
 Name[el]=Breeze φωτεινό
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme
index 59dc9a74..649594bb 100644
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@@ -5,7 +5,7 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
 Name[da]=Breeze Light
-Name[de]=Breeze-Hell
+Name[de]=Breeze Hell
 Name[el]=Breeze φωτεινό
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop
index b5d0ad0e..58d5402d 100644
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@@ -105,7 +105,7 @@ X-KDE-Keywords[ca]=breeze,brisa,decoració
 X-KDE-Keywords[ca@valencia]=breeze,brisa,decoració
 X-KDE-Keywords[cs]=breeze,dekorace
 X-KDE-Keywords[da]=breeze,dekoration
-X-KDE-Keywords[de]=Breeze,Dekoration
+X-KDE-Keywords[de]=Breeze-Dekoration
 X-KDE-Keywords[el]=breeze,διακόσμηση
 X-KDE-Keywords[en_GB]=breeze,decoration
 X-KDE-Keywords[es]=breeze,brisa,decoración