From 1dfabeac2a81497e6425bdedf7faab6ff1c6e409 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 27 Jan 2021 08:55:30 +0100
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"
---
 app/packageplugins/indicator/latte-indicator.desktop     | 1 +
 indicators/org.kde.latte.plasmatabstyle/metadata.desktop | 1 +
 shell/metadata.desktop.cmake                             | 1 +
 shell/package/metadata.desktop                           | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop
index e354f4bfa..127e3ea4a 100644
--- a/app/packageplugins/indicator/latte-indicator.desktop
+++ b/app/packageplugins/indicator/latte-indicator.desktop
@@ -25,6 +25,7 @@ Comment[pl]=Wskaźnik Latte
 Comment[pt]=Indicador do Latte
 Comment[pt_BR]=Indicador do Latte
 Comment[ru]=Индикатор Latte
+Comment[sk]=Latte indicator
 Comment[sl]=Kazalnik Latte
 Comment[sv]=Latte indikator
 Comment[uk]=Індикатор Латте
diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
index 104232343..3f2baa54c 100644
--- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
+++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
@@ -19,6 +19,7 @@ Name[nn]=Faner i Plasma-stil
 Name[pl]=Wygląd karty Plazmy
 Name[pt]=Estilo de Páginas do Plasma
 Name[pt_BR]=Estilo de abas do Plasma
+Name[sk]=Plasma štýl kariet
 Name[sl]=Slog Plasma zavihkov
 Name[sv]=Plasma flikstil
 Name[uk]=Стиль вкладок Плазми
diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake
index 388eff255..3f713d5f5 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -25,6 +25,7 @@ Name[pl]=Powłoka Latte
 Name[pt]=Consola do Latte
 Name[pt_BR]=Latte Shell
 Name[ru]=Оболочка Latte
+Name[sk]=Latte Shell
 Name[sl]=Shell Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index 829626199..6377e9577 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -25,6 +25,7 @@ Name[pl]=Powłoka Latte
 Name[pt]=Consola do Latte
 Name[pt_BR]=Latte Shell
 Name[ru]=Оболочка Latte
+Name[sk]=Latte Shell
 Name[sl]=Shell Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте