From f32d038966a175a6f05ebbfa2bea9542a2c18010 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 19 Nov 2019 05:39:56 +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"
---
 applets/appmenu/package/metadata.desktop                      | 2 +-
 .../contextmenu/plasma-containmentactions-contextmenu.desktop | 4 ++--
 dataengines/apps/plasma-dataengine-apps.desktop               | 2 +-
 menu/desktop/kf5-main.directory                               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop
index f01460762..24b86bb04 100644
--- a/applets/appmenu/package/metadata.desktop
+++ b/applets/appmenu/package/metadata.desktop
@@ -28,7 +28,7 @@ Name[pl]=Menu globalne
 Name[pt]=Menu Global
 Name[pt_BR]=Menu global
 Name[ru]=Меню приложения
-Name[sk]=Globálne menu
+Name[sk]=Globálna ponuka
 Name[sl]=Splošni meni
 Name[sr]=Глобални мени
 Name[sr@ijekavian]=Глобални мени
diff --git a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
index 6f1144a9d..e21106ce4 100644
--- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
@@ -51,7 +51,7 @@ Name[pt_BR]=Menu padrão
 Name[ro]=Meniu standard
 Name[ru]=Стандартное контекстное меню
 Name[si]=සම්මත මෙනුව
-Name[sk]=Štandardné menu
+Name[sk]=Štandardná ponuka
 Name[sl]=Običajni meni
 Name[sr]=стандардни мени
 Name[sr@ijekavian]=стандардни мени
@@ -116,7 +116,7 @@ Comment[pt_BR]=O menu que normalmente aparece ao clicar com o botão direito
 Comment[ro]=Meniul ce apare de obicei la clic-dreapta
 Comment[ru]=Меню, которое обычно открывается правой кнопкой мыши
 Comment[si]=දකුණු-ක්ලික් කිරීමට සාමාන්‍යයෙන් ලැබෙන මෙනුව
-Comment[sk]=Menu, ktoré sa zvyčajne zobrazuje po kliknutí pravým tlačidlom myši
+Comment[sk]=Ponuka, ktorá sa zvyčajne zobrazuje po kliknutí pravým tlačidlom myši
 Comment[sl]=Meni, ki se običajno prikaže ob desnem kliku
 Comment[sr]=Мени који се обично показује на десни клик
 Comment[sr@ijekavian]=Мени који се обично показује на десни клик
diff --git a/dataengines/apps/plasma-dataengine-apps.desktop b/dataengines/apps/plasma-dataengine-apps.desktop
index 4bafe7b54..82a6410a2 100644
--- a/dataengines/apps/plasma-dataengine-apps.desktop
+++ b/dataengines/apps/plasma-dataengine-apps.desktop
@@ -111,7 +111,7 @@ Comment[pt_BR]=Informação e inicialização de todos os aplicativos no menu de
 Comment[ro]=Informații și lansare de aplicații în meniul aplicațiilor.
 Comment[ru]=Информация и запуск всех приложений из меню приложений.
 Comment[si]=යෙදුම් මෙනුවේ ඇති සියළු යෙදුම් ආරම්භ කිරීමේ තොරතුරු
-Comment[sk]=Informácie a spúšťanie všetkých aplikácií v menu aplikácie.
+Comment[sk]=Informácie a spúšťanie všetkých aplikácií v ponuke aplikácie.
 Comment[sl]=Podatki o vseh programih v meniju in njihovo zaganjanje
 Comment[sr]=Подаци о програмима из програмског менија и њихово покретање.
 Comment[sr@ijekavian]=Подаци о програмима из програмског менија и њихово покретање.
diff --git a/menu/desktop/kf5-main.directory b/menu/desktop/kf5-main.directory
index 5c54983de..8b581f33f 100644
--- a/menu/desktop/kf5-main.directory
+++ b/menu/desktop/kf5-main.directory
@@ -71,7 +71,7 @@ Name[pt_BR]=Menu do KDE
 Name[ro]=Meniu KDE
 Name[ru]=Меню KDE
 Name[si]=KDE මෙනුව
-Name[sk]=Menu KDE
+Name[sk]=Ponuka KDE
 Name[sl]=Meni KDE
 Name[sr]=КДЕ мени
 Name[sr@ijekavian]=КДЕ мени