From 757b078d2e2082644c73156dd5c05be69c6f38db Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 24 Aug 2021 01:21:09 +0000
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 74d5d2c7f..f46b355fd 100644
--- a/kioslave/desktop/directory.trash
+++ b/kioslave/desktop/directory.trash
@@ -19,7 +19,7 @@ Name[he]=אשפה
 Name[hi]=कचरा
 Name[hu]=Kuka
 Name[ia]=Corbe
-Name[id]=Sesampahan
+Name[id]=Tempat Sampah
 Name[is]=Rusl
 Name[it]=Cestino
 Name[ja]=ごみ箱