From 66fa786e00ebce88f4c957fd7d90b43f9f7d4ae0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 24 Jan 2022 01:45:29 +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"
---
 src/org.kde.partitionmanager.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index daa48af..1b56460 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -169,7 +169,7 @@ Icon=partitionmanager
 Categories=System;Filesystem;KDE;Qt;
 X-KDE-StartupNotify=true
 Keywords=partition;disk;
-Keywords[ar]=أقسام,قرص
+Keywords[ar]=أقسام;قرص;
 Keywords[ast]=partición;particionar;discu;
 Keywords[az]=partition;disk;bölmə;
 Keywords[ca]=partició;disc;