From 0403d5cf4ad718f4ea66185a1343f5bcb41a7496 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 23 Apr 2019 06:06:30 +0200
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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 83b2929..a28bbba 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -37,7 +37,7 @@ Name[pl]=Zarządzanie partycjami
 Name[pt]=Gestor de Partições do KDE
 Name[pt_BR]=Gerenciador de partições do KDE
 Name[ro]=Gestionarul de partiții KDE
-Name[ru]=Диспетчер разделов для KDE
+Name[ru]=Диспетчер разделов от KDE
 Name[sk]=KDE Správca partícií
 Name[sl]=Upravljalnik razdelkov za KDE
 Name[sr]=КДЕ‑ов менаџер партиција
@@ -181,6 +181,7 @@ Keywords[nn]=partisjon;disk;
 Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;
 Keywords[pt_BR]=partição;disco;
+Keywords[ru]=раздел;диск;
 Keywords[sl]=razdelek;particija;disk;
 Keywords[sr]=partition;disk;партиција;диск;
 Keywords[sr@ijekavian]=partition;disk;партиција;диск;