From bcf1a78761f1cfefdbcbdfb7493e2d29034ad4c3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 31 May 2021 02:11:29 +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"
---
 kcms/colors/colorschemes.knsrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcms/colors/colorschemes.knsrc b/kcms/colors/colorschemes.knsrc
index b0d496788..5a3ae743d 100644
--- a/kcms/colors/colorschemes.knsrc
+++ b/kcms/colors/colorschemes.knsrc
@@ -1,6 +1,6 @@
 [KNewStuff3]
 Name=Color Schemes
-Name[az]=Rən Sxemləri
+Name[az]=Rəng Sxemləri
 Name[ca]=Esquemes de color
 Name[cs]=Barevná schémata
 Name[da]=Farvetemaer