From 8fdbcd7fbf38164e7ea594f3acf83de06d7b9249 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Nov 2023 02:10:21 +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" --- org.kde.kasts.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop index c035e911..5c0d897d 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -3,6 +3,7 @@ [Desktop Entry] Name=Kasts Name[ar]=كاستس +Name[ast]=Kasts Name[ca]=Kasts Name[ca@valencia]=Kasts Name[cs]=Kasts