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/filebrowser/plasma-dataengine-filebrowser.desktop

@@ -30,7 +30,6 @@ Name[hne]=फाइल अउ डिरेक्टरी
 Name[hr]=Datoteke i direktoriji
 Name[hu]=Fájlok és mappák
 Name[ia]=Files e directorios
-Name[id]=Files and Directories
 Name[is]=Skrár og möppur
 Name[it]=File e cartelle
 Name[ja]=ファイルとディレクトリ

dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.desktop

@@ -20,7 +20,6 @@ Name[hi]=तंत्र सूचक जानकारी
 Name[hr]=Informacije glasnika stanja
 Name[hu]=Állaportértesítési információk
 Name[ia]=Informationes de notificator de stato
-Name[id]=Status Notifier Information
 Name[is]=Stöðutilkynningaþjónn
 Name[it]=Informazioni sul notificatore di stato
 Name[ja]=ステータス通知情報

dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop

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

dataengines/time/plasma-dataengine-time.desktop

@@ -32,7 +32,6 @@ Name[hne]=तारीक अउ समय
 Name[hr]=Datum i vrijeme
 Name[hu]=Dátum és idő
 Name[ia]=Data e Tempore
-Name[id]=Date and Time
 Name[is]=Dagur og tími
 Name[it]=Data e ora
 Name[ja]=日付と時刻

klipper/klipperrc.desktop

@@ -957,7 +957,7 @@ Description[hr]=Pokreni &Kmail poštu
 Description[hsb]=&Kmail startować
 Description[hu]=A &KMail elindítása
 Description[ia]=Lancea &Kmail
-Description[id]=Jalankan &Kmail
+Description[id]=Luncurkan &Kmail
 Description[is]=Ræsa &Kmail
 Description[it]=Avvia &KMail
 Description[ja]=KMail を起動(&K)
@@ -1049,7 +1049,7 @@ Description[hr]=Pokreni &mutt
 Description[hsb]=&mutt startować
 Description[hu]=A &Mutt elindítása
 Description[ia]=Lancea &mutt
-Description[id]=Jalankan &mutt
+Description[id]=Luncurkan &mutt
 Description[is]=Ræsa &mutt
 Description[it]=Avvia &mutt
 Description[ja]=mutt を起動(&M)
@@ -1236,7 +1236,7 @@ Description[hr]=Pokreni K&Write uređivač
 Description[hsb]=K&Write startować
 Description[hu]=A K&Write elindítása
 Description[ia]=Lancea K&Write
-Description[id]=Jalankan K&Write
+Description[id]=Luncurkan K&Write
 Description[is]=Ræsa K&Write
 Description[it]=Avvia K&Write
 Description[ja]=KWrite を起動(&W)

systemmonitor/org.kde.systemmonitor.desktop

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