From d1871eb1b84fa9697b69d98eac02ca0a58874a65 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 26 Jul 2015 19:57:51 +0000
Subject: 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"
---
 src/org.kde.dolphin.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index d7e905507..0d25c1750 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -20,6 +20,7 @@ Name[nn]=Dolphin
 Name[pl]=Dolphin
 Name[pt]=Dolphin
 Name[pt_BR]=Dolphin
+Name[ru]=Dolphin
 Name[se]=Dolphin
 Name[sk]=Dolphin
 Name[sl]=Dolphin
@@ -59,6 +60,7 @@ GenericName[nn]=Filhandsamar
 GenericName[pl]=Zarządzanie plikami
 GenericName[pt]=Gestor de Ficheiros
 GenericName[pt_BR]=Gerenciador de arquivos
+GenericName[ru]=Диспетчер файлов
 GenericName[se]=Fiilagieđahalli
 GenericName[sk]=Správca súborov
 GenericName[sl]=Upravljalnik datotek
-- 
cgit v1.3.1