From 07dae709d9fe68283caa71d13468b3edc4f0e2be Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 26 Oct 2015 10:04:54 +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 9c9408341..ed13e38fe 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -3,6 +3,7 @@ Name=Dolphin
 Name[ca]=Dolphin
 Name[cs]=Dolphin
 Name[de]=Dolphin
+Name[el]=Dolphin
 Name[en_GB]=Dolphin
 Name[es]=Dolphin
 Name[fi]=Dolphin
@@ -44,6 +45,7 @@ GenericName=File Manager
 GenericName[ca]=Gestor de fitxers
 GenericName[cs]=Správce souborů
 GenericName[de]=Dateiverwaltung
+GenericName[el]=Διαχειριστής αρχείων
 GenericName[en_GB]=File Manager
 GenericName[es]=Gestor de archivos
 GenericName[fi]=Tiedostonhallinta
-- 
cgit v1.3