From 0778b805cd823172f179809f535048c41bccef8d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 25 Sep 2025 01:35:17 +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/settings/kcm/kcmdolphingeneral.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/settings')

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 36b99c7d7..8c743d781 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -28,6 +28,7 @@
         "Name[ie]": "General",
         "Name[is]": "Almennt",
         "Name[it]": "Generale",
+        "Name[ja]": "全般",
         "Name[ka]": "მთავარი",
         "Name[ko]": "일반",
         "Name[lt]": "Bendrosios",
-- 
cgit v1.3