From f839e1a7d39fc29f04521f13ab5088dcbb1c4f96 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 30 Apr 2016 13:17:06 +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" --- dataengines/hotplug/plasma-dataengine-hotplug.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataengines/hotplug/plasma-dataengine-hotplug.desktop b/dataengines/hotplug/plasma-dataengine-hotplug.desktop index 95641258d..b74a08630 100644 --- a/dataengines/hotplug/plasma-dataengine-hotplug.desktop +++ b/dataengines/hotplug/plasma-dataengine-hotplug.desktop @@ -29,7 +29,7 @@ Name[hu]=Eszközcsatolást kezelő plazmoid Name[ia]=Eventos de hotplug Name[id]=Acara Hotplug Name[is]=Hraðtengingaatburðir -Name[it]=Eventi di collegamento in marcia +Name[it]=Eventi di collegamento a caldo Name[ja]=Hotplug イベント Name[kk]=Істеп турғанда қосу оқиғалар Name[km]=ព្រឹត្តិការណ៍​ដោត​ដើរ