From d558c9a5dd8082488ea884feece22c1add1ea6cd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 7 Nov 2023 03:15:28 +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 7f5ad8440..e8c87b8f2 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -60,6 +60,7 @@
         "Name[tr]": "Dolphin Görünümü",
         "Name[uk]": "Перегляд Dolphin",
         "Name[vi]": "Khung xem Dolphin",
+        "Name[x-test]": "xxDolphin Viewxx",
         "Name[zh_CN]": "Dolphin 视图",
         "Name[zh_TW]": "Dolphin 檢視",
         "ServiceTypes": [
-- 
cgit v1.3