From ab49f96c744458ed1c045cb615048ed7410b38d9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 28 Mar 2024 01:18:01 +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"
---
 app/org.kde.kdeconnect.app.desktop             | 1 +
 daemon/org.kde.kdeconnect.daemon.desktop.cmake | 1 +
 plugins/kdeconnect.notifyrc                    | 1 +
 plugins/sms/kdeconnect_sms.json                | 1 +
 urlhandler/org.kde.kdeconnect.handler.desktop  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 42c08ce30..641a5725e 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE Connect
 Name[ar]=كِيدِي المتّصل
+Name[ast]=KDE Connect
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
diff --git a/daemon/org.kde.kdeconnect.daemon.desktop.cmake b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
index 75aa011c5..64f18a7d6 100644
--- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake
+++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
@@ -9,6 +9,7 @@ Icon=kdeconnect
 
 Name=KDE Connect
 Name[ar]=كِيدِي المتّصل
+Name[ast]=KDE Connect
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 2a40c94c2..ffc9231af 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -2,6 +2,7 @@
 IconName=kdeconnect
 Name=KDE Connect
 Name[ar]=كِيدِي المتّصل
+Name[ast]=KDE Connect
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
diff --git a/plugins/sms/kdeconnect_sms.json b/plugins/sms/kdeconnect_sms.json
index c3e3328c3..947fa64fd 100644
--- a/plugins/sms/kdeconnect_sms.json
+++ b/plugins/sms/kdeconnect_sms.json
@@ -100,6 +100,7 @@
         "License": "GPL",
         "Name": "SMS",
         "Name[ar]": "اس ام اس",
+        "Name[ast]": "SMS",
         "Name[az]": "SMS",
         "Name[bg]": "SMS",
         "Name[ca@valencia]": "SMS",
diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop
index 235528a3f..588f4c8d3 100644
--- a/urlhandler/org.kde.kdeconnect.handler.desktop
+++ b/urlhandler/org.kde.kdeconnect.handler.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE Connect
 Name[ar]=كِيدِي المتّصل
+Name[ast]=KDE Connect
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE