From a7484d2ce51a6734a59a7b3f3ad9ef43c54717ee Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 15 Mar 2015 09:54:53 +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 15c4b4bb3..88329e7c6 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[en_GB]=Dolphin View
 Name[fi]=Dolphin-näkymä
 Name[fr]=Vue de Dolphin
 Name[gl]=Vista de Dolphin
@@ -40,6 +41,7 @@ Name=Icons
 Name[ca]=Icones
 Name[cs]=Ikony
 Name[de]=Symbole
+Name[en_GB]=Icons
 Name[fi]=Kuvakkeet
 Name[fr]=Icônes
 Name[gl]=Iconas
@@ -67,6 +69,7 @@ Name=Compact
 Name[ca]=Compacta
 Name[cs]=Kompaktní
 Name[de]=Kompakt
+Name[en_GB]=Compact
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
@@ -94,6 +97,7 @@ Name=Details
 Name[ca]=Detalls
 Name[cs]=Podrobnosti
 Name[de]=Details
+Name[en_GB]=Details
 Name[fi]=Yksityiskohdat
 Name[fr]=Détails
 Name[gl]=Detalles
-- 
cgit v1.3