From 58a7772a19204f467432d098253a32f0fc705b34 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 2 Jul 2022 02:06:49 +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.json.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/dolphinpart.json.in')

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 887e6c7c4..67fb672a3 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -11,6 +11,7 @@
         "Name[ar]": "عرض دولفين",
         "Name[ast]": "Vista de Dolphin",
         "Name[az]": "Dolphin görünüşü",
+        "Name[bg]": "Изглед на Dolphin",
         "Name[ca@valencia]": "Vista de Dolphin",
         "Name[ca]": "Vista del Dolphin",
         "Name[da]": "Dolphin-visning",
-- 
cgit v1.3.1