From 3e935e67794c16f299c876c823489c486e5cd19a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 28 Mar 2024 01:17:46 +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"
---
 linux/applications/org.kde.falkon.desktop               | 1 +
 src/scripts/runaction/actions/dictionary.desktop        | 1 +
 src/scripts/runaction/actions/googleimagesearch.desktop | 1 +
 themes/linux/metadata.desktop                           | 1 +
 4 files changed, 4 insertions(+)

diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop
index 395a56cb3..153e52c2c 100644
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Falkon
 Name[ar]=فالكون
+Name[ast]=Falkon
 Name[az]=Falkon
 Name[bg]=Falkon
 Name[ca]=Falkon
diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop
index 1d4945065..c4628cc78 100644
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Dictionary
 Name[ar]=قاموس
+Name[ast]=Diccionariu
 Name[az]=Lüğət
 Name[bg]=Речник
 Name[ca]=Diccionari
diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop
index 878d3b86b..f4bf95051 100644
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Google
 Name[ar]=غوغل
+Name[ast]=Google
 Name[az]=Google
 Name[bg]=Google
 Name[ca]=Google
diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop
index d0a46ac45..d3080ee2f 100644
--- a/themes/linux/metadata.desktop
+++ b/themes/linux/metadata.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Linux
 Name[ar]=لينكس
+Name[ast]=Linux
 Name[az]=Linux
 Name[bg]=Linux
 Name[ca]=Linux