From c8f6833bbab22da2d1ad73c74437dffcda277593 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 25 Feb 2026 01:43:55 +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/org.kde.dolphin.desktop | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 8ce113690..d01ab2a7a 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -148,6 +148,7 @@ Comment[ka]=მართეთ თქვენი ფაილები
 Comment[ko]=내 파일 관리
 Comment[lt]=Tvarkyti failus
 Comment[lv]=Pārvaldiet ierīces datnes
+Comment[nb]=Behandle filene dine
 Comment[nl]=Uw bestanden beheren
 Comment[pa]=ਆਪਣੀਆਂ ਫ਼ਾਇਲਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ
 Comment[pl]=Zarządzaj swoimi plikami
-- 
cgit v1.3