From 9799f8c95ef46dbcf3999fdad69847f9a080dcfd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Oct 2018 07:54:05 +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/hotplug/plasma-dataengine-hotplug.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataengines/hotplug/plasma-dataengine-hotplug.desktop b/dataengines/hotplug/plasma-dataengine-hotplug.desktop index 08bf23bea..2f0c2ebbf 100644 --- a/dataengines/hotplug/plasma-dataengine-hotplug.desktop +++ b/dataengines/hotplug/plasma-dataengine-hotplug.desktop @@ -27,7 +27,7 @@ Name[hne]=हाटप्लग घटना Name[hr]=Događaji brzog uštekavanja Name[hu]=Eszközcsatolást kezelő plazmoid Name[ia]=Eventos de hotplug -Name[id]=Perihal Hotplug +Name[id]=Hotplug Events Name[is]=Hraðtengingaatburðir Name[it]=Eventi di collegamento a caldo Name[ja]=Hotplug イベント @@ -88,7 +88,7 @@ Comment[he]=משמש למעקב אחר התקנים נשלפים בעת חיבו Comment[hr]=Pratite uređaje za brzo uštekavanje kako se pojavljuju i nestaju Comment[hu]=Követi a menet közben csatolható (hot-pluggable) eszközöket. Comment[ia]=Il tracia dispositivos hot-pluggable (insertabile a calide) assi como illos appare e disappare -Comment[id]=Lacak perangkat dapat dihot-plug ketika mereka muncul atau menghilang. +Comment[id]=Lacak perangkat yang dapat dicabut-colok ketika mereka muncul atau menghilang. Comment[is]=Fylgist með hraðtengdum tækjum um leið og þau birtast eða hverfa. Comment[it]=Sorveglia il collegamento e lo scollegamento dei dispositivi collegabili mentre il sistema è in funzione. Comment[ja]=ホットプラグ可能なデバイスが抜き差しされるのを捕捉します。