From a8bd6f4b1f65d402aacc2d66097fc0cbde870028 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 5 Jun 2018 05:34:15 +0200
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 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 2344555d5..f0cda29da 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -2,6 +2,7 @@
 Type=Service
 Name=Dolphin View
 Name[ar]=منظور دولفين
+Name[ast]=Vista de Dolphin
 Name[ca]=Vista del Dolphin
 Name[ca@valencia]=Vista del Dolphin
 Name[cs]=Pohled Dolphin
@@ -109,6 +110,7 @@ Exec=dolphin
 [Desktop Action compact]
 Name=Compact
 Name[ar]=متراصّ
+Name[ast]=Compauta
 Name[ca]=Compacta
 Name[ca@valencia]=Compacta
 Name[cs]=Kompaktní
-- 
cgit v1.3