From 28df23863edc5e7485eda5a574c3c2a29168be3e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 12 Jan 2022 01:49:44 +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/open_in_partitionmanager.desktop | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/open_in_partitionmanager.desktop b/src/open_in_partitionmanager.desktop
index 1245aad..82835a2 100644
--- a/src/open_in_partitionmanager.desktop
+++ b/src/open_in_partitionmanager.desktop
@@ -8,3 +8,9 @@ Actions=open;
 Exec=partitionmanager "--device=%d"
 Icon=partitionmanager
 Name=Reformat or Edit with Partition Manager
+Name[az]=Bölmələr Meneceri ilə yenidən formatlayın və ya düzəliş edin
+Name[ca]=Reformatació i edició amb el gestor de particions
+Name[cs]=Přeformátovat nebo upravit pomocí Správce diskových oddílů
+Name[es]=Volver a formatear o editar con el gestor de particiones
+Name[nl]=Met Partitiebeheerder opnieuw formatteren of bewerken
+Name[x-test]=xxReformat or Edit with Partition Managerxx