From 1c4f5906fd643bb5ef2d3c72d0d6a35f61f26fc1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 1 Sep 2019 04:54:07 +0200
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/lattedock.notifyrc                                          | 1 -
 app/org.kde.latte-dock.desktop.cmake                            | 2 --
 .../indicator/latte-packagestructure-indicator.desktop          | 1 -
 containment/metadata.desktop.cmake                              | 1 -
 containment/package/metadata.desktop                            | 1 -
 indicators/default/metadata.desktop                             | 1 -
 indicators/org.kde.latte.plasma/metadata.desktop                | 1 -
 7 files changed, 8 deletions(-)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 042877f7f..a9405196a 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -204,7 +204,6 @@ Name[pl]=Nie udało się usunąć
 Name[pt]=Não foi possível remover
 Name[pt_BR]=Ocorreu um erro ao remover
 Name[ru]=Ошибка удаления
-Name[sk]=Zlyhalo odstránenie
 Name[sv]=Misslyckades ta bort
 Name[uk]=Не вдалося вилучити
 Name[x-test]=xxFailed to removexx
diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake
index 620825c9c..96fd7adba 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -20,7 +20,6 @@ Name[pl]=Latte
 Name[pt]=Latte
 Name[pt_BR]=Latte
 Name[ru]=Latte
-Name[sk]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
@@ -47,7 +46,6 @@ Comment[pl]=Dok dla mas
 Comment[pt]=Área acoplável para as massas
 Comment[pt_BR]=Área acoplável para todos
 Comment[ru]=Док для всех
-Comment[sk]=Dok pre masy
 Comment[sv]=Dockningsfönster för alla
 Comment[uk]=Панель для усіх
 Comment[x-test]=xxDock for the massesxx
diff --git a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
index 0785c0232..afab835c1 100644
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@@ -16,7 +16,6 @@ Name[pl]=Wskaźnik
 Name[pt]=Indicador
 Name[pt_BR]=Indicador
 Name[ru]=Индикатор
-Name[sk]=indikátor
 Name[sv]=Indikator
 Name[uk]=Індикатор
 Name[x-test]=xxIndicatorxx
diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake
index ddc46cffb..951b4ab32 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -21,7 +21,6 @@ Name[pl]=Latte
 Name[pt]=Latte
 Name[pt_BR]=Latte
 Name[ru]=Latte
-Name[sk]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index fa7c6d699..0e4b7d02e 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -21,7 +21,6 @@ Name[pl]=Latte
 Name[pt]=Latte
 Name[pt_BR]=Latte
 Name[ru]=Latte
-Name[sk]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop
index 8e5053be0..762044d96 100644
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@@ -20,7 +20,6 @@ Name[pl]=Latte
 Name[pt]=Latte
 Name[pt_BR]=Latte
 Name[ru]=Latte
-Name[sk]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop
index 62b2f7c70..c01851702 100644
--- a/indicators/org.kde.latte.plasma/metadata.desktop
+++ b/indicators/org.kde.latte.plasma/metadata.desktop
@@ -19,7 +19,6 @@ Name[pl]=Plazma
 Name[pt]=Plasma
 Name[pt_BR]=Plasma
 Name[ru]=Plasma
-Name[sk]=Plasma
 Name[sv]=Plasma
 Name[uk]=Плазма
 Name[x-test]=xxPlasmaxx