From 799c532d239c2c04cb7fe5014aceba449268fd3d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 13 Jun 2020 05:34:06 +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 | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 13e267ad5..abd206d6a 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -3,6 +3,7 @@ Type=Service
 Name=Dolphin View
 Name[ar]=منظور دولفين
 Name[ast]=Vista de Dolphin
+Name[az]=Dolphin görünüşü
 Name[ca]=Vista del Dolphin
 Name[ca@valencia]=Vista del Dolphin
 Name[cs]=Pohled Dolphin
@@ -63,6 +64,7 @@ Actions=icons;details;compact;
 Name=Icons
 Name[ar]=الأيقونات
 Name[ast]=Iconos
+Name[az]=İkonlar
 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[cs]=Ikony
@@ -115,6 +117,7 @@ Exec=dolphin
 Name=Compact
 Name[ar]=متراصّ
 Name[ast]=Compauta
+Name[az]=Yığcam
 Name[ca]=Compacta
 Name[ca@valencia]=Compacta
 Name[cs]=Kompaktní
@@ -166,6 +169,7 @@ Exec=dolphin
 Name=Details
 Name[ar]=التّفاصيل
 Name[ast]=Detalles
+Name[az]=Ətraflı
 Name[ca]=Detalls
 Name[ca@valencia]=Detalls
 Name[cs]=Podrobnosti
-- 
cgit v1.3