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/systemmonitor/diskactivity/metadata.desktop

@@ -20,7 +20,7 @@ Name[gl]=Vixilante da E/S do disco duro
 Name[he]=מנטר שימוש בכונן הקשיח
 Name[hu]=Merevlemez I/O monitor
 Name[ia]=Monitor de I/E del disco dur
-Name[id]=Monitor I/O Cakram Keras
+Name[id]=Pemantau I/O Cakram Keras
 Name[is]=Eftirlit með I/O notkun harðdiska
 Name[it]=Uso del disco fisso
 Name[ja]=ハードディスク I/O モニタ

applets/systemmonitor/net/metadata.desktop

@@ -24,7 +24,7 @@ Name[hi]=नेटवर्क नरीक्षण
 Name[hr]=Nadzornik mreže
 Name[hu]=Hálózatfigyelő
 Name[ia]=Monitor de Rete
-Name[id]=Monitor Jaringan
+Name[id]=Pemantau Jaringan
 Name[is]=Netkerfisvaktari
 Name[it]=Monitor di rete
 Name[ja]=ネットワークモニタ

dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop

@@ -35,7 +35,7 @@ Name[hr]=Nadzor sustava
 Name[hsb]=Systemowy monitor
 Name[hu]=Rendszermonitor
 Name[ia]=Monitor de systema
-Name[id]=Monitor Sistem
+Name[id]=Pemantau Sistem
 Name[is]=Kerfiseftirlit
 Name[it]=Monitor di sistema
 Name[ja]=システムモニタ

kioslave/desktop/directory.trash

@@ -17,6 +17,7 @@ Name[fr]=Corbeille
 Name[gl]=Lixo
 Name[he]=אשפה 
 Name[hu]=Kuka
+Name[id]=Tong Sampah
 Name[is]=Rusl
 Name[it]=Cestino
 Name[ja]=ごみ箱

systemmonitor/org.kde.systemmonitor.desktop

@@ -36,7 +36,7 @@ Name[hr]=Nadzor sustava
 Name[hsb]=Systemowy monitor
 Name[hu]=Rendszermonitor
 Name[ia]=Monitor de systema
-Name[id]=Monitor Sistem
+Name[id]=Pemantau Sistem
 Name[is]=Kerfiseftirlit
 Name[it]=Monitor di sistema
 Name[ja]=システムモニタ