From 31bdb875149aca0a168207fa24ab535d80598116 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Jan 2022 01:46:31 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/open_in_partitionmanager.desktop b/src/open_in_partitionmanager.desktop index b060f4b..90c9c02 100644 --- a/src/open_in_partitionmanager.desktop +++ b/src/open_in_partitionmanager.desktop @@ -16,6 +16,7 @@ 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[ia]=Reformatta o modifica con Partition Manager (gerente de partition) Name[nl]=Met Partitiebeheerder opnieuw formatteren of bewerken +Name[pl]=Przeformatuj lub zmień w Zarządzaniu Partycjami Name[sl]=Ponovno formatiraj ali uredi z Upravljalnikom razdelkov Name[sv]=Omformatering eller redigering med partitionshanterare Name[uk]=Переформатувати або редагувати за допомогою «Керування розділами»