From 438ede27dc86938275d4ea1d8bd57b1e174f6053 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 19 Aug 2016 12:04:22 +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 694a3d56c..63b72d966 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -10,6 +10,7 @@ Name[de]=Dolphin
 Name[el]=Dolphin
 Name[en_GB]=Dolphin
 Name[es]=Dolphin
+Name[et]=Dolphin
 Name[fi]=Dolphin
 Name[fr]=Dolphin
 Name[gl]=Dolphin
@@ -57,6 +58,7 @@ GenericName[de]=Dateiverwaltung
 GenericName[el]=Διαχειριστής αρχείων
 GenericName[en_GB]=File Manager
 GenericName[es]=Gestor de archivos
+GenericName[et]=Failihaldur
 GenericName[fi]=Tiedostonhallinta
 GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
-- 
cgit v1.3.1