From: l10n daemon script <scripty@kde.org>
Date: Sat, 31 May 2025 01:34:21 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a1c9bc5595a21299dab9260c6a77c0561c95c8ba?hp=567bc7176042eb4b41ed56a276c95ab2029782dd

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 888440844..ec8d2b136 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -136,10 +136,12 @@ Comment[fi]=Hallinnoi tiedostojasi
 Comment[fr]=GÃ©rer vos fichiers
 Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=× ×××× ××§××¦×× ×©××
+Comment[ia]=Gere tu files
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=ááá ááá áá¥áááá á¤áááááá
 Comment[nl]=Uw bestanden beheren
 Comment[sl]=Upravlja vaÅ¡e datoteke
+Comment[sv]=Hantera filer
 Comment[tr]=DosyalarÄ±nÄ±zÄ± yÃ¶netin
 Comment[uk]=ÐÐµÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð°ÑÐ¸Ð¼Ð¸ ÑÐ°Ð¹Ð»Ð°Ð¼Ð¸
 Comment[x-test]=xxManage your filesxx