From 20e5fc62b1f8f09b41790afa5bb31503da307177 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 28 Nov 2021 01:32:42 +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/effects/blur/blur_config.desktop                             | 1 -
 src/effects/login/package/metadata.desktop                       | 1 -
 .../kdecorations/aurorae/themes/plastik/package/metadata.desktop | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/effects/blur/blur_config.desktop b/src/effects/blur/blur_config.desktop
index b7729ffe9f..6067bf861d 100644
--- a/src/effects/blur/blur_config.desktop
+++ b/src/effects/blur/blur_config.desktop
@@ -37,7 +37,6 @@ Name[he]=טשטוש
 Name[hi]=धुंधला करें
 Name[hne]=धुंधला करव
 Name[hr]=Mrlja
-Name[hsb]=Młowojty
 Name[hu]=Elmosódás
 Name[ia]=Obscura (Blur)
 Name[id]=Buram
diff --git a/src/effects/login/package/metadata.desktop b/src/effects/login/package/metadata.desktop
index 37df15fb49..6971f0d0ec 100644
--- a/src/effects/login/package/metadata.desktop
+++ b/src/effects/login/package/metadata.desktop
@@ -32,7 +32,6 @@ Name[he]=כניסה
 Name[hi]=लॉगइन
 Name[hne]=लागइन
 Name[hr]=Prijava
-Name[hsb]=Přizjewjenje
 Name[hu]=Bejelentkezés
 Name[ia]=Accesso de identification
 Name[id]=Login
diff --git a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
index 163b9c7704..59f9403024 100644
--- a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
+++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
@@ -34,7 +34,6 @@ Name[he]=פלסטיק
 Name[hi]=प्लास्टिक
 Name[hne]=प्लास्टिक
 Name[hr]=Plastika
-Name[hsb]=Plastik
 Name[hu]=Plastik
 Name[ia]=Plastik
 Name[id]=Plastik