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/dolphinpart.desktop | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 335c87a80..5d8f511eb 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -4,6 +4,7 @@ Name=Dolphin View
 Name[ca]=Vista del Dolphin
 Name[cs]=Pohled Dolphin
 Name[de]=Dolphin-Ansicht
+Name[el]=Dolphin View
 Name[en_GB]=Dolphin View
 Name[es]=Vista de Dolphin
 Name[fi]=Dolphin-näkymä
@@ -54,6 +55,7 @@ Name=Icons
 Name[ca]=Icones
 Name[cs]=Ikony
 Name[de]=Symbole
+Name[el]=Εικονίδια
 Name[en_GB]=Icons
 Name[es]=Iconos
 Name[fi]=Kuvakkeet
@@ -95,6 +97,7 @@ Name=Compact
 Name[ca]=Compacta
 Name[cs]=Kompaktní
 Name[de]=Kompakt
+Name[el]=Σύμπτυξη
 Name[en_GB]=Compact
 Name[es]=Compacto
 Name[fi]=Tiivis
@@ -133,6 +136,7 @@ Name=Details
 Name[ca]=Detalls
 Name[cs]=Podrobnosti
 Name[de]=Details
+Name[el]=Λεπτομέρειες
 Name[en_GB]=Details
 Name[es]=Detalles
 Name[fi]=Yksityiskohdat
-- 
cgit v1.3