From f696e3d92288abbb3c5f2645d1df15899a70e227 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 29 May 2018 05:41:34 +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"
---
 kioslave/desktop/directory.trash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kioslave/desktop/directory.trash b/kioslave/desktop/directory.trash
index f390b7804..abdfc33a3 100644
--- a/kioslave/desktop/directory.trash
+++ b/kioslave/desktop/directory.trash
@@ -15,7 +15,7 @@ Name[fr]=Corbeille
 Name[gl]=Lixo
 Name[he]=אשפה 
 Name[hu]=Kuka
-Name[id]=Tong Sampah
+Name[id]=Sesampahan
 Name[is]=Rusl
 Name[it]=Cestino
 Name[ja]=ごみ箱