From b84c1cad85e6fc32e78605fd36052d817d11186b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Nov 2019 09:03:34 +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" --- dataengines/executable/plasma-dataengine-executable.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataengines/executable/plasma-dataengine-executable.desktop b/dataengines/executable/plasma-dataengine-executable.desktop index 5af4c564f..c15c2a3a6 100644 --- a/dataengines/executable/plasma-dataengine-executable.desktop +++ b/dataengines/executable/plasma-dataengine-executable.desktop @@ -99,7 +99,7 @@ Comment[hne]=चलाय वाले डाटा इंजन चलाव Comment[hr]=Pokreni izvršive podatkovne mehanizme Comment[hu]=Adatkezelő futtatása Comment[ia]=Motor per exequer datos executabile -Comment[id]=Jalankan Mesin Data Yang Dapat-dilaksanakan +Comment[id]=Jalankan Mesin Data Yang Dapat Dieksekusi Comment[is]=Gagnavél fyrir keyrslu forrita Comment[it]=Motore di dati per esecuzione di comandi Comment[ja]=コマンド実行のデータエンジン