From 7dd9e17a8cbdb5e7cf1fb231fb7e3c17e666ea58 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 3 Mar 2018 05:26:20 +0100 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index 756f054..1fbadc6 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -122,7 +122,7 @@ Comment[fr]=Gère les disques, partitions et systèmes de fichiers Comment[ga]=Bainistigh dioscaí, deighiltí agus córais comhad Comment[gl]=Xestiona os discos, particións e o sistemas de ficheiros Comment[hu]=Lemezek, partíciók, és fájlrendszerek kezelése -Comment[id]=Kelola disk, partisi dan sistem file +Comment[id]=Kelola disk, partisi dan sistem fail Comment[it]=Gestisci dischi, partizioni e filesystem Comment[ja]=ディスク、パーティション、ファイルシステムを管理します Comment[km]=គ្រប់គ្រង​ថាស ការ​ចែកភាគ​ថាស និង​ប្រព័ន្ធ​ឯកសារ