From 843d7e9f19262a37a02613210a61fc952dfddc4d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 18 Jan 2022 01:44:45 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/open_in_partitionmanager.desktop b/src/open_in_partitionmanager.desktop
index 7d8d0ff..cff0670 100644
--- a/src/open_in_partitionmanager.desktop
+++ b/src/open_in_partitionmanager.desktop
@@ -16,8 +16,10 @@ Name[es]=Volver a formatear o editar con el gestor de particiones
 Name[fr]=Reformater ou modifier avec le gestionnaire de partitions de KDE
 Name[hu]=Újraformázás vagy szerkesztés a Partíciókezelővel
 Name[ia]=Reformatta o modifica con Partition Manager (gerente de partition)
+Name[it]=Riformatta o modifica con il gestore delle partizioni
 Name[nl]=Met Partitiebeheerder opnieuw formatteren of bewerken
 Name[pl]=Przeformatuj lub zmień w Zarządzaniu Partycjami
+Name[pt_BR]=Reformatar ou editar com o gerenciador de partições
 Name[sl]=Ponovno formatiraj ali uredi z Upravljalnikom razdelkov
 Name[sv]=Omformatering eller redigering med partitionshanterare
 Name[uk]=Переформатувати або редагувати за допомогою «Керування розділами»