From 6f16d9b2737f4d392016318e2839f55826dff1bc Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 21 Apr 2023 02:32:52 +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/login/package/metadata.json  | 2 +-
 src/effects/logout/package/metadata.json | 2 +-
 src/kwin.notifyrc                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/effects/login/package/metadata.json b/src/effects/login/package/metadata.json
index f7669e9c3a..fdbc3c4b88 100644
--- a/src/effects/login/package/metadata.json
+++ b/src/effects/login/package/metadata.json
@@ -30,7 +30,7 @@
                 "Name[ru]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
                 "Name[sl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
                 "Name[ta]": "லூபோசு லுனாக்கு, காய் ஊவே புரோலிக்கு, மார்ட்டின் கிராஸ்லின்",
-                "Name[tr]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
+                "Name[tr]": "Luboš Luňák, Kai Uwe Broulik, Martin Gräßlin",
                 "Name[uk]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
                 "Name[vi]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
                 "Name[x-test]": "xxLubos Lunak, Kai Uwe Broulik, Martin Gräßlinxx",
diff --git a/src/effects/logout/package/metadata.json b/src/effects/logout/package/metadata.json
index 95e6d73100..bbfad3adc4 100644
--- a/src/effects/logout/package/metadata.json
+++ b/src/effects/logout/package/metadata.json
@@ -30,7 +30,7 @@
                 "Name[ru]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
                 "Name[sl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
                 "Name[ta]": "லூபோசு லுனாக்கு, காய் ஊவே புரோலிக்கு, மார்ட்டின் கிராஸ்லின், மார்க்கோ மார்ட்டின்",
-                "Name[tr]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
+                "Name[tr]": "Luboš Luňák, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
                 "Name[uk]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
                 "Name[vi]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
                 "Name[x-test]": "xxLubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martinxx",
diff --git a/src/kwin.notifyrc b/src/kwin.notifyrc
index 37536f59d8..141046f65c 100644
--- a/src/kwin.notifyrc
+++ b/src/kwin.notifyrc
@@ -130,7 +130,7 @@ Name[sr@latin]=Slaganje je suspendovano
 Name[sv]=Sammansättning har stoppats
 Name[ta]=Compositing முடக்கப்பட்டுள்ளது
 Name[th]=การทำคอมโพสิตถูกหยุดชั่วคราว
-Name[tr]=Bileşiklik askıya alındı
+Name[tr]=Bileşikleştirme askıya alındı
 Name[ug]=ئارىلاش مەشغۇلاتى توختىتىلدى
 Name[uk]=Композитний показ було тимчасово вимкнено
 Name[vi]=Việc kết hợp đã bị ngưng