From df5e4e91ee548cbbbe27011a4ec6f0f22ab26809 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 30 Jun 2016 13:07:36 +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 946961d70..cf899a3ee 100644
--- a/kioslave/desktop/directory.trash
+++ b/kioslave/desktop/directory.trash
@@ -64,7 +64,7 @@ Comment[pa]=ਹਟਾਈਆਂ ਫਾਇਲਾਂ ਰੱਖਦਾ ਹੈ
 Comment[pl]=Zawiera usunięte pliki
 Comment[pt]=Contém os ficheiros removidos
 Comment[pt_BR]=Contém os arquivos removidos
-Comment[ru]=Содержит удалённые файлы
+Comment[ru]=Содержит файлы, которые вы удалили
 Comment[se]=Dáppe leat eret váldon fiillat
 Comment[sk]=Obsahuje odstránené súbory
 Comment[sl]=Vsebujejo odstranjene datoteke