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/org.kde.dolphin.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 6404808ee..94682ce6d 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -2,6 +2,7 @@
 Name=Dolphin
 Name[ar]=دولفين
 Name[ast]=Dolphin
+Name[az]=Dolphin
 Name[ca]=Dolphin
 Name[ca@valencia]=Dolphin
 Name[cs]=Dolphin
@@ -53,6 +54,7 @@ Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
 GenericName[ar]=مدير ملفّات
 GenericName[ast]=Xestor de ficheros
+GenericName[az]=Fayl meneceri
 GenericName[ca]=Gestor de fitxers
 GenericName[ca@valencia]=Gestor de fitxers
 GenericName[cs]=Správce souborů
-- 
cgit v1.3