From 1da2432dec8af9f7038234645d000ca48ee94572 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 31 Aug 2021 01:29:49 +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"
---
 plasma_phone_components.notifyrc          | 2 ++
 quicksettings/nightcolor/metadata.desktop | 1 +
 2 files changed, 3 insertions(+)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index 75962895..d9130030 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -48,6 +48,7 @@ Name[pa]=ਕੈਪਚਰ ਕੀਤਾ
 Name[pl]=Przechwycono
 Name[pt]=Capturada
 Name[pt_BR]=Capturado
+Name[sk]=Zachytené
 Name[sl]=Zajeto
 Name[sv]=Lagrad
 Name[uk]=Захоплено
@@ -72,6 +73,7 @@ Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ
 Comment[pl]=Przechwycono
 Comment[pt]=Capturada
 Comment[pt_BR]=Capturado
+Comment[sk]=Zachytené
 Comment[sl]=Zajeto
 Comment[sv]=Lagrad
 Comment[uk]=Захоплено
diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop
index a64173cb..92be3590 100644
--- a/quicksettings/nightcolor/metadata.desktop
+++ b/quicksettings/nightcolor/metadata.desktop
@@ -13,6 +13,7 @@ Name[nl]=Nachtkleur
 Name[pl]=Barwy nocne
 Name[pt]=Cor Nocturna
 Name[pt_BR]=Cor noturna
+Name[sk]=Nočná farba
 Name[sl]=Nočna barva
 Name[sv]=Nattfärg
 Name[uk]=Нічні кольори