From bc16b0f315d20235a6c51c9289d695f57d6081d3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 12 Jul 2019 08:39:23 +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/org.kde.latte-dock.desktop.cmake | 1 +
 containment/metadata.desktop.cmake   | 1 +
 containment/package/metadata.desktop | 1 +
 indicators/default/metadata.desktop  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake
index 3f6847d5f..116209c0d 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Latte
+Name[ast]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake
index f9ea871d1..6fd09156f 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte
+Name[ast]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index f44883ee9..a0f310ba8 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte
+Name[ast]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop
index cc4d4a2c6..92eb8d47c 100644
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Latte
+Name[ast]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte