From 07e2acbc1bb809920c087b39e4f691a2e9791e7f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 16 Mar 2024 01:16:20 +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"
---
 kcms/time/kcm_mobile_time.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcms/time/kcm_mobile_time.json b/kcms/time/kcm_mobile_time.json
index 5a32552a..132f695b 100644
--- a/kcms/time/kcm_mobile_time.json
+++ b/kcms/time/kcm_mobile_time.json
@@ -39,7 +39,7 @@
         "Icon": "preferences-system-time",
         "Name": "Time and Date",
         "Name[ar]": "الوقت والتّاريخ",
-        "Name[ast]": "Hora ya data",
+        "Name[ast]": "Hora y data",
         "Name[ca@valencia]": "Hora i data",
         "Name[ca]": "Hora i data",
         "Name[cs]": "Datum a čas",