From 4f9795bd49ceedb4f251ea3491a8b9c9018c8ed4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 25 Feb 2018 07:19:04 +0100
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"
---
 applets/systemmonitor/diskactivity/metadata.desktop             | 2 +-
 applets/systemmonitor/net/metadata.desktop                      | 2 +-
 .../systemmonitor/plasma-dataengine-systemmonitor.desktop       | 2 +-
 kioslave/desktop/directory.trash                                | 1 +
 systemmonitor/org.kde.systemmonitor.desktop                     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/applets/systemmonitor/diskactivity/metadata.desktop b/applets/systemmonitor/diskactivity/metadata.desktop
index edf1cde87..6ad695f94 100644
--- a/applets/systemmonitor/diskactivity/metadata.desktop
+++ b/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 モニタ
diff --git a/applets/systemmonitor/net/metadata.desktop b/applets/systemmonitor/net/metadata.desktop
index 2582ebe8e..598a3080b 100644
--- a/applets/systemmonitor/net/metadata.desktop
+++ b/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]=ネットワークモニタ
diff --git a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop b/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop
index 7c8623f72..d32779745 100644
--- a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop
+++ b/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]=システムモニタ
diff --git a/kioslave/desktop/directory.trash b/kioslave/desktop/directory.trash
index 0d057b390..9e67be435 100644
--- a/kioslave/desktop/directory.trash
+++ b/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]=ごみ箱
diff --git a/systemmonitor/org.kde.systemmonitor.desktop b/systemmonitor/org.kde.systemmonitor.desktop
index 5124ea921..4d56ceb11 100644
--- a/systemmonitor/org.kde.systemmonitor.desktop
+++ b/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]=システムモニタ