From 4b438da3cb4699d395565a0d5e71d7f7d77c945d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 1 Sep 2020 10:13:23 +0200
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 94682ce6d..167bbd06f 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -32,6 +32,7 @@ Name[pa]=ਡਾਲਫਿਨ
 Name[pl]=Dolphin
 Name[pt]=Dolphin
 Name[pt_BR]=Dolphin
+Name[ro]=Dolphin
 Name[ru]=Dolphin
 Name[se]=Dolphin
 Name[sk]=Dolphin
@@ -85,6 +86,7 @@ GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
 GenericName[pl]=Zarządzanie plikami
 GenericName[pt]=Gestor de Ficheiros
 GenericName[pt_BR]=Gerenciador de arquivos
+GenericName[ro]=Gestionar de fișiere
 GenericName[ru]=Диспетчер файлов
 GenericName[se]=Fiilagieđahalli
 GenericName[sk]=Správca súborov
-- 
cgit v1.3