From 50e366431dd8533f87cd10289422dc470f128541 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 19 Aug 2016 09:28:24 +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 e8814f16b..a4bac816f 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -11,6 +11,7 @@ Name[de]=Dolphin-Ansicht
 Name[el]=Dolphin View
 Name[en_GB]=Dolphin View
 Name[es]=Vista de Dolphin
+Name[et]=Dolphini vaade
 Name[fi]=Dolphin-näkymä
 Name[fr]=Vue de Dolphin
 Name[gl]=Vista de Dolphin
@@ -67,6 +68,7 @@ Name[de]=Symbole
 Name[el]=Εικονίδια
 Name[en_GB]=Icons
 Name[es]=Iconos
+Name[et]=Ikoonid
 Name[fi]=Kuvakkeet
 Name[fr]=Icônes
 Name[gl]=Iconas
@@ -114,6 +116,7 @@ Name[de]=Kompakt
 Name[el]=Σύμπτυξη
 Name[en_GB]=Compact
 Name[es]=Compacto
+Name[et]=Kompaktne
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
@@ -159,6 +162,7 @@ Name[de]=Details
 Name[el]=Λεπτομέρειες
 Name[en_GB]=Details
 Name[es]=Detalles
+Name[et]=Üksikasjad
 Name[fi]=Yksityiskohdat
 Name[fr]=Détails
 Name[gl]=Detalles
-- 
cgit v1.3