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"

applets/batterymonitor/package/metadata.desktop

@@ -133,7 +133,7 @@ Keywords[gl]=Xestión da enerxía;batería;sistema;enerxía;
 Keywords[he]=Power Management; Battery; System; Energy;ניהול חשמל;חשמל; סוללה; מערכת;אנרגיה; בטריה;
 Keywords[hu]=Energiakezelés;Akkumulátor;Rendszer;Energia;
 Keywords[ia]=Gestion de energia;Batteria;Systema; Energia;
-Keywords[id]=Manajemen Daya;Baterai;Sistem;Energi;
+Keywords[id]=Pengelolaan Daya;Baterai;Sistem;Energi;
 Keywords[is]=Orkustjórnun;Rafhlaða;Kerfi;Afl;
 Keywords[it]=Gestione energetica;Batteria;Sistema;Energia;
 Keywords[ja]=電源管理;バッテリー;システム;エネルギー;

applets/mediacontroller/metadata.desktop

@@ -66,7 +66,7 @@ Comment[gl]=Controles do reprodutor multimedia
 Comment[he]=פקדי ניגון מדיה
 Comment[hu]=Médialejátszó vezérlők
 Comment[ia]=Controlos de Reproductor de Multimedia
-Comment[id]=Kontrol Pemain Media
+Comment[id]=Kendali Pemain Media
 Comment[is]=Stjórntæki margmiðlunarspilara
 Comment[it]=Controlli del lettore multimediale
 Comment[ja]=メディアプレーヤーコントロール

dataengines/powermanagement/plasma-dataengine-powermanagement.desktop

@@ -29,7 +29,7 @@ Name[hi]=बिज़ली प्रबंधन
 Name[hr]=Upravljanje potrošnjom energije
 Name[hu]=Energiakezelő
 Name[ia]=Gestion de energia
-Name[id]=Manajemen Daya
+Name[id]=Pengelolaan Daya
 Name[is]=Orkustýring
 Name[it]=Gestione energetica
 Name[ja]=電源管理

runners/powerdevil/plasma-runner-powerdevil.desktop

@@ -28,7 +28,7 @@ Comment[hne]=मूल पावर प्रबंधन आपरेसन
 Comment[hr]=Osnovne operacije upravljanja potrošnjom energije
 Comment[hu]=Energiakezelési funkciók
 Comment[ia]=Operationes basic de gestion de energia
-Comment[id]=Operasi Manajemen Daya Dasar
+Comment[id]=Operasi Pengelolaan Daya Dasar
 Comment[is]=Grunnaðgerðir orkustýringarkerfis
 Comment[it]=Operazioni di base per la gestione energetica
 Comment[ja]=基本的な電源管理操作