From e91c5b2ace802435a460f487454f051920167782 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Aug 2019 10:00:52 +0200 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 cb8921009..e1463099e 100644 --- a/dataengines/executable/plasma-dataengine-executable.desktop +++ b/dataengines/executable/plasma-dataengine-executable.desktop @@ -100,7 +100,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 Dieksekusi +Comment[id]=Jalankan Mesin Data Yang Dapat-dilaksanakan Comment[is]=Gagnavél fyrir keyrslu forrita Comment[it]=Motore di dati per esecuzione di comandi Comment[ja]=コマンド実行のデータエンジン