From 1111cc18c43185a1a83d7d5ccf8f254049c8bde9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 8 Sep 2022 01:51:41 +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/autostart/kcm_autostart.json             |  2 +-
 kcms/kfontinst/apps/org.kde.kfontview.desktop |  2 +-
 kcms/kfontinst/viewpart/kfontviewpart.json    |  2 +-
 kcms/nightcolor/kcm_nightcolor.json           | 11 +++++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/kcms/autostart/kcm_autostart.json b/kcms/autostart/kcm_autostart.json
index efdcac565..21f8ebeac 100644
--- a/kcms/autostart/kcm_autostart.json
+++ b/kcms/autostart/kcm_autostart.json
@@ -83,7 +83,7 @@
         "Name[sl]": "Samodejni zagon",
         "Name[sv]": "Automatisk start",
         "Name[ta]": "சுயதுவக்கம்",
-        "Name[tr]": "Otomatik başlatma",
+        "Name[tr]": "Otomatik Başlatma",
         "Name[uk]": "Автозапуск",
         "Name[vi]": "Khởi động tự động",
         "Name[x-test]": "xxAutostartxx",
diff --git a/kcms/kfontinst/apps/org.kde.kfontview.desktop b/kcms/kfontinst/apps/org.kde.kfontview.desktop
index 576662efe..341a8b5c8 100755
--- a/kcms/kfontinst/apps/org.kde.kfontview.desktop
+++ b/kcms/kfontinst/apps/org.kde.kfontview.desktop
@@ -52,7 +52,7 @@ GenericName=Font Viewer
 GenericName[ar]=عارض الخط
 GenericName[az]=Şriftə baxış vasitəsi
 GenericName[bg]=Преглед на шрифтове
-GenericName[ca]=Visor de tipus de lletra
+GenericName[ca]=Visualitzador de tipus de lletra
 GenericName[ca@valencia]=Visor de tipus de lletra
 GenericName[cs]=Prohlížeč písem
 GenericName[da]=Skrifttypevisning
diff --git a/kcms/kfontinst/viewpart/kfontviewpart.json b/kcms/kfontinst/viewpart/kfontviewpart.json
index 9f0482d58..ade29dc5d 100644
--- a/kcms/kfontinst/viewpart/kfontviewpart.json
+++ b/kcms/kfontinst/viewpart/kfontviewpart.json
@@ -15,7 +15,7 @@
         "Name[az]": "Şriftə baxış vasitəsi",
         "Name[bg]": "Визуализатор на шрифтове",
         "Name[ca@valencia]": "Visor de tipus de lletra",
-        "Name[ca]": "Visor de tipus de lletra",
+        "Name[ca]": "Visualitzador de tipus de lletra",
         "Name[cs]": "Prohlížeč písem",
         "Name[da]": "Skrifttypevisning",
         "Name[de]": "Schriftartenbetrachter",
diff --git a/kcms/nightcolor/kcm_nightcolor.json b/kcms/nightcolor/kcm_nightcolor.json
index 227764f4a..68aa089ae 100644
--- a/kcms/nightcolor/kcm_nightcolor.json
+++ b/kcms/nightcolor/kcm_nightcolor.json
@@ -1,6 +1,17 @@
 {
     "KPlugin": {
         "Description": "Adjust color temperature based on time",
+        "Description[ar]": "يضبط حرارة اللون بالاعتماد على الوقت",
+        "Description[bg]": "Регулиране на цветната температура според часа",
+        "Description[ca@valencia]": "Ajusta la temperatura del color en funció de l'hora",
+        "Description[ca]": "Ajusta la temperatura del color en funció de l'hora",
+        "Description[es]": "Ajustar la temperatura del color según la hora",
+        "Description[eu]": "Egokitu kolorearen tenperatura orduaren arabera",
+        "Description[nl]": "Kleurtemperatuur aanpassen gebaseerd op tijd",
+        "Description[pt]": "Ajustar a temperatura da cor com base na hora",
+        "Description[tr]": "Zamana bağlı olarak renk sıcaklığını ayarlayın",
+        "Description[uk]": "Коригування температури кольорів за часом",
+        "Description[x-test]": "xxAdjust color temperature based on timexx",
         "FormFactors": [
             "tablet",
             "handset",