From: l10n daemon script <scripty@kde.org>
Date: Mon, 26 May 2025 01:33:43 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/b0a9907b9cb18e7c1a566f67a90206f067b7eb5e

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"
---

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 1f90595dc..232cc1600 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -131,6 +131,9 @@ Comment[ca]=Gestioneu els fitxers
 Comment[ca@valencia]=Gestioneu els fitxers
 Comment[es]=GestiÃ³n de archivos
 Comment[eu]=Kudeatu zure fitxategiak
+Comment[fi]=Hallinnoi tiedostojasi
+Comment[fr]=GÃ©rer vos fichiers
+Comment[he]=× ×××× ××§××¦×× ×©××
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=ááá ááá áá¥áááá á¤áááááá
 Comment[nl]=Uw bestanden beheren