From 3018d1f3b85248ae5beade96b3797a94564739f6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 11 May 2020 06:14:09 +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"
---
 org.kde.keysmith.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.kde.keysmith.desktop b/org.kde.keysmith.desktop
index 51e8fcb..b031a88 100644
--- a/org.kde.keysmith.desktop
+++ b/org.kde.keysmith.desktop
@@ -19,6 +19,7 @@ Name[ko]=Keysmith
 Name[nl]=Keysmith
 Name[pt]=Keysmith
 Name[pt_BR]=Keysmith
+Name[ru]=Keysmith
 Name[sk]=Keysmith
 Name[sv]=Keysmith
 Name[tg]=Keysmith