From 5264203fe821b321e6ab29d63ff52b439758c881 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 Jul 2021 01:18:10 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index ae147c1..daa48af 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -169,6 +169,7 @@ Icon=partitionmanager Categories=System;Filesystem;KDE;Qt; X-KDE-StartupNotify=true Keywords=partition;disk; +Keywords[ar]=أقسام,قرص Keywords[ast]=partición;particionar;discu; Keywords[az]=partition;disk;bölmə; Keywords[ca]=partició;disc;