From: l10n daemon script <scripty@kde.org>
Date: Mon, 2 Jun 2025 01:32:45 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/57615e7ba2c7702321684c56fa2a86d65b7eee4b

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 b82eaaecc..c114295ec 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -138,6 +138,7 @@ Comment[fr]=GÃ©rer vos fichiers
 Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=× ×××× ××§××¦×× ×©××
 Comment[ia]=Gere tu files
+Comment[is]=HafÃ°u umsjÃ³n meÃ° skrÃ¡num Ã¾Ã­num
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=ááá ááá áá¥áááá á¤áááááá
 Comment[nl]=Uw bestanden beheren